Make External Network Optional (#6)

unikorn-cloud · Jun 10, 2024 · 4c52c19 · 4c52c19
1 parent f7c6ca6
commit 4c52c19
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git 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.0
+version: v0.4.1
 icon: https://raw.githubusercontent.com/unikorn-cloud/helm-cluster-api/main/icons/default.png
diff --git a/charts/cluster-api-cluster-openstack/templates/cluster.yaml b/charts/cluster-api-cluster-openstack/templates/cluster.yaml
@@ -55,8 +55,10 @@ spec:
   managedSubnets:
   - cidr: {{ .Values.network.nodeCIDR }}
     dnsNameservers: {{ toJson .Values.network.dnsNameservers }}
+  {{- with $net := .Values.openstack.externalNetworkID }}
   externalNetwork:
-    id: {{ .Values.openstack.externalNetworkID }}
+    id: {{ $net }}
+  {{- end }}
 ---
 apiVersion: v1
 kind: Secret

diff --git a/charts/cluster-api-cluster-openstack/values.schema.json b/charts/cluster-api-cluster-openstack/values.schema.json
@@ -235,7 +235,6 @@
 			"required": [
 				"cloud",
 				"cloudsYAML",
-				"externalNetworkID",
 				"computeFailureDomain"
 			],
 			"properties": {

diff --git a/charts/cluster-api-cluster-openstack/values.yaml b/charts/cluster-api-cluster-openstack/values.yaml
@@ -20,7 +20,9 @@ openstack:
   cloudsYAML: Y2hhbmdlIG1lIQ==
 
   # External (public) network ID.
-  externalNetworkID: b19ce45a-3278-48e4-8a0e-83100af68778
+  # If one is not specified, CAPO will use the only network it finds, otherwise
+  # it will error.
+  # externalNetworkID: b19ce45a-3278-48e4-8a0e-83100af68778
 
   # Openstack endpoint CA, base64 encoded.
   # ca: Y2hhbmdlIG1lIQ==