Add support for NB_IPV6_CIDR in CAPL manifest generation

Author: komer3

Makefile

@@ -173,7 +173,7 @@ generate-capl-cluster-manifests: clusterctl
 	LINODE_FIREWALL_ENABLED=$(LINODE_FIREWALL_ENABLED) LINODE_OS=$(LINODE_OS) VPC_NAME=$(VPC_NAME) $(CLUSTERCTL) generate cluster $(CLUSTER_NAME) \
 		--kubernetes-version $(K8S_VERSION) --infrastructure linode-linode:$(CAPL_VERSION) \
 		--control-plane-machine-count $(CONTROLPLANE_NODES) --worker-machine-count $(WORKER_NODES) --flavor kubeadm-dual-stack > $(MANIFEST_NAME).yaml
-	IMG=$(IMG) ./hack/patch-capl-manifest.sh $(MANIFEST_NAME).yaml
+	IMG=$(IMG) NB_IPV6_CIDR=$(NB_IPV6_CIDR) ./hack/patch-capl-manifest.sh $(MANIFEST_NAME).yaml
 
 .PHONY: create-capl-cluster
 create-capl-cluster: clusterctl
@@ -253,7 +253,7 @@ e2e-test-subnet:
 	SUBNET_NAME=testing CLUSTER_NAME=$(SUBNET_CLUSTER_NAME) MANIFEST_NAME=$(SUBNET_MANIFEST_NAME) VPC_NAME=$(CLUSTER_NAME) \
 		VPC_NETWORK_CIDR=172.16.0.0/16 K8S_CLUSTER_CIDR=172.16.64.0/18 make generate-capl-cluster-manifests
 	# Add subnetNames to HelmChartProxy
-	IMG=$(IMG) ./hack/patch-capl-manifest.sh $(SUBNET_MANIFEST_NAME).yaml testing
+	IMG=$(IMG) NB_IPV6_CIDR=$(NB_IPV6_CIDR) ./hack/patch-capl-manifest.sh $(SUBNET_MANIFEST_NAME).yaml testing
 	# Create the second cluster
 	MANIFEST_NAME=$(SUBNET_MANIFEST_NAME) CLUSTER_NAME=$(SUBNET_CLUSTER_NAME) KUBECONFIG_PATH=$(SUBNET_KUBECONFIG_PATH) \
 		make create-capl-cluster

hack/patch-capl-manifest.sh

@@ -9,7 +9,7 @@ fi
 MANIFEST_PATH="$1"
 SUBNET_NAME="${2:-}"
 IMG_TAG="${IMG##*:}"
-NB_IPV6_CIDR="${NB_IPV6_CIDR:-2600:3c06::/32}"
+NB_IPV6_CIDR="${NB_IPV6_CIDR:-}"
 
 yq -i e '
   select(.kind == "LinodeVPC").spec.ipv6Range = [{"range": "auto"}] |
@@ -30,12 +30,14 @@ yq -i e '
   )
 ' "${MANIFEST_PATH}"
 
-NB_IPV6_CIDR="${NB_IPV6_CIDR}" yq -i e '
-  (
-    select(.kind == "LinodeFirewall" and (.metadata.name | test("-nb$") | not)).spec.inboundRules[] |
-    select(.label == "inbound-api-server" or .label == "accept-NodeBalancer").addresses.ipv6
-  ) = [strenv(NB_IPV6_CIDR)]
-' "${MANIFEST_PATH}"
+if [ -n "${NB_IPV6_CIDR}" ]; then
+  NB_IPV6_CIDR="${NB_IPV6_CIDR}" yq -i e '
+    (
+      select(.kind == "LinodeFirewall" and (.metadata.name | test("-nb$") | not)).spec.inboundRules[] |
+      select(.label == "inbound-api-server" or .label == "accept-NodeBalancer").addresses.ipv6
+    ) = [strenv(NB_IPV6_CIDR)]
+  ' "${MANIFEST_PATH}"
+fi
 
 if [ -n "${SUBNET_NAME}" ]; then
   tmp_values="$(mktemp)"