Bump csi, fix kube-master

sapcc · Sep 26, 2023 · bd3033b · bd3033b
1 parent 8f67282
commit bd3033b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/charts/images.yaml b/charts/images.yaml
@@ -3237,10 +3237,10 @@ imagesForVersion:
       tag: v1.28.2
     cinderCSIPlugin:
       repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/provider-os/cinder-csi-plugin
-      tag: v1.27.1
+      tag: v1.28.0
     cloudControllerManager:
       repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/provider-os/openstack-cloud-controller-manager
-      tag: v1.27.2
+      tag: v1.28.0
     cniPlugins:
       repository: keppel.global.cloud.sap/ccloud/cni-plugins
       tag: v1.1.1

diff --git a/charts/kube-master/templates/cloud-controller-manager.yaml b/charts/kube-master/templates/cloud-controller-manager.yaml
@@ -69,7 +69,7 @@ spec:
             - sh
             - -c
           args:
-            - until kubectl version --short --kubeconfig /etc/kubernetes/config/kubeconfig --request-timeout=4s | grep -i "Server.*{{ .Values.version.kubernetes }}"; do sleep 5; done;
+            - until kubectl version {{ if (semverCompare "< 1.28-0" .Values.version.kubernetes) }}--short {{ end }}--kubeconfig /etc/kubernetes/config/kubeconfig --request-timeout=4s | grep -i "Server.*{{ .Values.version.kubernetes }}"; do sleep 5; done;
           volumeMounts:
             - mountPath: /etc/kubernetes/certs/
               name: certs

diff --git a/charts/kube-master/templates/controller-manager.yaml b/charts/kube-master/templates/controller-manager.yaml
@@ -77,7 +77,7 @@ spec:
             - sh
             - -c
           args:
-            - until kubectl version --short --kubeconfig /etc/kubernetes/config/kubeconfig --request-timeout=4s | grep -i "Server.*{{ .Values.version.kubernetes }}"; do sleep 5; done;
+            - until kubectl version {{ if (semverCompare "< 1.28-0" .Values.version.kubernetes) }}--short {{ end }}--kubeconfig /etc/kubernetes/config/kubeconfig --request-timeout=4s | grep -i "Server.*{{ .Values.version.kubernetes }}"; do sleep 5; done;
           volumeMounts:
             - mountPath: /etc/kubernetes/certs/
               name: certs

diff --git a/charts/kube-master/templates/csi-driver-controller.yaml b/charts/kube-master/templates/csi-driver-controller.yaml
@@ -41,7 +41,7 @@ spec:
         - sh
         - -c
         args:
-        - until kubectl version --short --kubeconfig /etc/kubernetes/config/csi-kubeconfig --request-timeout=4s | grep -i "Server.*{{ .Values.version.kubernetes }}"; do sleep 5; done;
+        - until kubectl version {{ if (semverCompare "< 1.28-0" .Values.version.kubernetes) }}--short {{ end }}--kubeconfig /etc/kubernetes/config/csi-kubeconfig --request-timeout=4s | grep -i "Server.*{{ .Values.version.kubernetes }}"; do sleep 5; done;
         volumeMounts:
         - mountPath: /etc/kubernetes/certs/
           name: certs

diff --git a/pkg/templates/ignition.go b/pkg/templates/ignition.go
@@ -31,6 +31,8 @@ const TEMPLATE_VERSION = "6"
 
 func (i *ignition) getIgnitionTemplate(kluster *kubernikusv1.Kluster) (string, error) {
 	switch {
+	case strings.HasPrefix(kluster.Spec.Version, "1.28"):
+		return Node_1_27, nil // No changes to 1.27
 	case strings.HasPrefix(kluster.Spec.Version, "1.27"):
 		return Node_1_27, nil
 	case strings.HasPrefix(kluster.Spec.Version, "1.26"):