Set yawol default image and flavor via cluster variables

Signed-off-by: Roman Hros <[email protected]>
SovereignCloudStack · Apr 10, 2024 · 2eaf17d · 2eaf17d
1 parent e2df073
commit 2eaf17d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/providers/openstack/wooctavia/1-27/cluster-addon-values.yaml b/providers/openstack/wooctavia/1-27/cluster-addon-values.yaml
@@ -7,3 +7,10 @@ values: |
     yawolFloatingID: "{{ .InfraCluster.status.externalNetwork.id }}"
     yawolNetworkID: "{{ .InfraCluster.status.network.id }}"
     yawolAPIHost: "{{ printf "https://%s:%d" .Cluster.spec.controlPlaneEndpoint.host .Cluster.spec.controlPlaneEndpoint.port }}"
+    {{- range .Cluster.spec.topology.variables }}
+    {{- if eq .name "yawol_flavor_id" }}
+    yawolFlavorID: {{ .value }}
+    {{- else if eq .name "yawol_image_id" }}
+    yawolImageID: {{ .value }}
+    {{- end }}
+    {{- end }}
diff --git a/providers/openstack/wooctavia/1-27/cluster-addon/values.yaml b/providers/openstack/wooctavia/1-27/cluster-addon/values.yaml
@@ -48,5 +48,3 @@ openstack-cinder-csi:
     effect: NoSchedule
 yawol-controller:
   yawolOSSecretName: cloud-config
-  yawolFlavorID: 0a79590e-10d7-4c2c-8f69-ca0a2c6208d2 # SCS-1V-2-5
-  yawolImageID: f0b2ef46-f0ff-43d2-9c08-f58a5a6e9060 # yawol-alpine-yawol-controller-0.21.3-5-g2a2b2f9
diff --git a/providers/openstack/wooctavia/1-27/cluster-class/templates/cluster-class.yaml b/providers/openstack/wooctavia/1-27/cluster-class/templates/cluster-class.yaml
@@ -74,6 +74,22 @@ spec:
          minimum: 1
          example: 20
          description: "Root disk size in GiB for worker nodes. OpenStack volume will be created and used instead of an ephemeral disk defined in flavor. Should be used also for the diskless flavors."
+   - name: yawol_flavor_id
+     required: true
+     schema:
+       openAPIV3Schema:
+         type: string
+         format: "uuid4"
+         example: "0a79590e-10d7-4c2c-8f69-ca0a2c6208d2"
+         description: "ID of the existing flavor used as a default yawol flavor."
+   - name: yawol_image_id
+     required: true
+     schema:
+       openAPIV3Schema:
+         type: string
+         format: "uuid4"
+         example: "f0b2ef46-f0ff-43d2-9c08-f58a5a6e9060"
+         description: "ID of the existing imaged used as a default yawol image."
    - name: network_id
      required: true
      schema: