diff --git a/charts/images.yaml b/charts/images.yaml index 4e50c5cb7a..e22157e43c 100644 --- a/charts/images.yaml +++ b/charts/images.yaml @@ -3481,3 +3481,86 @@ imagesForVersion: wormhole: repository: keppel.global.cloud.sap/ccloud/kubernikus tag: changeme + 1.28.2: + apiserver: + repository: keppel.global.cloud.sap/ccloud/kube-apiserver + tag: v1.28.2 + cinderCSIPlugin: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/provider-os/cinder-csi-plugin + tag: v1.28.0 + cloudControllerManager: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/provider-os/openstack-cloud-controller-manager + tag: v1.28.0 + cniPlugins: + repository: keppel.global.cloud.sap/ccloud/cni-plugins + tag: v1.1.1 + controllerManager: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/kube-controller-manager + tag: v1.28.2 + coreDNS: + repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/coredns/coredns + tag: 1.10.1 + csiAttacher: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/sig-storage/csi-attacher + tag: v4.3.0 + csiLivenessProbe: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/sig-storage/livenessprobe + tag: v2.10.0 + csiNodeDriver: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/sig-storage/csi-node-driver-registrar + tag: v2.8.0 + csiProvisioner: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/sig-storage/csi-provisioner + tag: v3.5.0 + csiResizer: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/sig-storage/csi-resizer + tag: v1.8.0 + csiSnapshotController: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/sig-storage/snapshot-controller + tag: v6.2.1 + csiSnapshotter: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/sig-storage/csi-snapshotter + tag: v6.2.1 + dashboard: + repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/kubernetesui/dashboard + tag: v2.7.0 + dashboardProxy: + repository: keppel.global.cloud.sap/ccloud/keycloak-gatekeeper + tag: 6.0.1 + dex: + repository: keppel.global.cloud.sap/ccloud/dex + tag: 38f4f8ea8d487470a1dd5b83d66b428d8b502f81 + etcd: + repository: keppel.global.cloud.sap/ccloud/etcd + tag: v3.4.13-bootstrap-3 + etcdBackup: + repository: keppel.global.cloud.sap/ccloud/etcdbrctl + tag: v0.15.4 + flannel: + repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/flannelcni/flannel + tag: v0.19.1 + flannelCNIPlugin: + repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/flannelcni/flannel-cni-plugin + tag: v1.1.0 + fluentd: + repository: keppel.global.cloud.sap/ccloud/kubernikus-fluentd + tag: v1.14.6-1.1 + kubeProxy: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/kube-proxy + tag: v1.28.2 + kubelet: + repository: keppel.global.cloud.sap/ccloud/kubelet + tag: v1.28.2 + pause: + repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/sapcc/pause-amd64 + tag: '3.1' + recycler: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/debian-base + tag: v2.0.0 + scheduler: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/kube-scheduler + tag: v1.28.2 + supported: true + wormhole: + repository: keppel.global.cloud.sap/ccloud/kubernikus + tag: changeme diff --git a/charts/kube-master/templates/cloud-controller-manager.yaml b/charts/kube-master/templates/cloud-controller-manager.yaml index 6dad05ffeb..f6fa4b2efa 100644 --- 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 index cfbe1725da..1e4ced7ad2 100644 --- 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 index e314f68534..f992d6d1b9 100644 --- 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 index 3ec104053d..91fb3441cf 100644 --- 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"):