Skip to content

[PLT-3962] Add MachinePool support for EKS in cloud-provisioner #907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iamjanr wants to merge 10 commits into
base: master
Choose a base branch
from
Open

[PLT-3962] Add MachinePool support for EKS in cloud-provisioner #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6888829
[PLT-3962] Add MachinePool support for EKS in cloud-provisioner
iamjanr Apr 28, 2026
255eb5a
[PLT-3962] Add DescribeListenerAttributes to LB controller IRSA polic…
iamjanr May 4, 2026
0ed678e
[PLT-3962] Add MachinePool IAM permissions to stratio-eks-policy
iamjanr May 4, 2026
99d6755
[PLT-3962] Sync MachinePool IAM permissions to all policy doc copies
iamjanr May 4, 2026
c448b76
[PLT-3962] Add mp_role_name support and update CloudFormation stack c…
iamjanr May 7, 2026
919fc33
[PLT-3962] Add migrate-workers-to-machinepool script for MD→MP migration
iamjanr May 13, 2026
add2cbc
[PLT-3962] Make --cluster-operator-version optional with default
iamjanr May 13, 2026
08d1029
[PLT-3962] Add pre-flight warning about image and chart availability
iamjanr May 13, 2026
0cd29ce
[PLT-3962] Update migrate script target version to 0.7.0-PR317-SNAPSHOT
iamjanr May 13, 2026
d4358c2
[PLT-3962] Add confirmation prompt before executing migration
iamjanr May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ deploy-recorder.lst

# Test outputs
/bin/all-junit.xml
/bin/gotestsum
/bin/gotestsum.claude/
4 changes: 4 additions & 0 deletions pkg/cluster/internal/create/actions/createworker/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,10 @@ spec:
iamRoleCreation: false
defaultControlPlaneRole:
disable: false
managedMachinePool:
disable: false
extraPolicyAttachments:
- arn:aws:iam::aws:policy/service-role/AmazonEBSCSIDriverPolicy
controlPlane:
enableCSIPolicy: true
nodes:
Expand Down
21 changes: 17 additions & 4 deletions pkg/cluster/internal/create/actions/createworker/createworker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,21 @@ func (a *action) Execute(ctx *actions.ActionContext) error {
}

awsEKSEnabled := a.keosCluster.Spec.InfraProvider == "aws" && a.keosCluster.Spec.ControlPlane.Managed
isMachinePool := a.keosCluster.Spec.InfraProvider != "aws" && a.keosCluster.Spec.ControlPlane.Managed
gcpGKEEnabled := a.keosCluster.Spec.InfraProvider == "gcp" && a.keosCluster.Spec.ControlPlane.Managed

hasMachinePool := a.keosCluster.Spec.InfraProvider != "aws" && a.keosCluster.Spec.ControlPlane.Managed
hasMachineDeployment := false
if awsEKSEnabled {
for _, wn := range a.keosCluster.Spec.WorkerNodes {
if wn.NodeImage != "" {
hasMachineDeployment = true
} else {
hasMachinePool = true
}
}
}
isMachinePool := hasMachinePool && !hasMachineDeployment

var privateParams PrivateParams
if a.clusterConfig != nil {
privateParams = PrivateParams{
Expand Down Expand Up @@ -691,7 +703,7 @@ spec:
}
}

