diff --git a/providers/openstack/README.md b/providers/openstack/README.md index 020da239..75125698 100644 --- a/providers/openstack/README.md +++ b/providers/openstack/README.md @@ -42,7 +42,7 @@ Fine grained PAT with `Public Repositories (read-only)` is enough. export GIT_PROVIDER_B64=Z2l0aHVi # github export GIT_ORG_NAME_B64=U292ZXJlaWduQ2xvdWRTdGFjaw== # SovereignCloudStack export GIT_REPOSITORY_NAME_B64=Y2x1c3Rlci1zdGFja3M= # cluster-stacks -export GIT_ACCESS_TOKEN_B64=$(echo -n '' | base64 -w0) +export GIT_ACCESS_TOKEN_B64=$(echo -n '' | base64 -w0) ``` ### CSO and CSPO deployment (CSP) @@ -107,7 +107,7 @@ metadata: spec: provider: openstack name: alpha - kubernetesVersion: "1.28" + kubernetesVersion: "1.29" channel: stable autoSubscribe: false providerRef: @@ -115,7 +115,7 @@ spec: kind: OpenStackClusterStackReleaseTemplate name: cspotemplate versions: - - v3 + - v2 --- apiVersion: infrastructure.clusterstack.x-k8s.io/v1alpha1 kind: OpenStackClusterStackReleaseTemplate @@ -166,15 +166,15 @@ spec: value: "SCS-2V-4-50" - name: external_id value: "ebfe5546-f09f-4f42-ab54-094e457d42ec" # gx-scs - class: openstack-alpha-1-28-v3 + class: openstack-alpha-1-29-v2 controlPlane: replicas: 1 - version: v1.28.6 + version: v1.29.3 workers: machineDeployments: - - class: capi-openstack-alpha-1-28 + - class: openstack-alpha-1-29-v2 failureDomain: nova - name: capi-openstack-alpha-1-28 + name: openstack-alpha-1-29-v2 replicas: 3 EOF ``` @@ -226,4 +226,4 @@ kube-system openstack-cinder-csi-nodeplugin-crhc4 3/3 R kube-system openstack-cinder-csi-nodeplugin-d7rzz 3/3 Running 0 7m58s kube-system openstack-cinder-csi-nodeplugin-nkgq6 3/3 Running 0 6m44s kube-system openstack-cloud-controller-manager-hp2n2 1/1 Running 0 7m9s -``` +``` \ No newline at end of file diff --git a/providers/openstack/alpha/1-29/cluster-class/templates/cluster-class.yaml b/providers/openstack/alpha/1-29/cluster-class/templates/cluster-class.yaml index fed721fe..74daff61 100644 --- a/providers/openstack/alpha/1-29/cluster-class/templates/cluster-class.yaml +++ b/providers/openstack/alpha/1-29/cluster-class/templates/cluster-class.yaml @@ -159,6 +159,22 @@ spec: example: "capi-keypair" description: "The ssh key to inject in the nodes." patches: + - name: k8s_version + description: "Sets the openstack node image for workers and the controlplane to the cluster-api image with the version mentioned in spec.topology.version." + definitions: + - selector: + apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7 + kind: OpenStackMachineTemplate + matchResources: + controlPlane: true + machineDeploymentClass: + names: + - {{ .Release.Name }}-{{ .Chart.Version }} + jsonPatches: + - op: add + path: "/spec/template/spec/image" + valueFrom: + template: ubuntu-capi-image-{{ `{{ .builtin.cluster.topology.version }}` }} - name: controller_flavor description: "Sets the openstack instance flavor for the KubeadmControlPlane." enabledIf: {{ `'{{ ne .controller_flavor "" }}'` }} diff --git a/providers/openstack/alpha/1-29/cluster-class/templates/openstack-machine-template-control-plane.yaml b/providers/openstack/alpha/1-29/cluster-class/templates/openstack-machine-template-control-plane.yaml index 2efa0b86..a32f80fa 100644 --- a/providers/openstack/alpha/1-29/cluster-class/templates/openstack-machine-template-control-plane.yaml +++ b/providers/openstack/alpha/1-29/cluster-class/templates/openstack-machine-template-control-plane.yaml @@ -9,5 +9,4 @@ spec: flavor: {{ .Values.controller_flavor }} identityRef: kind: Secret - name: {{ default "openstack" .Values.secrets.clouds_yaml }} - image: {{ .Values.images.controlPlane.name }} + name: {{ default "openstack" .Values.secrets.clouds_yaml }} \ No newline at end of file diff --git a/providers/openstack/alpha/1-29/cluster-class/templates/openstack-machine-template-worker.yaml b/providers/openstack/alpha/1-29/cluster-class/templates/openstack-machine-template-worker.yaml index 4db249bc..11edf1cd 100644 --- a/providers/openstack/alpha/1-29/cluster-class/templates/openstack-machine-template-worker.yaml +++ b/providers/openstack/alpha/1-29/cluster-class/templates/openstack-machine-template-worker.yaml @@ -9,5 +9,4 @@ spec: flavor: {{ .Values.worker_flavor }} identityRef: kind: Secret - name: {{ default "openstack" .Values.secrets.clouds_yaml }} - image: {{ .Values.images.worker.name }} + name: {{ default "openstack" .Values.secrets.clouds_yaml }} \ No newline at end of file diff --git a/providers/openstack/alpha/1-29/cluster-class/values.yaml b/providers/openstack/alpha/1-29/cluster-class/values.yaml index 0c7cbb3c..a9d74ca6 100644 --- a/providers/openstack/alpha/1-29/cluster-class/values.yaml +++ b/providers/openstack/alpha/1-29/cluster-class/values.yaml @@ -11,13 +11,6 @@ restrict_kubeapi: [] # newly introduced: openstack_loadbalancer_apiserver: true -# TBD, currently needed: -images: - controlPlane: - name: ubuntu-capi-image-v1.29.3 - worker: - name: ubuntu-capi-image-v1.29.3 - cloud: name: "openstack" secrets: diff --git a/providers/openstack/alpha/1-29/node-images/config.yaml b/providers/openstack/alpha/1-29/node-images/config.yaml index 735909f5..66a9cf68 100644 --- a/providers/openstack/alpha/1-29/node-images/config.yaml +++ b/providers/openstack/alpha/1-29/node-images/config.yaml @@ -5,4 +5,4 @@ openStackNodeImages: name: ubuntu-capi-image-v1.29.3 disk_format: qcow2 container_format: bare - visibility: private + visibility: private \ No newline at end of file