Merge branch 'main' into fix/adjust-e2e-tests

SovereignCloudStack · Jul 22, 2024 · 1c222da · 1c222da
2 parents 387355a + ddfb876
commit 1c222da
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/providers/openstack/scs/cluster-class/templates/cluster-class.yaml b/providers/openstack/scs/cluster-class/templates/cluster-class.yaml
@@ -38,7 +38,6 @@ spec:
       schema:
         openAPIV3Schema:
           type: string
-          default: "ebfe5546-f09f-4f42-ab54-094e457d42ec"
           example: "ebfe5546-f09f-4f42-ab54-094e457d42ec"
           format: "uuid4"
           description: "ExternalNetworkID is the ID of an external OpenStack Network. This is necessary to get public internet to the VMs."
@@ -553,15 +552,18 @@ cre ate group names like oidc:engineering and oidc:infra."
                 sizeGiB: {{"{{"}} .worker_root_disk {{"}}"}}
     - name: external_id
       description: "Sets the ID of an external OpenStack Network. This is necessary to get public internet to the VMs."
-      enabledIf: {{ `'{{ ne .external_id "" }}'` }}
+      enabledIf: {{ `"{{ if .external_id }}true{{end}}"` }}
       definitions:
         - selector:
             apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
           jsonPatches:
-          - op: replace
+          - op: add
+            path: "/spec/template/spec/externalNetwork"
+            value: {}
+          - op: add
             path: "/spec/template/spec/externalNetwork/id"
             valueFrom:
               variable: external_id

diff --git a/providers/openstack/scs/cluster-class/templates/openstack-cluster-template.yaml b/providers/openstack/scs/cluster-class/templates/openstack-cluster-template.yaml
@@ -51,5 +51,3 @@ spec:
           {{- range .Values.dns_nameservers }}
             - {{ . }}
           {{- end }}
-      externalNetwork:
-        id: {{ .Values.external_id }}
diff --git a/providers/openstack/scs/cluster-class/values.yaml b/providers/openstack/scs/cluster-class/values.yaml
@@ -1,5 +1,4 @@
 # mirrored from variables.tf
-external_id: ebfe5546-f09f-4f42-ab54-094e457d42ec
 dns_nameservers:
   - 5.1.66.255
   - 185.150.99.255