Skip to content

Commit 9c2eb0a

Browse files
authored
Merge pull request #12755 from alexander-demicev/inplaceupdatesfeaturegate
✨Add inplace updates featuregate
2 parents b09799f + b5f0930 commit 9c2eb0a

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

bootstrap/kubeadm/config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
- "--leader-elect"
2323
- "--diagnostics-address=${CAPI_DIAGNOSTICS_ADDRESS:=:8443}"
2424
- "--insecure-diagnostics=${CAPI_INSECURE_DIAGNOSTICS:=false}"
25-
- "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=true},KubeadmBootstrapFormatIgnition=${EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION:=false},PriorityQueue=${EXP_PRIORITY_QUEUE:=false}"
25+
- "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=true},KubeadmBootstrapFormatIgnition=${EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION:=false},PriorityQueue=${EXP_PRIORITY_QUEUE:=false},InPlaceUpdates=${EXP_IN_PLACE_UPDATES:=false}"
2626
- "--bootstrap-token-ttl=${KUBEADM_BOOTSTRAP_TOKEN_TTL:=15m}"
2727
image: controller:latest
2828
name: manager

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
- "--leader-elect"
2424
- "--diagnostics-address=${CAPI_DIAGNOSTICS_ADDRESS:=:8443}"
2525
- "--insecure-diagnostics=${CAPI_INSECURE_DIAGNOSTICS:=false}"
26-
- "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=true},ClusterResourceSet=${EXP_CLUSTER_RESOURCE_SET:=true},ClusterTopology=${CLUSTER_TOPOLOGY:=false},RuntimeSDK=${EXP_RUNTIME_SDK:=false},MachineSetPreflightChecks=${EXP_MACHINE_SET_PREFLIGHT_CHECKS:=true},MachineWaitForVolumeDetachConsiderVolumeAttachments=${EXP_MACHINE_WAITFORVOLUMEDETACH_CONSIDER_VOLUMEATTACHMENTS:=true},PriorityQueue=${EXP_PRIORITY_QUEUE:=false}"
26+
- "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=true},ClusterResourceSet=${EXP_CLUSTER_RESOURCE_SET:=true},ClusterTopology=${CLUSTER_TOPOLOGY:=false},RuntimeSDK=${EXP_RUNTIME_SDK:=false},MachineSetPreflightChecks=${EXP_MACHINE_SET_PREFLIGHT_CHECKS:=true},MachineWaitForVolumeDetachConsiderVolumeAttachments=${EXP_MACHINE_WAITFORVOLUMEDETACH_CONSIDER_VOLUMEATTACHMENTS:=true},PriorityQueue=${EXP_PRIORITY_QUEUE:=false},InPlaceUpdates=${EXP_IN_PLACE_UPDATES:=false}"
2727
image: controller:latest
2828
name: manager
2929
env:

feature/feature.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ const (
7777
//
7878
// alpha: v1.10
7979
PriorityQueue featuregate.Feature = "PriorityQueue"
80+
81+
// InPlaceUpdates is a feature gate for the in-place machine updates functionality.
82+
// alpha: v1.12
83+
InPlaceUpdates featuregate.Feature = "InPlaceUpdates"
8084
)
8185

8286
func init() {
@@ -95,4 +99,5 @@ var defaultClusterAPIFeatureGates = map[featuregate.Feature]featuregate.FeatureS
9599
ClusterTopology: {Default: false, PreRelease: featuregate.Alpha},
96100
KubeadmBootstrapFormatIgnition: {Default: false, PreRelease: featuregate.Alpha},
97101
RuntimeSDK: {Default: false, PreRelease: featuregate.Alpha},
102+
InPlaceUpdates: {Default: false, PreRelease: featuregate.Alpha},
98103
}

test/e2e/config/docker.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ variables:
397397
EXP_RUNTIME_SDK: "true"
398398
EXP_MACHINE_SET_PREFLIGHT_CHECKS: "true"
399399
EXP_PRIORITY_QUEUE: "false"
400+
EXP_IN_PLACE_UPDATES: "true"
400401
CAPI_DIAGNOSTICS_ADDRESS: ":8080"
401402
CAPI_INSECURE_DIAGNOSTICS: "true"
402403

0 commit comments

Comments
 (0)