if isMachinePool {
if hasMachinePool {
// Wait for all the machine pools to be ready
c = "kubectl -n " + capiClustersNamespace + " wait --for=condition=Ready --timeout=15m --all mp"
_, err = commons.ExecuteCommand(n, c, 5, 3)
Expand All @@ -704,7 +716,8 @@ spec:
if err != nil {
return errors.Wrap(err, "failed to wait for container metrics to be available")
}
} else {
}
if hasMachineDeployment {
// Wait for all the machine deployments to be ready
c = "kubectl -n " + capiClustersNamespace + " wait --for=condition=Ready --timeout=15m --all md"

Expand Down Expand Up @@ -1020,7 +1033,7 @@ spec:
ctx.Status.End(true) // End Installing StorageClass in workload cluster

if !a.clusterConfig.Spec.GitOpsEnabled {
if a.keosCluster.Spec.DeployAutoscaler && !isMachinePool {
if a.keosCluster.Spec.DeployAutoscaler && (!isMachinePool || awsEKSEnabled) {
ctx.Status.Start("Installing cluster-autoscaler in workload cluster 💻")
defer ctx.Status.End(false)

Expand Down
2 changes: 2 additions & 0 deletions ...reate/actions/createworker/templates/aws/32/aws-load-balancer-controller-helm-values.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
replicaCount: 1

image:
repository: {{ if $.Private }}{{ $.KeosRegUrl }}{{ else }}public.ecr.aws{{ end }}/eks/aws-load-balancer-controller
#tag: v2.14.1
Expand Down
5 changes: 5 additions & 0 deletions pkg/cluster/internal/create/actions/createworker/templates/common/autoscaler_rbac.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ rules:
- apiGroups:
- infrastructure.cluster.x-k8s.io
resources:
{{- if and (eq $.Spec.InfraProvider "aws") $.Spec.ControlPlane.Managed }}
- awsmanagedmachinepools
- awsmachinetemplates
{{- else }}
- {{ $.Spec.InfraProvider }}machinetemplates
{{- end }}
verbs:
- get
- list
Expand Down
2 changes: 2 additions & 0 deletions pkg/cluster/internal/providers/docker/stratio/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ FROM kindest/node:v1.34.0
# Init feature gates
ENV CLUSTER_TOPOLOGY=true
ENV CLUSTERCTL_DISABLE_VERSIONCHECK=true
ENV EXP_MACHINE_POOL=true
ENV CAPA_EKS_ADD_ROLES=true

# Core tool/version args
ARG CLUSTERCTL=v1.10.8
Expand Down
6 changes: 6 additions & 0 deletions pkg/cluster/internal/validate/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@ func validateAWS(spec commons.KeosSpec, providerSecrets map[string]string) error
return errors.New("spec.worker_nodes." + wn.Name + ": \"node_image\": must have the format " + AWSNodeImageFormat)
}
}
if wn.AmiType != "" && wn.NodeImage != "" {
return errors.New("spec.worker_nodes." + wn.Name + ": ami_type and node_image are mutually exclusive")
}
if wn.AmiType != "" && !spec.ControlPlane.Managed {
return errors.New("spec.worker_nodes." + wn.Name + ": ami_type is only valid for EKS managed clusters")
}
if wn.AZ != "" {
if len(azs) > 0 {
if !commons.Contains(azs, wn.AZ) {
Expand Down
2 changes: 2 additions & 0 deletions pkg/commons/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ type Subnets struct {
type AWSCP struct {
AssociateOIDCProvider bool `yaml:"associate_oidc_provider,omitempty" validate:"boolean"`
EncryptionKey string `yaml:"encryption_key,omitempty"`
MPRoleName string `yaml:"mp_role_name,omitempty"`
Logging struct {
ApiServer bool `yaml:"api_server" validate:"boolean"`
Audit bool `yaml:"audit" validate:"boolean"`
Expand Down Expand Up @@ -295,6 +296,7 @@ type Security struct {
type WorkerNodes []struct {
Name string `yaml:"name" validate:"required"`
NodeImage string `yaml:"node_image,omitempty"`
AmiType string `yaml:"ami_type,omitempty" validate:"omitempty,oneof=BOTTLEROCKET_x86_64"`
Quantity *int `yaml:"quantity" validate:"required,numeric,gte=0"`
Size string `yaml:"size" validate:"required"`
ZoneDistribution string `yaml:"zone_distribution,omitempty" validate:"omitempty,oneof='balanced' 'unbalanced'"`
Expand Down
35 changes: 34 additions & 1 deletion stratio-docs/en/modules/ROOT/assets/attachments/stratio-eks-policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,45 @@
"iam:TagOpenIDConnectProvider",
"iam:ListAttachedRolePolicies",
"iam:CreateRole",
"iam:TagRole"
"iam:TagRole",
"iam:UntagRole"
],
"Resource": [
"arn:aws:iam::${AWS_ACCOUNT_ID}:role/*",
"arn:aws:iam::${AWS_ACCOUNT_ID}:oidc-provider/*"
]
},
{
"Sid": "CAPALaunchTemplates",
"Effect": "Allow",
"Action": [
"ec2:CreateLaunchTemplate",
"ec2:CreateLaunchTemplateVersion",
"ec2:DescribeLaunchTemplates",
"ec2:DescribeLaunchTemplateVersions",
"ec2:DeleteLaunchTemplate",
"ec2:DeleteLaunchTemplateVersions",
"ec2:DescribeKeyPairs",
"eks:TagResource",
"eks:UntagResource",
"eks:UpdateNodegroupConfig",
"iam:TagRole",
"iam:UntagRole"
],
"Resource": "*"
},
{
"Sid": "CAPAAutoScalingGroups",
"Effect": "Allow",
"Action": [
"autoscaling:CreateAutoScalingGroup",
"autoscaling:UpdateAutoScalingGroup",
"autoscaling:CreateOrUpdateTags",
"autoscaling:StartInstanceRefresh",
"autoscaling:DeleteAutoScalingGroup",
"autoscaling:DeleteTags"
],
"Resource": "arn:aws:autoscaling:*:${AWS_ACCOUNT_ID}:autoScalingGroup:*:autoScalingGroupName/*"
}
]
}
35 changes: 34 additions & 1 deletion stratio-docs/en/modules/operations-manual/assets/attachments/stratio-eks-policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,45 @@
"iam:TagOpenIDConnectProvider",
"iam:ListAttachedRolePolicies",
"iam:CreateRole",
"iam:TagRole"
"iam:TagRole",
"iam:UntagRole"
],
"Resource": [
"arn:aws:iam::${AWS_ACCOUNT_ID}:role/*",
"arn:aws:iam::${AWS_ACCOUNT_ID}:oidc-provider/*"
]
},
{
"Sid": "CAPALaunchTemplates",
"Effect": "Allow",
"Action": [
"ec2:CreateLaunchTemplate",
"ec2:CreateLaunchTemplateVersion",
"ec2:DescribeLaunchTemplates",
"ec2:DescribeLaunchTemplateVersions",
"ec2:DeleteLaunchTemplate",
"ec2:DeleteLaunchTemplateVersions",
"ec2:DescribeKeyPairs",
"eks:TagResource",
"eks:UntagResource",
"eks:UpdateNodegroupConfig",
"iam:TagRole",
"iam:UntagRole"
],
"Resource": "*"
},
{
"Sid": "CAPAAutoScalingGroups",
"Effect": "Allow",
"Action": [
"autoscaling:CreateAutoScalingGroup",
"autoscaling:UpdateAutoScalingGroup",
"autoscaling:CreateOrUpdateTags",
"autoscaling:StartInstanceRefresh",
"autoscaling:DeleteAutoScalingGroup",
"autoscaling:DeleteTags"
],
"Resource": "arn:aws:autoscaling:*:${AWS_ACCOUNT_ID}:autoScalingGroup:*:autoScalingGroupName/*"
}
]
}
1 change: 1 addition & 0 deletions stratio-docs/en/modules/operations-manual/pages/installation.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,7 @@ $ cat << EOF > policy.json
"ec2:DescribeSecurityGroups",
"ec2:DescribeSubnets",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeListenerAttributes",
"elasticloadbalancing:DescribeLoadBalancers",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeRules",
Expand Down
35 changes: 34 additions & 1 deletion stratio-docs/es/modules/ROOT/assets/attachments/stratio-eks-policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,45 @@
"iam:TagOpenIDConnectProvider",
"iam:ListAttachedRolePolicies",
"iam:CreateRole",
"iam:TagRole"
"iam:TagRole",
"iam:UntagRole"
],
"Resource": [
"arn:aws:iam::${AWS_ACCOUNT_ID}:role/*",
"arn:aws:iam::${AWS_ACCOUNT_ID}:oidc-provider/*"
]
},
{
"Sid": "CAPALaunchTemplates",
"Effect": "Allow",
"Action": [
"ec2:CreateLaunchTemplate",
"ec2:CreateLaunchTemplateVersion",
"ec2:DescribeLaunchTemplates",
"ec2:DescribeLaunchTemplateVersions",
"ec2:DeleteLaunchTemplate",
"ec2:DeleteLaunchTemplateVersions",
"ec2:DescribeKeyPairs",
"eks:TagResource",
"eks:UntagResource",
"eks:UpdateNodegroupConfig",
"iam:TagRole",
"iam:UntagRole"
],
"Resource": "*"
},
{
"Sid": "CAPAAutoScalingGroups",
"Effect": "Allow",
"Action": [
"autoscaling:CreateAutoScalingGroup",
"autoscaling:UpdateAutoScalingGroup",
"autoscaling:CreateOrUpdateTags",
"autoscaling:StartInstanceRefresh",
"autoscaling:DeleteAutoScalingGroup",
"autoscaling:DeleteTags"
],
"Resource": "arn:aws:autoscaling:*:${AWS_ACCOUNT_ID}:autoScalingGroup:*:autoScalingGroupName/*"
}
]
}
35 changes: 34 additions & 1 deletion stratio-docs/es/modules/operations-manual/assets/attachments/stratio-eks-policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,45 @@
"iam:TagOpenIDConnectProvider",
"iam:ListAttachedRolePolicies",
"iam:CreateRole",
"iam:TagRole"
"iam:TagRole",
"iam:UntagRole"
],
"Resource": [
"arn:aws:iam::${AWS_ACCOUNT_ID}:role/*",
"arn:aws:iam::${AWS_ACCOUNT_ID}:oidc-provider/*"
]
},
{
"Sid": "CAPALaunchTemplates",
"Effect": "Allow",
"Action": [
"ec2:CreateLaunchTemplate",
"ec2:CreateLaunchTemplateVersion",
"ec2:DescribeLaunchTemplates",
"ec2:DescribeLaunchTemplateVersions",
"ec2:DeleteLaunchTemplate",
"ec2:DeleteLaunchTemplateVersions",
"ec2:DescribeKeyPairs",
"eks:TagResource",
"eks:UntagResource",
"eks:UpdateNodegroupConfig",
"iam:TagRole",
"iam:UntagRole"
],
"Resource": "*"
},
{
"Sid": "CAPAAutoScalingGroups",
"Effect": "Allow",
"Action": [
"autoscaling:CreateAutoScalingGroup",
"autoscaling:UpdateAutoScalingGroup",
"autoscaling:CreateOrUpdateTags",
"autoscaling:StartInstanceRefresh",
"autoscaling:DeleteAutoScalingGroup",
"autoscaling:DeleteTags"
],
"Resource": "arn:aws:autoscaling:*:${AWS_ACCOUNT_ID}:autoScalingGroup:*:autoScalingGroupName/*"
}
]
}
1 change: 1 addition & 0 deletions stratio-docs/es/modules/operations-manual/pages/installation.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,7 @@ $ cat << EOF > policy.json
"ec2:DescribeSecurityGroups",
"ec2:DescribeSubnets",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeListenerAttributes",
"elasticloadbalancing:DescribeLoadBalancers",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeRules",
Expand Down
Loading