Merge pull request #1517 from mikebrow/fix-e2e-bucket

mikebrow · web-flow · commit 682d158399ed · 2020-06-24T19:54:54.000-05:00
hard set kubernetes version not in vendor.conf anymore
diff --git a/hack/test-e2e-node.sh b/hack/test-e2e-node.sh
@@ -62,12 +62,7 @@ fi
 GOPATH=${GOPATH%%:*}
 
 # Get kubernetes
-from-vendor KUBERNETES k8s.io/kubernetes
-# k8s.io is actually a redirect, but we do not handle the go-import
-# metadata which `go get` and `vndr` etc do. Handle it manually here.
-if [ x"$KUBERNETES_REPO" = "xk8s.io" ] ; then
-  KUBERNETES_REPO="https://github.com/kubernetes/kubernetes"
-fi
+KUBERNETES_REPO="https://github.com/kubernetes/kubernetes"
 KUBERNETES_PATH="${GOPATH}/src/k8s.io/kubernetes"
 if [ ! -d "${KUBERNETES_PATH}" ]; then
   mkdir -p ${KUBERNETES_PATH}
diff --git a/hack/utils.sh b/hack/utils.sh
@@ -17,6 +17,7 @@
 ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
 
 # Not from vendor.conf.
+KUBERNETES_VERSION="v1.19.0-beta.2"
 CRITOOL_VERSION=${CRITOOL_VERSION:-75ef33dc2b4ecb08e0237d91de1b664909d262de}
 CRITOOL_PKG=github.com/kubernetes-sigs/cri-tools
 CRITOOL_REPO=github.com/kubernetes-sigs/cri-tools
diff --git a/pkg/server/image_pull.go b/pkg/server/image_pull.go
@@ -284,7 +284,7 @@ func (c *criService) getTLSConfig(registryTLSConfig criconfig.TLSConfig) (*tls.C
 		if len(cert.Certificate) != 0 {
 			tlsConfig.Certificates = []tls.Certificate{cert}
 		}
-		tlsConfig.BuildNameToCertificate()
+		tlsConfig.BuildNameToCertificate() // nolint:staticcheck
 	}
 
 	if registryTLSConfig.CAFile != "" {

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ func (c criService) getTLSConfig(registryTLSConfig criconfig.TLSConfig) (tls.C`
`284`	`284`	`if len(cert.Certificate) != 0 {`
`285`	`285`	`tlsConfig.Certificates = []tls.Certificate{cert}`
`286`	`286`	`}`
`287`		`- tlsConfig.BuildNameToCertificate()`
	`287`	`+ tlsConfig.BuildNameToCertificate() // nolint:staticcheck`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`if registryTLSConfig.CAFile != "" {`