diff --git a/charts/cluster-api-cluster-openstack/Chart.yaml b/charts/cluster-api-cluster-openstack/Chart.yaml index a08fad4..9e523b7 100644 --- a/charts/cluster-api-cluster-openstack/Chart.yaml +++ b/charts/cluster-api-cluster-openstack/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: cluster-api-cluster-openstack description: A Helm chart to deploy a Kubernetes Cluster type: application -version: v0.4.1 +version: v0.4.2 icon: https://raw.githubusercontent.com/unikorn-cloud/helm-cluster-api/main/icons/default.png diff --git a/charts/cluster-api-cluster-openstack/templates/control-plane.yaml b/charts/cluster-api-cluster-openstack/templates/control-plane.yaml index fe17cff..4229ae4 100644 --- a/charts/cluster-api-cluster-openstack/templates/control-plane.yaml +++ b/charts/cluster-api-cluster-openstack/templates/control-plane.yaml @@ -72,10 +72,9 @@ metadata: spec: template: spec: - flavor: {{ .Values.controlPlane.machine.flavor }} + flavor: {{ .Values.controlPlane.machine.flavorID }} image: - filter: - name: {{ .Values.controlPlane.machine.image }} + id: {{ .Values.controlPlane.machine.imageID }} {{- if .Values.openstack.sshKeyName }} sshKeyName: {{ .Values.openstack.sshKeyName }} {{- end }} diff --git a/charts/cluster-api-cluster-openstack/templates/workload.yaml b/charts/cluster-api-cluster-openstack/templates/workload.yaml index 4b7ddaf..58034d0 100644 --- a/charts/cluster-api-cluster-openstack/templates/workload.yaml +++ b/charts/cluster-api-cluster-openstack/templates/workload.yaml @@ -67,10 +67,9 @@ spec: identityRef: name: {{ include "cloudconfig.name" $ }} cloudName: {{ $.Values.openstack.cloud }} - flavor: {{ $pool.machine.flavor }} + flavor: {{ $pool.machine.flavorID }} image: - filter: - name: {{ $pool.machine.image }} + id: {{ $pool.machine.imageID }} {{- if $.Values.openstack.sshKeyName }} sshKeyName: {{ $.Values.openstack.sshKeyName }} {{- end }} diff --git a/charts/cluster-api-cluster-openstack/values.schema.json b/charts/cluster-api-cluster-openstack/values.schema.json index 612187a..e682849 100644 --- a/charts/cluster-api-cluster-openstack/values.schema.json +++ b/charts/cluster-api-cluster-openstack/values.schema.json @@ -101,14 +101,14 @@ "machine": { "type": "object", "required": [ - "image", - "flavor" + "imageID", + "flavorID" ], "properties": { - "image": { + "imageID": { "type": "string" }, - "flavor": { + "flavorID": { "type": "string" }, "disk": { diff --git a/charts/cluster-api-cluster-openstack/values.yaml b/charts/cluster-api-cluster-openstack/values.yaml index 3903667..511bbf6 100644 --- a/charts/cluster-api-cluster-openstack/values.yaml +++ b/charts/cluster-api-cluster-openstack/values.yaml @@ -81,10 +81,10 @@ controlPlane: # Modifications to this object will trigger a control plane upgrade. machine: # Openstack image name. - image: ubuntu-2204-kubernetes-1.25.0 + imageID: f810a963-437d-4a24-a972-a0bff942542b # Control plane machine type. - flavor: m1.large + flavorID: 6ac45c49-3e3b-4cdf-acbc-d98a321a92c0 # Ephemeral disk size in GiB. If specified this overrides the default # size for the flavor. @@ -108,10 +108,10 @@ controlPlane: # # Modifications to these objects will trigger a affected workload pool upgrades. # machine: # # Openstack image name. -# image: ubuntu-2204-kubernetes-1.25.0 +# imageID: f810a963-437d-4a24-a972-a0bff942542b # # # Workload machine type. -# flavor: m1.large +# flavorID: 6ac45c49-3e3b-4cdf-acbc-d98a321a92c0 # # # Ephemeral disk size in GiB. If specified this overrides the default # # size for the flavor.