Merge pull request #457 from ykakarap/e2e_spec_files

generate e2e spec files at runtime

Author: k8s-ci-robot

scripts/e2e/bootstrap_job.template

@@ -15,11 +15,6 @@ spec:
         env:
           - name: CLUSTERCTL_VERSION
             value: ${VERSION}
-          - name: TARGET_VM_PREFIX
-            valueFrom:
-              secretKeyRef:
-                name: clusterapi-provider-vsphere-ci-secret
-                key: target-vm-prefix
           - name: TARGET_VM_SSH
             valueFrom:
               secretKeyRef:
@@ -30,31 +25,11 @@ spec:
               secretKeyRef:
                 name: clusterapi-provider-vsphere-ci-secret
                 key: target-vm-ssh-pub
-          - name: VSPHERE_CONTROLLER_VERSION
-            valueFrom:
-              secretKeyRef:
-                name: clusterapi-provider-vsphere-ci-secret
-                key: vsphere-controller-version
           - name: PROVIDER_COMPONENT_SPEC
             valueFrom:
               secretKeyRef:
                 name: clusterapi-provider-vsphere-ci-secret
                 key: provider-component-spec
-          - name: VSPHERE_SERVER
-            valueFrom:
-              secretKeyRef:
-                name: clusterapi-provider-vsphere-ci-secret
-                key: vsphere-server
-          - name: VSPHERE_USERNAME
-            valueFrom:
-              secretKeyRef:
-                name: clusterapi-provider-vsphere-ci-secret
-                key: vsphere-username
-          - name: VSPHERE_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: clusterapi-provider-vsphere-ci-secret
-                key: vsphere-password
           - name: BOOTSTRAP_KUBECONFIG
             valueFrom:
               secretKeyRef:

scripts/e2e/bootstrap_job/Dockerfile

@@ -16,7 +16,7 @@ FROM ${BASE_IMAGE}
 LABEL maintainer="Hui Luo <[email protected]>"
 
 COPY *.sh /clusterapi/
-COPY spec /clusterapi/spec
+COPY out/e2e-cluster /clusterapi/spec
 
 WORKDIR /clusterapi/
 CMD ["shell"]

scripts/e2e/bootstrap_job/Makefile

@@ -6,12 +6,12 @@ REGISTRY ?=gcr.io/cluster-api-provider-vsphere/pr/ci
 all: build
 .PHONY : all
 
-.PHONY : copyspec
-copyspec:
-	cp ../../../cmd/clusterctl/examples/vsphere/addons.yaml.template ./spec/addons.template
+.PHONY: genspec
+genspec:
+	../generate-e2e-spec.sh
 
 .PHONY : build
-build: copyspec
+build: genspec
 	docker build . --tag $(REGISTRY):$(VERSION)
 
 push: build

scripts/e2e/bootstrap_job/clusterctl.sh

@@ -18,11 +18,6 @@
 # bootstrap need be created beforehand.
 
 # specs requires following enviroments variables:
-# VSPHERE_SERVER
-# VSPHERE_USERNAME
-# VSPHERE_PASSWORD
-# VSPHERE_CONTROLLER_VERSION
-# TARGET_VM_PREFIX
 # TARGET_VM_SSH  (base64 encoded)
 # TARGET_VM_SSH_PUB (base64 encoded)
 # BOOTSTRAP_KUBECONFIG
@@ -42,9 +37,6 @@ TARGET_VM_SSH_PUB=$(echo -n "${TARGET_VM_SSH_PUB}" | base64 -w 0)
 export TARGET_VM_SSH TARGET_VM_SSH_PUB
 echo "${TARGET_VM_SSH_PUB}"
 
-for filename in spec/*.template; do
-  envsubst >"${filename//template/yml}" <"$filename"
-done
 
 # download kubectl binary
 retry=20
@@ -69,10 +61,10 @@ chmod +x /usr/local/bin/clusterctl
 
 # run clusterctl
 echo "test ${PROVIDER_COMPONENT_SPEC}"
-clusterctl create cluster -e ~/.kube/config -c ./spec/cluster.yml \
-    -m ./spec/machines.yml \
+clusterctl create cluster -e ~/.kube/config -c ./spec/cluster.yaml \
+    -m ./spec/machines.yaml \
     -p ./spec/"${PROVIDER_COMPONENT_SPEC}" \
-    -a ./spec/addons.yml \
+    -a ./spec/addons.yaml \
     --provider vsphere \
     -v 6