diff --git a/hack/test-e2e-node.sh b/hack/test-e2e-node.sh index 1c7b1d580..9038a7f22 100755 --- 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 index 5dc2816f4..7414c0877 100755 --- 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 index 864b2d0a4..b7a1181ff 100644 --- 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 != "" {