Use env var for CAPL subnet patching

Author: komer3

Makefile

@@ -176,7 +176,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) NB_IPV6_CIDR=$(NB_IPV6_CIDR) ./hack/patch-capl-manifest.sh $(MANIFEST_NAME).yaml
+	IMG=$(IMG) NB_IPV6_CIDR=$(NB_IPV6_CIDR) SUBNET_NAME=$(SUBNET_NAME) ./hack/patch-capl-manifest.sh $(MANIFEST_NAME).yaml
 
 .PHONY: create-capl-cluster
 create-capl-cluster: clusterctl
@@ -256,7 +256,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) NB_IPV6_CIDR=$(NB_IPV6_CIDR) ./hack/patch-capl-manifest.sh $(SUBNET_MANIFEST_NAME).yaml testing
+	IMG=$(IMG) NB_IPV6_CIDR=$(NB_IPV6_CIDR) SUBNET_NAME=testing ./hack/patch-capl-manifest.sh $(SUBNET_MANIFEST_NAME).yaml
 	# 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

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-if [ "$#" -lt 1 ] || [ "$#" -gt 2 ]; then
-  echo "usage: $0 <manifest-path> [subnet-name]" >&2
+if [ "$#" -ne 1 ]; then
+  echo "usage: $0 <manifest-path>" >&2
   exit 1
 fi
 
 MANIFEST_PATH="$1"
-SUBNET_NAME="${2:-}"
+SUBNET_NAME="${SUBNET_NAME:-}"
 IMG_REPO="${IMG%:*}"
 IMG_TAG="${IMG##*:}"
 NB_IPV6_CIDR="${NB_IPV6_CIDR:-}"