From 5e1cc3aa3872083d37d2b029ef6d12fd80a440e6 Mon Sep 17 00:00:00 2001 From: Jan Schoone <6106846+jschoone@users.noreply.github.com> Date: Fri, 28 Jun 2024 16:29:03 +0200 Subject: [PATCH 1/2] chore(versions): remove 1.27 since it's EOL from today Signed-off-by: Jan Schoone <6106846+jschoone@users.noreply.github.com> --- providers/openstack/scs/versions.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/providers/openstack/scs/versions.yaml b/providers/openstack/scs/versions.yaml index e06cb611..aff6087f 100644 --- a/providers/openstack/scs/versions.yaml +++ b/providers/openstack/scs/versions.yaml @@ -1,6 +1,3 @@ -- kubernetes: 1.27.15 - cinder_csi: 2.27.3 - occm: 2.27.6 - kubernetes: 1.28.11 cinder_csi: 2.28.2 occm: 2.28.4 From 96d965523b4110a42ef09fc6828d2532515166f2 Mon Sep 17 00:00:00 2001 From: Danny Eiselt Date: Mon, 8 Jul 2024 08:13:01 +0200 Subject: [PATCH 2/2] updated source files Signed-off-by: Danny Eiselt --- .../openstack/scs/cluster-addon/Chart.yaml | 44 +++++++++---------- .../openstack/scs/cluster-class/Chart.yaml | 8 ++-- providers/openstack/scs/csctl.yaml | 4 +- .../openstack/scs/node-images/config.yaml | 8 ++-- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/providers/openstack/scs/cluster-addon/Chart.yaml b/providers/openstack/scs/cluster-addon/Chart.yaml index 5171374d..afec0282 100644 --- a/providers/openstack/scs/cluster-addon/Chart.yaml +++ b/providers/openstack/scs/cluster-addon/Chart.yaml @@ -1,26 +1,26 @@ apiVersion: v2 dependencies: - - alias: metrics-server - name: metrics-server - repository: https://kubernetes-sigs.github.io/metrics-server/ - version: 3.12.0 - - alias: cilium - name: cilium - repository: https://helm.cilium.io/ - version: 1.15.6 - - alias: openstack-cloud-controller-manager - name: openstack-cloud-controller-manager - repository: https://kubernetes.github.io/cloud-provider-openstack - version: 2.27.6 - - alias: openstack-cinder-csi - name: openstack-cinder-csi - repository: https://kubernetes.github.io/cloud-provider-openstack - version: 2.27.3 - - alias: yawol-controller - name: yawol-controller - repository: https://stackitcloud.github.io/yawol - version: 0.21.3 - condition: yawol-controller.enabled -name: openstack-scs-1-27-cluster-addon +- alias: metrics-server + name: metrics-server + repository: https://kubernetes-sigs.github.io/metrics-server/ + version: 3.12.0 +- alias: cilium + name: cilium + repository: https://helm.cilium.io/ + version: 1.15.6 +- alias: openstack-cloud-controller-manager + name: openstack-cloud-controller-manager + repository: https://kubernetes.github.io/cloud-provider-openstack + version: 2.28.4 +- alias: openstack-cinder-csi + name: openstack-cinder-csi + repository: https://kubernetes.github.io/cloud-provider-openstack + version: 2.28.2 +- alias: yawol-controller + condition: yawol-controller.enabled + name: yawol-controller + repository: https://stackitcloud.github.io/yawol + version: 0.21.3 +name: openstack-scs-1-28-cluster-addon type: application version: v1 diff --git a/providers/openstack/scs/cluster-class/Chart.yaml b/providers/openstack/scs/cluster-class/Chart.yaml index 2e266649..fa20e023 100644 --- a/providers/openstack/scs/cluster-class/Chart.yaml +++ b/providers/openstack/scs/cluster-class/Chart.yaml @@ -1,7 +1,9 @@ apiVersion: v2 -description: | - This chart installs and configures: +description: 'This chart installs and configures: + * Openstack scs Cluster Class -name: openstack-scs-1-27-cluster-class + + ' +name: openstack-scs-1-28-cluster-class type: application version: v1 diff --git a/providers/openstack/scs/csctl.yaml b/providers/openstack/scs/csctl.yaml index 88037922..f0e31612 100644 --- a/providers/openstack/scs/csctl.yaml +++ b/providers/openstack/scs/csctl.yaml @@ -1,9 +1,9 @@ apiVersion: csctl.clusterstack.x-k8s.io/v1alpha1 config: - kubernetesVersion: v1.27.14 clusterStackName: scs + kubernetesVersion: v1.28.11 provider: - type: openstack apiVersion: openstack.csctl.clusterstack.x-k8s.io/v1alpha1 config: method: get + type: openstack diff --git a/providers/openstack/scs/node-images/config.yaml b/providers/openstack/scs/node-images/config.yaml index 19289b8d..952a07cf 100644 --- a/providers/openstack/scs/node-images/config.yaml +++ b/providers/openstack/scs/node-images/config.yaml @@ -1,8 +1,8 @@ apiVersion: openstack.infrastructure.clusterstack.x-k8s.io/v1alpha1 openStackNodeImages: -- url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.27/ubuntu-2204-kube-v1.27.14.qcow2 - createOpts: - name: ubuntu-capi-image-v1.27.14 - disk_format: qcow2 +- createOpts: container_format: bare + disk_format: qcow2 + name: ubuntu-capi-image-v1.28.11 visibility: private + url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.28/ubuntu-2204-kube-v1.28.11.qcow2