fix(t8s-cluster/management-cluster): openstackImageNamePrefix

teutonet · Mar 5, 2024 · 83e9a8d · 83e9a8d
1 parent c6d2faa
commit 83e9a8d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/charts/t8s-cluster/templates/management-cluster/clusterClass/clusterClass.yaml b/charts/t8s-cluster/templates/management-cluster/clusterClass/clusterClass.yaml
@@ -120,7 +120,7 @@ spec:
               op: add
               path: /spec/template/spec/image
               valueFrom:
-                template: {{ .Values.imageNameTemplate.computePlane }}
+                template: {{ printf "t8s-engine-%s-{{ .builtin.machineDeployment.version }}" .Values.openstackImageNamePrefix }}
           selector: &imagePatchSelector
             apiVersion: {{ include "t8s-cluster.clusterClass.infrastructureApiVersion" (dict) }}
             kind: OpenStackMachineTemplate
@@ -130,7 +130,7 @@ spec:
         - jsonPatches:
             - <<: *imagePatch
               valueFrom:
-                template: {{ .Values.imageNameTemplate.controlPlane }}
+                template: {{ printf "t8s-engine-%s-{{ .builtin.controlPlane.version }}" .Values.openstackImageNamePrefix }}
           selector:
             <<: *imagePatchSelector
             matchResources:

diff --git a/charts/t8s-cluster/values.schema.json b/charts/t8s-cluster/values.schema.json
@@ -244,21 +244,8 @@
         "calico"
       ]
     },
-    "imageNameTemplate": {
-      "type": "object",
-      "properties": {
-        "computePlane": {
-          "type": "string"
-        },
-        "controlPlane": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "computePlane",
-        "controlPlane"
-      ],
-      "additionalProperties": false
+    "openstackImageNamePrefix": {
+      "type": "string"
     },
     "common": {
       "type": "object",
@@ -269,6 +256,7 @@
     "metadata",
     "version",
     "controlPlane",
+    "openstackImageNamePrefix",
     "nodePools"
   ],
   "additionalProperties": false,

diff --git a/charts/t8s-cluster/values.yaml b/charts/t8s-cluster/values.yaml
@@ -69,6 +69,4 @@ sshKeyName: null
 
 cni: cilium
 
-imageNameTemplate:
-  computePlane: t8s-engine-{{ .builtin.machineDeployment.version }}
-  controlPlane: t8s-engine-{{ .builtin.controlPlane.version }}
+openstackImageNamePrefix: ""