Skip to content

Commit 8af852f

Browse files
committed
Add feature gate environment variable for machine pool machines
1 parent dd099ec commit 8af852f

File tree

6 files changed

+10
-2
lines changed

6 files changed

+10
-2
lines changed

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
containers:
2020
- args:
2121
- "--leader-elect"
22-
- "--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}"
22+
- "--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}"
2323
- "--v=${CAPA_LOGLEVEL:=0}"
2424
- "--diagnostics-address=${CAPA_DIAGNOSTICS_ADDRESS:=:8443}"
2525
- "--insecure-diagnostics=${CAPA_INSECURE_DIAGNOSTICS:=false}"

docs/book/src/development/tilt-setup.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Next, create a `tilt-settings.json` file and place it in your local copy of `clu
5252
"kustomize_substitutions": {
5353
"EXP_CLUSTER_RESOURCE_SET": "true",
5454
"EXP_MACHINE_POOL": "true",
55+
"EXP_MACHINE_POOL_MACHINES": "true",
5556
"EVENT_BRIDGE_INSTANCE_STATE": "true",
5657
"AWS_B64ENCODED_CREDENTIALS": "W2RlZmFZSZnRg==",
5758
"EXP_EKS_FARGATE": "false",

docs/book/src/topics/machinepools.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,3 +148,7 @@ When using GitOps, make sure to ignore differences in `spec.replicas` on Machine
148148
jsonPointers:
149149
- /spec/replicas
150150
```
151+
152+
## Machine pool machines
153+
154+
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.

docs/book/src/topics/reference/reference.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
| EKSAllowAddRoles | CAPA_EKS_ADD_ROLES | false |
1010
| EKSFargate | EXP_EKS_FARGATE | false |
1111
| MachinePool | EXP_MACHINE_POOL | false |
12+
| MachinePoolMachines | EXP_MACHINE_POOL_MACHINES | false |
1213
| EventBridgeInstanceState | EVENT_BRIDGE_INSTANCE_STATE | false |
1314
| AutoControllerIdentityCreator | AUTO_CONTROLLER_IDENTITY_CREATOR | true |
1415
| BootstrapFormatIgnition | EXP_BOOTSTRAP_FORMAT_IGNITION | false |
1516
| ExternalResourceGC | EXP_EXTERNAL_RESOURCE_GC | false |
1617
| AlternativeGCStrategy | EXP_ALTERNATIVE_GC_STRATEGY | false |
1718
| TagUnmanagedNetworkResources | TAG_UNMANAGED_NETWORK_RESOURCES | true |
18-
| ROSA | EXP_ROSA | false |
19+
| ROSA | EXP_ROSA | false |

test/e2e/data/e2e_conf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ variables:
209209
# Enabling the feature flags by setting the env variables.
210210
EXP_CLUSTER_RESOURCE_SET: "true"
211211
EXP_MACHINE_POOL: "true"
212+
EXP_MACHINE_POOL_MACHINES: "true"
212213
CLUSTER_TOPOLOGY: "true"
213214
INIT_WITH_BINARY_V1BETA1: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/clusterctl-{OS}-{ARCH}"
214215
# INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize

test/e2e/data/e2e_eks_conf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ variables:
123123
UPGRADE_TO_VERSION: "v1.32.0"
124124
UPGRADE_FROM_VERSION: "v1.31.0"
125125
EXP_MACHINE_POOL: "true"
126+
EXP_MACHINE_POOL_MACHINES: "true"
126127
EXP_CLUSTER_RESOURCE_SET: "true"
127128
EVENT_BRIDGE_INSTANCE_STATE: "true"
128129
AWS_NODE_MACHINE_TYPE: t3.large

0 commit comments

Comments
 (0)