Merge pull request kubernetes-sigs#658 from figo/dockerfile

Bump default golang version to 1.12.10 to address CVE-2019-16276

Dockerfile

@@ -13,7 +13,8 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.12.9 as builder
+ARG GOLANG_VERSION=golang:1.12.10
+FROM $GOLANG_VERSION as builder
 WORKDIR /workspace
 
 # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy

scripts/e2e/e2e.sh

@@ -137,6 +137,15 @@ start_docker() {
    done
 }
 
+install_govc() {
+   GOVC_VERSION=v0.21.0
+   GOVC_PKG_NAME=govc_linux_amd64
+   curl -L -O https://github.com/vmware/govmomi/releases/download/"${GOVC_VERSION}"/"${GOVC_PKG_NAME}".gz
+   gunzip "${GOVC_PKG_NAME}".gz
+   mv "${GOVC_PKG_NAME}" /usr/local/bin/govc
+   chmod +x /usr/local/bin/govc
+}
+
 on_exit() {
   [ "${VM_CREATED}" ] || return 0
   get_bootstrap_vm "${CONTEXT}"
@@ -158,8 +167,7 @@ export CAPI_VERSION=v0.2.7
 echo "build vSphere controller version: ${VERSION}"
 echo "using clusterctl version: ${CAPI_VERSION}"
 
-# install_govc
-go get -u github.com/vmware/govmomi/govc
+install_govc
 
 # Push new container images
 # TODO the `-k` flag here is a workaround until we can set GCR_KEY_FILE properly