refactor: move remaining flags to kubelet configuration

Author: dkoshkin

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/aws-cluster-class.yaml

@@ -108,6 +108,17 @@ spec:
             extraArgs:
               profiling: "false"
         files:
+        - content: |
+            apiVersion: kubelet.config.k8s.io/v1beta1
+            kind: KubeletConfiguration
+            evictionHard: |
+              nodefs.available: "10%"
+              nodefs.inodesFree: "5%"
+              imagefs.available: "15%"
+              memory.available: "100Mi"
+              imagefs.inodesFree: "10%"
+          path: /etc/kubernetes/patches/kubeletconfiguration0+strategic.json
+          permissions: "0600"
         - content: |
             apiVersion: kubelet.config.k8s.io/v1beta1
             kind: KubeletConfiguration
@@ -194,6 +205,17 @@ spec:
   template:
     spec:
       files:
+      - content: |
+          apiVersion: kubelet.config.k8s.io/v1beta1
+          kind: KubeletConfiguration
+          evictionHard: |
+            nodefs.available: "10%"
+            nodefs.inodesFree: "5%"
+            imagefs.available: "15%"
+            memory.available: "100Mi"
+            imagefs.inodesFree: "10%"
+        path: /etc/kubernetes/patches/kubeletconfiguration0+strategic.json
+        permissions: "0600"
       - content: |
           apiVersion: kubelet.config.k8s.io/v1beta1
           kind: KubeletConfiguration

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml

@@ -8,6 +8,17 @@ spec:
   template:
     spec:
       files:
+      - content: |
+          apiVersion: kubelet.config.k8s.io/v1beta1
+          kind: KubeletConfiguration
+          evictionHard: |
+            nodefs.available: "10%"
+            nodefs.inodesFree: "5%"
+            imagefs.available: "15%"
+            memory.available: "100Mi"
+            imagefs.inodesFree: "10%"
+        path: /etc/kubernetes/patches/kubeletconfiguration0+strategic.json
+        permissions: "0600"
       - content: |
           apiVersion: kubelet.config.k8s.io/v1beta1
           kind: KubeletConfiguration
@@ -28,8 +39,6 @@ spec:
         nodeRegistration:
           kubeletExtraArgs:
             cloud-provider: external
-            eviction-hard: nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<15%,memory.available<100Mi,imagefs.inodesFree<10%
-            tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
         patches:
           directory: /etc/kubernetes/patches
       postKubeadmCommands:
@@ -235,6 +244,17 @@ spec:
                     path: /etc/kubernetes/admin.conf
                   name: kubeconfig
           path: /etc/kubernetes/manifests/kube-vip.yaml
+        - content: |
+            apiVersion: kubelet.config.k8s.io/v1beta1
+            kind: KubeletConfiguration
+            evictionHard: |
+              nodefs.available: "10%"
+              nodefs.inodesFree: "5%"
+              imagefs.available: "15%"
+              memory.available: "100Mi"
+              imagefs.inodesFree: "10%"
+          path: /etc/kubernetes/patches/kubeletconfiguration0+strategic.json
+          permissions: "0600"
         - content: |
             apiVersion: kubelet.config.k8s.io/v1beta1
             kind: KubeletConfiguration
@@ -272,16 +292,12 @@ spec:
           nodeRegistration:
             kubeletExtraArgs:
               cloud-provider: external
-              eviction-hard: nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<15%,memory.available<100Mi,imagefs.inodesFree<10%
-              tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
           patches:
             directory: /etc/kubernetes/patches
         joinConfiguration:
           nodeRegistration:
             kubeletExtraArgs:
               cloud-provider: external
-              eviction-hard: nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<15%,memory.available<100Mi,imagefs.inodesFree<10%
-              tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
           patches:
             directory: /etc/kubernetes/patches
         postKubeadmCommands:

hack/examples/overlays/clusterclasses/aws/kustomization.yaml.tmpl

@@ -69,6 +69,9 @@ patches:
   - target:
       kind: KubeadmControlPlaneTemplate
     path: ../../../patches/initialize/kubeadmcontrolplanetemplate/files.yaml
