fix(t8s-cluster): adjust for 1.29

the SeccompDefault featureGate is enabled by default anyways
teutonet · Jul 11, 2024 · d326785 · d326785
1 parent fe3d87a
commit d326785
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/charts/t8s-cluster/templates/management-cluster/clusterClass/patches/_kubelet.tpl b/charts/t8s-cluster/templates/management-cluster/clusterClass/patches/_kubelet.tpl
@@ -7,7 +7,7 @@
   {{- $values := dict -}}
   {{- $values = set $values "eventRecordQPS" 0 -}}
   {{- $values = set $values "protectKernelDefaults" true -}}
-  {{- $values = set $values "featureGates" (dict "SeccompDefault" true) -}}
+  {{- $values = set $values "featureGates" (dict) -}}
   {{- $values = set $values "SeccompDefault" true -}}
   {{- $values = set $values "tlsCipherSuites" (include "t8s-cluster.clusterClass.tlsCipherSuites" (dict) | splitList ",") -}}
   {{- include "t8s-cluster.patches.patchFile" (dict "values" $values "target" "kubeletconfiguration" "component" "default") -}}

diff --git a/charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml b/charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml
@@ -42,8 +42,9 @@ spec:
     - <<: *valuesFrom
       targetPath: cloudConfig.metadata.hash
   values:
-    controllerExtraArgs: |
-      - --use-service-account-credentials=false
+    cluster:
+      name: {{ .Values.metadata.friendlyName | default .Release.Name }}
+  {{- if le (.Values.version.minor | int) 28 }}
     tolerations:
       - key: node.cloudprovider.kubernetes.io/uninitialized
         value: "true"
@@ -52,3 +53,4 @@ spec:
         effect: NoSchedule
     nodeSelector:
       node-role.kubernetes.io/control-plane: ""
+  {{- end }}
diff --git a/charts/t8s-cluster/values.schema.json b/charts/t8s-cluster/values.schema.json
@@ -148,9 +148,8 @@
         },
         "minor": {
           "type": "integer",
-          "description": "The minor version of the k8s cluster. Must be below 29, as CAPO does not support 1.29 yet.",
-          "minimum": 25,
-          "maximum": 28
+          "description": "The minor version of the k8s cluster.",
+          "minimum": 25
         },
         "patch": {
           "type": "integer"