Removed the hardcoding for ControlPlaneEndpoint in Cluster Template (#…

…201) Signed-off-by: Dharmjit Singh <[email protected]>
vmware-tanzu · Nov 3, 2021 · e90b030 · e90b030
1 parent 4aec5ab
commit e90b030
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -109,7 +109,7 @@ prepare-byoh-docker-host-image:
 	docker build test/e2e -f test/e2e/BYOHDockerFile -t ${BYOH_BASE_IMG}
 
 test-e2e: docker-build prepare-byoh-docker-host-image $(GINKGO) cluster-templates ## Run the end-to-end tests
-	$(GINKGO) -v -trace -tags=e2e -focus="$(GINKGO_FOCUS)" $(_SKIP_ARGS) -nodes=$(GINKGO_NODES) --noColor=$(GINKGO_NOCOLOR) $(GINKGO_ARGS) test/e2e -- \
+	CONTROL_PLANE_ENDPOINT_IP=172.18.10.151 $(GINKGO) -v -trace -tags=e2e -focus="$(GINKGO_FOCUS)" $(_SKIP_ARGS) -nodes=$(GINKGO_NODES) --noColor=$(GINKGO_NOCOLOR) $(GINKGO_ARGS) test/e2e -- \
 	    -e2e.artifacts-folder="$(ARTIFACTS)" \
 	    -e2e.config="$(E2E_CONF_FILE)" \
 	    -e2e.skip-resource-cleanup=$(SKIP_RESOURCE_CLEANUP) -e2e.use-existing-cluster=$(USE_EXISTING_CLUSTER) \

diff --git a/docs/local_dev.md b/docs/local_dev.md
@@ -134,7 +134,7 @@ export NAMESPACE="default"
 export KUBERNETES_VERSION="v1.22.0"
 export CONTROL_PLANE_MACHINE_COUNT=1
 export WORKER_MACHINE_COUNT=1
-export CONTROL_PLANE_ENDPOINT=<static IP from the subnet where the containers are running>
+export CONTROL_PLANE_ENDPOINT_IP=<static IP from the subnet where the containers are running>
 ```
 
 From ```cluster-api-provider-bringyourownhost``` folder

diff --git a/test/e2e/data/infrastructure-provider-byoh/v1beta1/cluster-template-byoh.yaml b/test/e2e/data/infrastructure-provider-byoh/v1beta1/cluster-template-byoh.yaml
@@ -82,7 +82,7 @@ spec:
             - name: vip_leaderelection
               value: "true"
             - name: vip_address
-              value: ${CONTROL_PLANE_ENDPOINT}
+              value: ${CONTROL_PLANE_ENDPOINT_IP}
             - name: vip_interface
               value: {{ .DefaultNetworkInterfaceName }}
             - name: vip_leaseduration

diff --git a/test/e2e/data/infrastructure-provider-byoh/v1beta1/cluster-template.yaml b/test/e2e/data/infrastructure-provider-byoh/v1beta1/cluster-template.yaml
@@ -119,7 +119,7 @@ spec:
             - name: vip_leaderelection
               value: "true"
             - name: vip_address
-              value: 172.18.10.10
+              value: ${CONTROL_PLANE_ENDPOINT_IP}
             - name: vip_interface
               value: {{ .DefaultNetworkInterfaceName }}
             - name: vip_leaseduration
@@ -184,7 +184,7 @@ metadata:
   name: ${CLUSTER_NAME}
 spec:
   controlPlaneEndpoint:
-    host: 172.18.10.10
+    host: ${CONTROL_PLANE_ENDPOINT_IP}
     port: 6443
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1

diff --git a/test/e2e/data/infrastructure-provider-byoh/v1beta1/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-provider-byoh/v1beta1/cluster-with-kcp.yaml
@@ -28,7 +28,7 @@ metadata:
   name: ${CLUSTER_NAME}
 spec:
   controlPlaneEndpoint:
-    host: 172.18.10.10
+    host: ${CONTROL_PLANE_ENDPOINT_IP}
     port: 6443
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -77,7 +77,7 @@ spec:
             - name: vip_leaderelection
               value: "true"
             - name: vip_address
-              value: 172.18.10.10
+              value: ${CONTROL_PLANE_ENDPOINT_IP}
             - name: vip_interface
               value: {{ .DefaultNetworkInterfaceName }}
             - name: vip_leaseduration