From 4d59a9285e1952e791ca888db02e52e4a0967efb Mon Sep 17 00:00:00 2001 From: Kurt Garloff Date: Thu, 28 May 2026 15:32:07 +0200 Subject: [PATCH 1/3] Latest versions: 1.33.11, 1.34.8. This is the files that we only need to have once, across k8s minor versions. Signed-off-by: Kurt Garloff --- providers/openstack/scs2/kubernetes.yaml | 13 +++++++++++++ providers/openstack/scs2/versions.yaml | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/providers/openstack/scs2/kubernetes.yaml b/providers/openstack/scs2/kubernetes.yaml index ef7600cd..04758c35 100644 --- a/providers/openstack/scs2/kubernetes.yaml +++ b/providers/openstack/scs2/kubernetes.yaml @@ -53,6 +53,14 @@ images: url: https://nbg1.your-objectstorage.com/osism/openstack-k8s-capi-images/ubuntu-2404-kube-v1.33/ubuntu-2404-kube-v1.33.10.qcow2 checksum: "sha256:efc3817b565c407710724b9d7b51cbb433638aad6b613b64843da28d58a777aa" build_date: 2026-03-20 + - version: 'v1.33.11' + url: https://nbg1.your-objectstorage.com/osism/openstack-k8s-capi-images/ubuntu-2404-kube-v1.33/ubuntu-2404-kube-v1.33.11.qcow2 + checksum: "sha256:a7bf1bab8a0e33de6346fd6a0042549d6f444c36db66a4b245be929e3f3d9985" + build_date: 2026-04-29 + #- version: 'v1.33.12' + # url: https://nbg1.your-objectstorage.com/osism/openstack-k8s-capi-images/ubuntu-2404-kube-v1.33/ubuntu-2404-kube-v1.33.12.qcow2 + # checksum: "sha256:efc3817b565c407710724b9d7b51cbb433638aad6b613b64843da28d58a777aa" + # build_date: 2026-05-13 - version: 'v1.34.0' url: https://nbg1.your-objectstorage.com/osism/openstack-k8s-capi-images/ubuntu-2404-kube-v1.34/ubuntu-2404-kube-v1.34.0.qcow2 checksum: "sha256:1321c0978818752619ab994acccf4e2d9b241aa738fc56ed0a46b0ebe21fedfb" @@ -85,3 +93,8 @@ images: url: https://nbg1.your-objectstorage.com/osism/openstack-k8s-capi-images/ubuntu-2404-kube-v1.34/ubuntu-2404-kube-v1.34.7.qcow2 checksum: "sha256:f7bf12297833cca14de6d24081c8a01e99143651e4c01431b911375300550fe0" build_date: 2026-04-16 + - version: 'v1.34.8' + url: https://nbg1.your-objectstorage.com/osism/openstack-k8s-capi-images/ubuntu-2404-kube-v1.34/ubuntu-2404-kube-v1.34.8.qcow2 + checksum: "sha256:440979a41a06573aadb7589167568ff1699eb55e3a1a9fbe85591077560ffa39" + build_date: 2026-05-13 + diff --git a/providers/openstack/scs2/versions.yaml b/providers/openstack/scs2/versions.yaml index 138bb3c8..f3ac34be 100644 --- a/providers/openstack/scs2/versions.yaml +++ b/providers/openstack/scs2/versions.yaml @@ -1,9 +1,9 @@ - kubernetes: 1.32.13 cinder_csi: 2.32.2 occm: 2.32.1 -- kubernetes: 1.33.10 +- kubernetes: 1.33.12 cinder_csi: 2.33.1 occm: 2.33.1 -- kubernetes: 1.34.7 +- kubernetes: 1.34.8 cinder_csi: 2.34.3 occm: 2.34.2 From 9a22677b29974fb44fb37d4d67ecf5833896bde7 Mon Sep 17 00:00:00 2001 From: Kurt Garloff Date: Thu, 28 May 2026 15:44:01 +0200 Subject: [PATCH 2/3] Add k8s-v1.35 versions and images. Signed-off-by: Kurt Garloff --- providers/openstack/scs2/kubernetes.yaml | 11 +++++++++-- providers/openstack/scs2/versions.yaml | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/providers/openstack/scs2/kubernetes.yaml b/providers/openstack/scs2/kubernetes.yaml index 04758c35..dbbf1901 100644 --- a/providers/openstack/scs2/kubernetes.yaml +++ b/providers/openstack/scs2/kubernetes.yaml @@ -59,7 +59,7 @@ images: build_date: 2026-04-29 #- version: 'v1.33.12' # url: https://nbg1.your-objectstorage.com/osism/openstack-k8s-capi-images/ubuntu-2404-kube-v1.33/ubuntu-2404-kube-v1.33.12.qcow2 - # checksum: "sha256:efc3817b565c407710724b9d7b51cbb433638aad6b613b64843da28d58a777aa" + # checksum: "sha256:" # build_date: 2026-05-13 - version: 'v1.34.0' url: https://nbg1.your-objectstorage.com/osism/openstack-k8s-capi-images/ubuntu-2404-kube-v1.34/ubuntu-2404-kube-v1.34.0.qcow2 @@ -97,4 +97,11 @@ images: url: https://nbg1.your-objectstorage.com/osism/openstack-k8s-capi-images/ubuntu-2404-kube-v1.34/ubuntu-2404-kube-v1.34.8.qcow2 checksum: "sha256:440979a41a06573aadb7589167568ff1699eb55e3a1a9fbe85591077560ffa39" build_date: 2026-05-13 - + - version: 'v1.35.4' + url: https://nbg1.your-objectstorage.com/osism/openstack-k8s-capi-images/ubuntu-2404-kube-v1.35/ubuntu-2404-kube-v1.35.4.qcow2 + checksum: "sha256:88c14ecc9fcf929a0c9152e86145a05a51b16ce819a2de711faab6972a22b54e" + build_date: 2026-04-16 + - version: 'v1.35.5' + url: https://nbg1.your-objectstorage.com/osism/openstack-k8s-capi-images/ubuntu-2404-kube-v1.35/ubuntu-2404-kube-v1.35.5.qcow2 + checksum: "sha256:9ede9a241f14e12f666304d0288934c8fc7ed5ad65b31ed004a7ec0fd53ca32a" + build_date: 2026-05-13 diff --git a/providers/openstack/scs2/versions.yaml b/providers/openstack/scs2/versions.yaml index f3ac34be..d73df59a 100644 --- a/providers/openstack/scs2/versions.yaml +++ b/providers/openstack/scs2/versions.yaml @@ -7,3 +7,6 @@ - kubernetes: 1.34.8 cinder_csi: 2.34.3 occm: 2.34.2 +- kubernetes: 1.35.5 + cinder_csi: 2.35.0 + occm: 2.35.0 From 61bd4cd1ccb14e1c1d5d117ca520e07636d1b0ab Mon Sep 17 00:00:00 2001 From: Kurt Garloff Date: Thu, 28 May 2026 21:11:09 +0200 Subject: [PATCH 3/3] Update to k8s-v1.35.5. k8s: v1.35.5 (new) occm: v2.35.0 (new) csi-cinder: v2.35.0 (new) cni-cilium: v1.19.4 (up from 1.18.10 in 1.34.8) Signed-off-by: Kurt Garloff --- providers/openstack/scs2/README.md | 6 +++--- providers/openstack/scs2/cluster-addon/ccm/Chart.yaml | 2 +- providers/openstack/scs2/cluster-addon/cni/Chart.yaml | 2 +- providers/openstack/scs2/cluster-addon/csi/Chart.yaml | 2 +- providers/openstack/scs2/cluster-class/Chart.yaml | 2 +- providers/openstack/scs2/csctl.yaml | 2 +- providers/openstack/scs2/image.yaml | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/providers/openstack/scs2/README.md b/providers/openstack/scs2/README.md index 69b00f9e..57b6a5b4 100644 --- a/providers/openstack/scs2/README.md +++ b/providers/openstack/scs2/README.md @@ -21,7 +21,7 @@ export CLUSTER_TOPOLOGY=true export EXP_CLUSTER_RESOURCE_SET=true export EXP_RUNTIME_SDK=true kubectl apply -f https://github.com/k-orc/openstack-resource-controller/releases/latest/download/install.yaml -clusterctl init --infrastructure openstack:v0.12.6 +clusterctl init --infrastructure openstack:v0.14.4 kubectl -n capi-system rollout status deployment kubectl -n capo-system rollout status deployment @@ -90,7 +90,7 @@ metadata: spec: provider: openstack name: scs2 - kubernetesVersion: "1.33" + kubernetesVersion: "1.35" channel: stable autoSubscribe: false noProvider: true @@ -132,7 +132,7 @@ spec: classNamespace: $CLUSTERSTACK_NAMESPACE controlPlane: replicas: 1 - version: v1.33.4 + version: v1.35.5 workers: machineDeployments: - class: default-worker diff --git a/providers/openstack/scs2/cluster-addon/ccm/Chart.yaml b/providers/openstack/scs2/cluster-addon/ccm/Chart.yaml index bd086402..1a120416 100644 --- a/providers/openstack/scs2/cluster-addon/ccm/Chart.yaml +++ b/providers/openstack/scs2/cluster-addon/ccm/Chart.yaml @@ -7,4 +7,4 @@ dependencies: - alias: openstack-cloud-controller-manager name: openstack-cloud-controller-manager repository: https://kubernetes.github.io/cloud-provider-openstack - version: 2.34.2 + version: 2.35.0 diff --git a/providers/openstack/scs2/cluster-addon/cni/Chart.yaml b/providers/openstack/scs2/cluster-addon/cni/Chart.yaml index acfe3387..a535cc8f 100644 --- a/providers/openstack/scs2/cluster-addon/cni/Chart.yaml +++ b/providers/openstack/scs2/cluster-addon/cni/Chart.yaml @@ -7,4 +7,4 @@ dependencies: - alias: cilium name: cilium repository: https://helm.cilium.io/ - version: 1.18.9 + version: 1.19.4 diff --git a/providers/openstack/scs2/cluster-addon/csi/Chart.yaml b/providers/openstack/scs2/cluster-addon/csi/Chart.yaml index cbe0cc17..b7d9ee53 100644 --- a/providers/openstack/scs2/cluster-addon/csi/Chart.yaml +++ b/providers/openstack/scs2/cluster-addon/csi/Chart.yaml @@ -7,4 +7,4 @@ dependencies: - alias: openstack-cinder-csi name: openstack-cinder-csi repository: https://kubernetes.github.io/cloud-provider-openstack - version: 2.34.3 + version: 2.35.0 diff --git a/providers/openstack/scs2/cluster-class/Chart.yaml b/providers/openstack/scs2/cluster-class/Chart.yaml index 2ea03e47..2d030a18 100644 --- a/providers/openstack/scs2/cluster-class/Chart.yaml +++ b/providers/openstack/scs2/cluster-class/Chart.yaml @@ -4,6 +4,6 @@ description: "This chart installs and configures: * Openstack scs2 Cluster Class " -name: openstack-scs2-1-34-cluster-class +name: openstack-scs2-1-35-cluster-class type: application version: v1 diff --git a/providers/openstack/scs2/csctl.yaml b/providers/openstack/scs2/csctl.yaml index e7209513..059f395d 100644 --- a/providers/openstack/scs2/csctl.yaml +++ b/providers/openstack/scs2/csctl.yaml @@ -1,7 +1,7 @@ apiVersion: csctl.clusterstack.x-k8s.io/v1alpha1 config: clusterStackName: scs2 - kubernetesVersion: v1.34.7 + kubernetesVersion: v1.35.5 provider: apiVersion: openstack.csctl.clusterstack.x-k8s.io/v1alpha1 type: openstack diff --git a/providers/openstack/scs2/image.yaml b/providers/openstack/scs2/image.yaml index 72d5b8b0..f53b52c7 100644 --- a/providers/openstack/scs2/image.yaml +++ b/providers/openstack/scs2/image.yaml @@ -2,7 +2,7 @@ apiVersion: openstack.k-orc.cloud/v1alpha1 kind: Image metadata: - name: "ubuntu-capi-image-v1.34.7" + name: "ubuntu-capi-image-v1.35.5" spec: cloudCredentialsRef: cloudName: "openstack" @@ -26,7 +26,7 @@ spec: content: diskFormat: qcow2 download: - url: https://nbg1.your-objectstorage.com/osism/openstack-k8s-capi-images/ubuntu-2404-kube-v1.34/ubuntu-2404-kube-v1.34.7.qcow2 + url: https://nbg1.your-objectstorage.com/osism/openstack-k8s-capi-images/ubuntu-2404-kube-v1.35/ubuntu-2404-kube-v1.35.5.qcow2 hash: algorithm: sha256 - value: f7bf12297833cca14de6d24081c8a01e99143651e4c01431b911375300550fe0 + value: 9ede9a241f14e12f666304d0288934c8fc7ed5ad65b31ed004a7ec0fd53ca32a