+  - target:
+      kind: KubeadmControlPlaneTemplate
+    path: ../../../patches/initialize/kubeadmcontrolplanetemplate/kubelet-configuration.yaml
   - target:
       kind: KubeadmControlPlaneTemplate
     path: ../../../patches/initialize/kubeadmcontrolplanetemplate/postkubeadmcommands.yaml
@@ -82,6 +85,9 @@ patches:
   - target:
       kind: KubeadmConfigTemplate
     path: ../../../patches/initialize/kubeadmconfigtemplate/files.yaml
+  - target:
+      kind: KubeadmConfigTemplate
+    path: ../../../patches/initialize/kubeadmconfigtemplate/kubelet-configuration.yaml
   - target:
       kind: KubeadmConfigTemplate
     path: ../../../patches/initialize/kubeadmconfigtemplate/postkubeadmcommands.yaml

hack/examples/overlays/clusterclasses/nutanix/kustomization.yaml.tmpl

@@ -27,6 +27,9 @@ patches:
               discoverVariablesExtension: "nutanixworkerconfigvars-dv.cluster-api-runtime-extensions-nutanix"
 
   # BEGIN Initialize lists and maps
+  - target:
+      kind: KubeadmControlPlaneTemplate
+    path: ../../../patches/initialize/kubeadmcontrolplanetemplate/kubelet-configuration.yaml
   - target:
       kind: KubeadmControlPlaneTemplate
     path: ../../../patches/initialize/kubeadmcontrolplanetemplate/postkubeadmcommands.yaml
@@ -40,6 +43,9 @@ patches:
   - target:
       kind: KubeadmConfigTemplate
     path: ../../../patches/initialize/kubeadmconfigtemplate/files.yaml
+  - target:
+      kind: KubeadmConfigTemplate
+    path: ../../../patches/initialize/kubeadmconfigtemplate/kubelet-configuration.yaml
   - target:
       kind: KubeadmConfigTemplate
     path: ../../../patches/initialize/kubeadmconfigtemplate/patches.yaml

hack/examples/patches/initialize/kubeadmconfigtemplate/kubelet-configuration.yaml

@@ -0,0 +1,25 @@
+# Copyright 2025 Nutanix. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+
+# Some kubelet configuration options are only supported through flags
+- op: replace
+  path: /spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs
+  value:
+    cloud-provider: external
+
+# But most should be set through the KubeletConfiguration object
+- op: add
+  path: /spec/template/spec/files/-
+  value:
+    path: /etc/kubernetes/patches/kubeletconfiguration0+strategic.json
+    permissions: "0600"
+    content: |
+      apiVersion: kubelet.config.k8s.io/v1beta1
+      kind: KubeletConfiguration
+      evictionHard: |
+        nodefs.available: "10%"
+        nodefs.inodesFree: "5%"
+        imagefs.available: "15%"
+        memory.available: "100Mi"
+        imagefs.inodesFree: "10%"

hack/examples/patches/initialize/kubeadmcontrolplanetemplate/kubelet-configuration.yaml

@@ -0,0 +1,29 @@
+# Copyright 2025 Nutanix. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+
+# Some kubelet configuration options are only supported through flags
+- op: replace
+  path: /spec/template/spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/kubeletExtraArgs
+  value:
+    cloud-provider: external
+- op: replace
+  path: /spec/template/spec/kubeadmConfigSpec/joinConfiguration/nodeRegistration/kubeletExtraArgs
+  value:
+    cloud-provider: external
+
+# But most should be set through the KubeletConfiguration object
+- op: add
+  path: /spec/template/spec/kubeadmConfigSpec/files/-
+  value:
+    path: /etc/kubernetes/patches/kubeletconfiguration0+strategic.json
+    permissions: "0600"
+    content: |
+      apiVersion: kubelet.config.k8s.io/v1beta1
+      kind: KubeletConfiguration
+      evictionHard: |
+        nodefs.available: "10%"
+        nodefs.inodesFree: "5%"
+        imagefs.available: "15%"
+        memory.available: "100Mi"
+        imagefs.inodesFree: "10%"