Do not set KubeletCredentialProviders feature flag for 1.28+ (#1375)

awslabs · Aug 4, 2023 · 30ccd21 · 30ccd21
1 parent 4f89179
commit 30ccd21
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/files/kubelet-config.json b/files/kubelet-config.json
@@ -27,8 +27,7 @@
   "cgroupDriver": "cgroupfs",
   "cgroupRoot": "/",
   "featureGates": {
-    "RotateKubeletServerCertificate": true,
-    "KubeletCredentialProviders": true
+    "RotateKubeletServerCertificate": true
   },
   "protectKernelDefaults": true,
   "serializeImagePulls": false,

diff --git a/scripts/install-worker.sh b/scripts/install-worker.sh
@@ -322,6 +322,13 @@ if [[ $KUBERNETES_VERSION == "1.20"* ]]; then
   echo $KUBELET_CONFIG_WITH_CSI_SERVICE_ACCOUNT_TOKEN_ENABLED > $WORKING_DIR/kubelet-config.json
 fi
 
+# Enable Feature Gate for KubeletCredentialProviders in versions less than 1.28 since this feature flag was removed in 1.28.
+# TODO: Remove this during 1.27 EOL
+if vercmp $KUBERNETES_VERSION lt "1.28"; then
+  KUBELET_CONFIG_WITH_KUBELET_CREDENTIAL_PROVIDER_FEATURE_GATE_ENABLED=$(cat $WORKING_DIR/kubelet-config.json | jq '.featureGates += {KubeletCredentialProviders: true}')
+  echo $KUBELET_CONFIG_WITH_KUBELET_CREDENTIAL_PROVIDER_FEATURE_GATE_ENABLED > $WORKING_DIR/kubelet-config.json
+fi
+
 sudo mv $WORKING_DIR/kubelet.service /etc/systemd/system/kubelet.service
 sudo chown root:root /etc/systemd/system/kubelet.service
 sudo mv $WORKING_DIR/kubelet-config.json /etc/kubernetes/kubelet/kubelet-config.json