Merge pull request #482 from codenrhoden/use-gcr-keyfile-env

Remove E2E use of hardcoded path to key file

Author: k8s-ci-robot

scripts/e2e/bootstrap_job/Makefile

@@ -17,8 +17,8 @@ build: copyspec
 push: build
 	@echo "logging into gcr.io registry with key file"
 	# TODO hardcoded key file location is a temp workaround
-	gcloud auth activate-service-account --key-file /root/.capv/keyfile.json
-	docker login -u _json_key --password-stdin gcr.io </root/.capv/keyfile.json
+	gcloud auth activate-service-account --key-file $(GCR_KEY_FILE)
+	docker login -u _json_key --password-stdin gcr.io <"$(GCR_KEY_FILE)"
 	docker push $(REGISTRY):$(VERSION)
 	@echo docker logout gcr.io
 	gcloud auth revoke

scripts/e2e/e2e.sh

@@ -182,8 +182,7 @@ export_base64_value "TARGET_VM_PREFIX" "${TARGET_VM_PRE}"
 go get -u github.com/vmware/govmomi/govc
 
 # Push new container images
-# TODO the `-k` flag here is a workaround until we can set GCR_KEY_FILE properly
-hack/release.sh -t pr -p -k /root/.capv/keyfile.json
+hack/release.sh -t pr -p
 cd ./scripts/e2e/bootstrap_job && make push && cd .. || exit 1
 
 # get bootstrap VM