diff --git a/providers/openstack/scs/cluster-addon/ccm/Chart.lock b/providers/openstack/scs/cluster-addon/ccm/Chart.lock index 3331b6a8..ed7ad098 100644 --- a/providers/openstack/scs/cluster-addon/ccm/Chart.lock +++ b/providers/openstack/scs/cluster-addon/ccm/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: openstack-cloud-controller-manager repository: https://kubernetes.github.io/cloud-provider-openstack - version: 2.31.1 -digest: sha256:37581a55204e3d55a12413fec097c8f8ab2fa6e3c43f0c6b2a13ad5f94e366ab -generated: "2025-01-31T08:56:58.099398117+01:00" + version: 2.32.0 +digest: sha256:251e0efadca5de3ef39707c196a64a5d5292427faf4163ce8295d416d6e8c355 +generated: "2025-05-28T21:50:59.574735035+02:00" diff --git a/providers/openstack/scs/cluster-addon/ccm/Chart.yaml b/providers/openstack/scs/cluster-addon/ccm/Chart.yaml index 551ba1f9..1b767285 100644 --- a/providers/openstack/scs/cluster-addon/ccm/Chart.yaml +++ b/providers/openstack/scs/cluster-addon/ccm/Chart.yaml @@ -1,10 +1,10 @@ apiVersion: v2 -type: application +dependencies: +- alias: openstack-cloud-controller-manager + name: openstack-cloud-controller-manager + repository: https://kubernetes.github.io/cloud-provider-openstack + version: 2.32.0 description: CCM -name: CCM +name: openstack-scs-1-32-cluster-addon +type: application version: v1 -dependencies: - - alias: openstack-cloud-controller-manager - name: openstack-cloud-controller-manager - repository: https://kubernetes.github.io/cloud-provider-openstack - version: 2.31.1 diff --git a/providers/openstack/scs/cluster-addon/ccm/charts/openstack-cloud-controller-manager-2.31.1.tgz b/providers/openstack/scs/cluster-addon/ccm/charts/openstack-cloud-controller-manager-2.31.1.tgz deleted file mode 100644 index c34df7a0..00000000 Binary files a/providers/openstack/scs/cluster-addon/ccm/charts/openstack-cloud-controller-manager-2.31.1.tgz and /dev/null differ diff --git a/providers/openstack/scs/cluster-addon/ccm/charts/openstack-cloud-controller-manager-2.32.0.tgz b/providers/openstack/scs/cluster-addon/ccm/charts/openstack-cloud-controller-manager-2.32.0.tgz new file mode 100644 index 00000000..9e97d805 Binary files /dev/null and b/providers/openstack/scs/cluster-addon/ccm/charts/openstack-cloud-controller-manager-2.32.0.tgz differ diff --git a/providers/openstack/scs/cluster-addon/cni/Chart.lock b/providers/openstack/scs/cluster-addon/cni/Chart.lock index e1e38b05..c6919af3 100644 --- a/providers/openstack/scs/cluster-addon/cni/Chart.lock +++ b/providers/openstack/scs/cluster-addon/cni/Chart.lock @@ -3,4 +3,4 @@ dependencies: repository: https://helm.cilium.io/ version: 1.17.4 digest: sha256:bbf6df8f80e3eef4e48b2f767734b19ec0c69aa23afc12f5a2f04587383ef089 -generated: "2025-05-28T20:26:29.333212374+02:00" +generated: "2025-05-28T21:50:53.229284267+02:00" \ No newline at end of file diff --git a/providers/openstack/scs/cluster-addon/cni/Chart.yaml b/providers/openstack/scs/cluster-addon/cni/Chart.yaml index aad301f3..5d19a2af 100644 --- a/providers/openstack/scs/cluster-addon/cni/Chart.yaml +++ b/providers/openstack/scs/cluster-addon/cni/Chart.yaml @@ -1,10 +1,15 @@ apiVersion: v2 -type: application +dependencies: +- alias: cilium + name: cilium + repository: https://helm.cilium.io/ + version: 1.17.4 description: CNI -name: CNI +name: openstack-scs-1-32-cluster-addon +type: application version: v1 dependencies: - alias: cilium name: cilium repository: https://helm.cilium.io/ - version: 1.17.4 + version: 1.17.4 \ No newline at end of file diff --git a/providers/openstack/scs/cluster-addon/csi/Chart.lock b/providers/openstack/scs/cluster-addon/csi/Chart.lock index 121ca914..033ad7f2 100644 --- a/providers/openstack/scs/cluster-addon/csi/Chart.lock +++ b/providers/openstack/scs/cluster-addon/csi/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: openstack-cinder-csi repository: https://kubernetes.github.io/cloud-provider-openstack - version: 2.31.2 -digest: sha256:c4dae4f651e1be8b82347d74df884fb5c7503e4b9e5d4db9424fa7fdf2e447d7 -generated: "2025-01-31T08:58:29.735075689+01:00" + version: 2.32.0 +digest: sha256:86fda0773b17ffa6ae496715f005d132d987a79cbf9a7c16ca5eb96942fb630b +generated: "2025-05-28T21:50:56.213810258+02:00" diff --git a/providers/openstack/scs/cluster-addon/csi/Chart.yaml b/providers/openstack/scs/cluster-addon/csi/Chart.yaml index e56497ed..980ef00b 100644 --- a/providers/openstack/scs/cluster-addon/csi/Chart.yaml +++ b/providers/openstack/scs/cluster-addon/csi/Chart.yaml @@ -1,10 +1,10 @@ apiVersion: v2 -type: application +dependencies: +- alias: openstack-cinder-csi + name: openstack-cinder-csi + repository: https://kubernetes.github.io/cloud-provider-openstack + version: 2.32.0 description: CSI -name: CSI +name: openstack-scs-1-32-cluster-addon +type: application version: v1 -dependencies: - - alias: openstack-cinder-csi - name: openstack-cinder-csi - repository: https://kubernetes.github.io/cloud-provider-openstack - version: 2.31.2 diff --git a/providers/openstack/scs/cluster-addon/csi/charts/openstack-cinder-csi-2.31.2.tgz b/providers/openstack/scs/cluster-addon/csi/charts/openstack-cinder-csi-2.31.2.tgz deleted file mode 100644 index c79ea208..00000000 Binary files a/providers/openstack/scs/cluster-addon/csi/charts/openstack-cinder-csi-2.31.2.tgz and /dev/null differ diff --git a/providers/openstack/scs/cluster-addon/csi/charts/openstack-cinder-csi-2.32.0.tgz b/providers/openstack/scs/cluster-addon/csi/charts/openstack-cinder-csi-2.32.0.tgz new file mode 100644 index 00000000..23e67ece Binary files /dev/null and b/providers/openstack/scs/cluster-addon/csi/charts/openstack-cinder-csi-2.32.0.tgz differ diff --git a/providers/openstack/scs/cluster-addon/metrics-server/Chart.lock b/providers/openstack/scs/cluster-addon/metrics-server/Chart.lock index fa9531c7..56929d7e 100644 --- a/providers/openstack/scs/cluster-addon/metrics-server/Chart.lock +++ b/providers/openstack/scs/cluster-addon/metrics-server/Chart.lock @@ -3,4 +3,4 @@ dependencies: repository: https://kubernetes-sigs.github.io/metrics-server/ version: 3.12.2 digest: sha256:b79715342d7c10e97664b5f4d79199044f5da6ef40cca906218cff05ca891122 -generated: "2025-01-10T10:10:00.37755764+01:00" +generated: "2025-05-28T21:51:03.060237224+02:00" diff --git a/providers/openstack/scs/cluster-addon/metrics-server/Chart.yaml b/providers/openstack/scs/cluster-addon/metrics-server/Chart.yaml index 8b390112..ad407d13 100644 --- a/providers/openstack/scs/cluster-addon/metrics-server/Chart.yaml +++ b/providers/openstack/scs/cluster-addon/metrics-server/Chart.yaml @@ -1,10 +1,10 @@ apiVersion: v2 -type: application +dependencies: +- alias: metrics-server + name: metrics-server + repository: https://kubernetes-sigs.github.io/metrics-server/ + version: 3.12.2 description: Metrics Server -name: metrics-server +name: openstack-scs-1-32-cluster-addon +type: application version: v1 -dependencies: - - name: "metrics-server" - version: "3.12.2" - repository: "https://kubernetes-sigs.github.io/metrics-server/" - alias: "metrics-server" diff --git a/providers/openstack/scs/cluster-class/Chart.yaml b/providers/openstack/scs/cluster-class/Chart.yaml index fa6d1f5d..642bef98 100644 --- a/providers/openstack/scs/cluster-class/Chart.yaml +++ b/providers/openstack/scs/cluster-class/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -description: "This chart installs and configures: +description: 'This chart installs and configures: * Openstack scs Cluster Class - " + ' name: openstack-scs-1-32-cluster-class type: application version: v1 diff --git a/providers/openstack/scs/cluster-class/templates/image.yaml b/providers/openstack/scs/cluster-class/templates/image.yaml index 7ef11351..2850e378 100644 --- a/providers/openstack/scs/cluster-class/templates/image.yaml +++ b/providers/openstack/scs/cluster-class/templates/image.yaml @@ -1,32 +1,30 @@ ---- apiVersion: openstack.k-orc.cloud/v1alpha1 kind: Image metadata: - name: "{{ .Values.images.worker.name }}" + name: '{{ .Values.images.worker.name }}' spec: cloudCredentialsRef: - cloudName: "{{ .Values.identityRef.cloudName }}" - secretName: "{{ .Values.identityRef.name }}" + cloudName: '{{ .Values.identityRef.cloudName }}' + secretName: '{{ .Values.identityRef.name }}' managementPolicy: managed resource: + content: + diskFormat: qcow2 + download: + hash: + algorithm: sha256 + value: 8bfad5cb331480a7530952d8d6ff41155c28b2941f8be7a3f0318ebd1569cf83 + url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.32/ubuntu-2204-kube-v1.32.5.qcow2 properties: + architecture: x86_64 hardware: diskBus: scsi - scsiModel: virtio-scsi - vifModel: virtio qemuGuestAgent: true rngModel: virtio - architecture: x86_64 + scsiModel: virtio-scsi + vifModel: virtio minDiskGB: 20 minMemoryMB: 2048 operatingSystem: distro: ubuntu - version: "22.04" - # hypervisorType: kvm # kvm not officially supported, could use qemu - content: - diskFormat: qcow2 - download: - url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.32/ubuntu-2204-kube-v1.32.1.qcow2 - hash: - algorithm: sha256 - value: 1d261cd043f1c16a676be9079984c912df82387be4c6766b122a966e266a080c + version: '22.04' diff --git a/providers/openstack/scs/cluster-class/values.yaml b/providers/openstack/scs/cluster-class/values.yaml index 98e63587..afb2139f 100644 --- a/providers/openstack/scs/cluster-class/values.yaml +++ b/providers/openstack/scs/cluster-class/values.yaml @@ -1,15 +1,12 @@ -# mirrored from variables.tf controller_flavor: SCS-2V-4-20s -worker_flavor: SCS-2V-4-20 -restrict_kubeapi: [] -# newly introduced: -openstack_loadbalancer_apiserver: false -# TBD, currently needed: +identityRef: + cloudName: openstack + name: openstack images: controlPlane: - name: ubuntu-capi-image-v1.32.1 + name: ubuntu-capi-image-v1.32.5 worker: - name: ubuntu-capi-image-v1.32.1 -identityRef: - name: openstack - cloudName: openstack + name: ubuntu-capi-image-v1.32.5 +openstack_loadbalancer_apiserver: false +restrict_kubeapi: [] +worker_flavor: SCS-2V-4-20 diff --git a/providers/openstack/scs/csctl.yaml b/providers/openstack/scs/csctl.yaml index 909bd097..7a65ae35 100644 --- a/providers/openstack/scs/csctl.yaml +++ b/providers/openstack/scs/csctl.yaml @@ -1,7 +1,7 @@ apiVersion: csctl.clusterstack.x-k8s.io/v1alpha1 config: clusterStackName: scs - kubernetesVersion: v1.32.1 + kubernetesVersion: v1.32.5 provider: apiVersion: openstack.csctl.clusterstack.x-k8s.io/v1alpha1 type: openstack diff --git a/providers/openstack/scs/versions.yaml b/providers/openstack/scs/versions.yaml index f56a9370..99fc8c73 100644 --- a/providers/openstack/scs/versions.yaml +++ b/providers/openstack/scs/versions.yaml @@ -1,9 +1,9 @@ -- kubernetes: 1.30.11 +- kubernetes: 1.30.13 cinder_csi: 2.30.3 occm: 2.30.5 -- kubernetes: 1.31.7 +- kubernetes: 1.31.9 cinder_csi: 2.31.7 occm: 2.31.3 -- kubernetes: 1.32.3 +- kubernetes: 1.32.5 cinder_csi: 2.32.0 occm: 2.32.0