From ef6b7b52ebae1fed63dd91ee0ddddcb60d8f88e4 Mon Sep 17 00:00:00 2001 From: sapcc-bot Date: Fri, 20 Oct 2023 11:26:20 +0000 Subject: [PATCH 1/2] Add images for k8s 1.26.10 --- charts/images.yaml | 87 +++++++++++++++++++++++++++++++++++++++++++- ci/pipeline.yaml.erb | 2 +- 2 files changed, 86 insertions(+), 3 deletions(-) diff --git a/charts/images.yaml b/charts/images.yaml index 38261b0144..a3be0022c4 100644 --- a/charts/images.yaml +++ b/charts/images.yaml @@ -2981,6 +2981,89 @@ imagesForVersion: wormhole: repository: keppel.global.cloud.sap/ccloud/kubernikus tag: changeme + 1.26.10: + apiserver: + repository: keppel.global.cloud.sap/ccloud/kube-apiserver + tag: v1.26.10 + cinderCSIPlugin: + repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/k8scloudprovider/cinder-csi-plugin + tag: v1.26.2 + cloudControllerManager: + repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/k8scloudprovider/openstack-cloud-controller-manager + tag: v1.26.2 + 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.26.10 + coreDNS: + repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/coredns/coredns + tag: 1.9.3 + csiAttacher: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/sig-storage/csi-attacher + tag: v4.2.0 + csiLivenessProbe: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/sig-storage/livenessprobe + tag: v2.9.0 + csiNodeDriver: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/sig-storage/csi-node-driver-registrar + tag: v2.7.0 + csiProvisioner: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/sig-storage/csi-provisioner + tag: v3.4.0 + csiResizer: + repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/sig-storage/csi-resizer + tag: v1.7.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.26.10 + kubelet: + repository: keppel.global.cloud.sap/ccloud/kubelet + tag: v1.26.10 + 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.26.10 + supported: true + wormhole: + repository: keppel.global.cloud.sap/ccloud/kubernikus + tag: changeme 1.26.4: apiserver: repository: keppel.global.cloud.sap/ccloud/kube-apiserver @@ -3309,7 +3392,7 @@ imagesForVersion: scheduler: repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/kube-scheduler tag: v1.26.9 - supported: true + supported: false wormhole: repository: keppel.global.cloud.sap/ccloud/kubernikus tag: changeme @@ -3442,6 +3525,7 @@ imagesForVersion: dashboardProxy: repository: keppel.global.cloud.sap/ccloud/keycloak-gatekeeper tag: 6.0.1 + default: true dex: repository: keppel.global.cloud.sap/ccloud/dex tag: 38f4f8ea8d487470a1dd5b83d66b428d8b502f81 @@ -3476,7 +3560,6 @@ imagesForVersion: repository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror/kube-scheduler tag: v1.27.6 supported: true - default: true wormhole: repository: keppel.global.cloud.sap/ccloud/kubernikus tag: changeme diff --git a/ci/pipeline.yaml.erb b/ci/pipeline.yaml.erb index ed31edf93c..299cbcb66f 100644 --- a/ci/pipeline.yaml.erb +++ b/ci/pipeline.yaml.erb @@ -3,7 +3,7 @@ require 'yaml' VERSIONS = [ '1.27.6', - '1.26.9', + '1.26.10', '1.25.14' ] From 9437e8b98bcfeb7bbd979cdeb6ceb281a5344722 Mon Sep 17 00:00:00 2001 From: Jan Knipper Date: Tue, 24 Oct 2023 15:04:56 +0200 Subject: [PATCH 2/2] Bump occm --- charts/images.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/images.yaml b/charts/images.yaml index a3be0022c4..16c462a56c 100644 --- a/charts/images.yaml +++ b/charts/images.yaml @@ -2987,10 +2987,10 @@ imagesForVersion: tag: v1.26.10 cinderCSIPlugin: repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/k8scloudprovider/cinder-csi-plugin - tag: v1.26.2 + tag: v1.26.4 cloudControllerManager: repository: keppel.global.cloud.sap/ccloud-dockerhub-mirror/k8scloudprovider/openstack-cloud-controller-manager - tag: v1.26.2 + tag: v1.26.4 cniPlugins: repository: keppel.global.cloud.sap/ccloud/cni-plugins tag: v1.1.1