Skip to content

✨ Add feature gate environment variable for machine pool machines #5575

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

Merged
merged 1 commit into from
Jul 16, 2025
+10 −2
Merged

✨ Add feature gate environment variable for machine pool machines #5575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
containers:
- args:
- "--leader-elect"
- "--feature-gates=EKS=${CAPA_EKS:=true},EKSEnableIAM=${CAPA_EKS_IAM:=false},EKSAllowAddRoles=${CAPA_EKS_ADD_ROLES:=false},EKSFargate=${EXP_EKS_FARGATE:=false},MachinePool=${EXP_MACHINE_POOL:=false},EventBridgeInstanceState=${EVENT_BRIDGE_INSTANCE_STATE:=false},AutoControllerIdentityCreator=${AUTO_CONTROLLER_IDENTITY_CREATOR:=true},BootstrapFormatIgnition=${EXP_BOOTSTRAP_FORMAT_IGNITION:=false},ExternalResourceGC=${EXTERNAL_RESOURCE_GC:=true},AlternativeGCStrategy=${ALTERNATIVE_GC_STRATEGY:=false},TagUnmanagedNetworkResources=${TAG_UNMANAGED_NETWORK_RESOURCES:=true},ROSA=${EXP_ROSA:=false}"
- "--feature-gates=EKS=${CAPA_EKS:=true},EKSEnableIAM=${CAPA_EKS_IAM:=false},EKSAllowAddRoles=${CAPA_EKS_ADD_ROLES:=false},EKSFargate=${EXP_EKS_FARGATE:=false},MachinePool=${EXP_MACHINE_POOL:=false},MachinePoolMachines=${EXP_MACHINE_POOL_MACHINES:=false},EventBridgeInstanceState=${EVENT_BRIDGE_INSTANCE_STATE:=false},AutoControllerIdentityCreator=${AUTO_CONTROLLER_IDENTITY_CREATOR:=true},BootstrapFormatIgnition=${EXP_BOOTSTRAP_FORMAT_IGNITION:=false},ExternalResourceGC=${EXTERNAL_RESOURCE_GC:=true},AlternativeGCStrategy=${ALTERNATIVE_GC_STRATEGY:=false},TagUnmanagedNetworkResources=${TAG_UNMANAGED_NETWORK_RESOURCES:=true},ROSA=${EXP_ROSA:=false}"
- "--v=${CAPA_LOGLEVEL:=0}"
- "--diagnostics-address=${CAPA_DIAGNOSTICS_ADDRESS:=:8443}"
- "--insecure-diagnostics=${CAPA_INSECURE_DIAGNOSTICS:=false}"
Expand Down
1 change: 1 addition & 0 deletions docs/book/src/development/tilt-setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ Next, create a `tilt-settings.json` file and place it in your local copy of `clu
"kustomize_substitutions": {
"EXP_CLUSTER_RESOURCE_SET": "true",
"EXP_MACHINE_POOL": "true",
"EXP_MACHINE_POOL_MACHINES": "true",
"EVENT_BRIDGE_INSTANCE_STATE": "true",
"AWS_B64ENCODED_CREDENTIALS": "W2RlZmFZSZnRg==",
"EXP_EKS_FARGATE": "false",
Expand Down
4 changes: 4 additions & 0 deletions docs/book/src/topics/machinepools.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,7 @@ When using GitOps, make sure to ignore differences in `spec.replicas` on Machine
jsonPointers:
- /spec/replicas
```

## Machine pool machines

With the feature gate `MachinePoolMachines=true`, you can enable creation of `Machine`/`AWSMachine` objects for nodes created by a `AWSMachinePool`. This is experimental and will be used to introduce features such as per-node health checks.
3 changes: 2 additions & 1 deletion docs/book/src/topics/reference/reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
| EKSAllowAddRoles | CAPA_EKS_ADD_ROLES | false |
| EKSFargate | EXP_EKS_FARGATE | false |
| MachinePool | EXP_MACHINE_POOL | false |
| MachinePoolMachines | EXP_MACHINE_POOL_MACHINES | false |
| EventBridgeInstanceState | EVENT_BRIDGE_INSTANCE_STATE | false |
| AutoControllerIdentityCreator | AUTO_CONTROLLER_IDENTITY_CREATOR | true |
| BootstrapFormatIgnition | EXP_BOOTSTRAP_FORMAT_IGNITION | false |
| ExternalResourceGC | EXP_EXTERNAL_RESOURCE_GC | false |
| AlternativeGCStrategy | EXP_ALTERNATIVE_GC_STRATEGY | false |
| TagUnmanagedNetworkResources | TAG_UNMANAGED_NETWORK_RESOURCES | true |
| ROSA | EXP_ROSA | false |
| ROSA | EXP_ROSA | false |
1 change: 1 addition & 0 deletions test/e2e/data/e2e_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ variables:
# Enabling the feature flags by setting the env variables.
EXP_CLUSTER_RESOURCE_SET: "true"
EXP_MACHINE_POOL: "true"
EXP_MACHINE_POOL_MACHINES: "true"
CLUSTER_TOPOLOGY: "true"
INIT_WITH_BINARY_V1BETA1: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/clusterctl-{OS}-{ARCH}"
# INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize
Expand Down
1 change: 1 addition & 0 deletions test/e2e/data/e2e_eks_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ variables:
UPGRADE_TO_VERSION: "v1.32.0"
UPGRADE_FROM_VERSION: "v1.31.0"
EXP_MACHINE_POOL: "true"
EXP_MACHINE_POOL_MACHINES: "true"
EXP_CLUSTER_RESOURCE_SET: "true"
EVENT_BRIDGE_INSTANCE_STATE: "true"
AWS_NODE_MACHINE_TYPE: t3.large
Expand Down