Skip to content

Commit 2e6b731

Browse files
committed
Squashed 'release-tools/' changes from 335339f..e4dab7f
kubernetes-csi/csi-release-tools@e4dab7f Merge kubernetes-csi/csi-release-tools#194 from yselkowitz/registry-k8s-io kubernetes-csi/csi-release-tools@84a4d5a Move from k8s.gcr.io to registry.k8s.io kubernetes-csi/csi-release-tools@37d1104 Merge kubernetes-csi/csi-release-tools#191 from pohly/go-1.18 kubernetes-csi/csi-release-tools@db917f5 update to Go 1.18 git-subtree-dir: release-tools git-subtree-split: e4dab7ff57c24cf3e8d37cd3365636fddaff7e0a
1 parent 244de7a commit 2e6b731

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

prow.sh

+5-8
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ configvar CSI_PROW_BUILD_PLATFORMS "linux amd64 amd64; linux ppc64le ppc64le -pp
8686
# which is disabled with GOFLAGS=-mod=vendor).
8787
configvar GOFLAGS_VENDOR "$( [ -d vendor ] && echo '-mod=vendor' )" "Go flags for using the vendor directory"
8888

89-
configvar CSI_PROW_GO_VERSION_BUILD "1.17.3" "Go version for building the component" # depends on component's source code
89+
configvar CSI_PROW_GO_VERSION_BUILD "1.18" "Go version for building the component" # depends on component's source code
9090
configvar CSI_PROW_GO_VERSION_E2E "" "override Go version for building the Kubernetes E2E test suite" # normally doesn't need to be set, see install_e2e
9191
configvar CSI_PROW_GO_VERSION_SANITY "${CSI_PROW_GO_VERSION_BUILD}" "Go version for building the csi-sanity test suite" # depends on CSI_PROW_SANITY settings below
9292
configvar CSI_PROW_GO_VERSION_KIND "${CSI_PROW_GO_VERSION_BUILD}" "Go version for building 'kind'" # depends on CSI_PROW_KIND_VERSION below
@@ -441,10 +441,7 @@ install_ginkgo () {
441441
if [ "v$(ginkgo version 2>/dev/null | sed -e 's/.* //')" = "${CSI_PROW_GINKGO_VERSION}" ]; then
442442
return
443443
fi
444-
git_checkout https://github.com/onsi/ginkgo "$GOPATH/src/github.com/onsi/ginkgo" "${CSI_PROW_GINKGO_VERSION}" --depth=1 &&
445-
# We have to get dependencies and hence can't call just "go build".
446-
run_with_go "${CSI_PROW_GO_VERSION_GINKGO}" go get github.com/onsi/ginkgo/ginkgo || die "building ginkgo failed" &&
447-
mv "$GOPATH/bin/ginkgo" "${CSI_PROW_BIN}"
444+
run_with_go "${CSI_PROW_GO_VERSION_GINKGO}" env GOBIN="${CSI_PROW_BIN}" go install "github.com/onsi/ginkgo/ginkgo@${CSI_PROW_GINKGO_VERSION}" || die "building ginkgo failed"
448445
}
449446

450447
# Ensure that we have the desired version of dep.
@@ -814,7 +811,7 @@ install_snapshot_controller() {
814811
modified="$(cat "$i" | while IFS= read -r line; do
815812
nocomments="$(echo "$line" | sed -e 's/ *#.*$//')"
816813
if echo "$nocomments" | grep -q '^[[:space:]]*image:[[:space:]]*'; then
817-
# Split 'image: k8s.gcr.io/sig-storage/snapshot-controller:v3.0.0'
814+
# Split 'image: registry.k8s.io/sig-storage/snapshot-controller:v3.0.0'
818815
# into image (snapshot-controller:v3.0.0),
819816
# name (snapshot-controller),
820817
# tag (v3.0.0).
@@ -915,11 +912,11 @@ patch_kubernetes () {
915912
local source="$1" target="$2"
916913
917914
if [ "${CSI_PROW_DRIVER_CANARY}" = "canary" ]; then
918-
# We cannot replace k8s.gcr.io/sig-storage with gcr.io/k8s-staging-sig-storage because
915+
# We cannot replace registry.k8s.io/sig-storage with gcr.io/k8s-staging-sig-storage because
919916
# e2e.test does not support it (see test/utils/image/manifest.go). Instead we
920917
# invoke the e2e.test binary with KUBE_TEST_REPO_LIST set to a file that
921918
# overrides that registry.
922-
find "$source/test/e2e/testing-manifests/storage-csi/mock" -name '*.yaml' -print0 | xargs -0 sed -i -e 's;k8s.gcr.io/sig-storage/\(.*\):v.*;k8s.gcr.io/sig-storage/\1:canary;'
919+
find "$source/test/e2e/testing-manifests/storage-csi/mock" -name '*.yaml' -print0 | xargs -0 sed -i -e 's;registry.k8s.io/sig-storage/\(.*\):v.*;registry.k8s.io/sig-storage/\1:canary;'
923920
cat >"$target/e2e-repo-list" <<EOF
924921
sigStorageRegistry: gcr.io/k8s-staging-sig-storage
925922
EOF

verify-spelling.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ if [[ -z "$(command -v misspell)" ]]; then
4141
# perform go get in a temp dir as we are not tracking this version in a go module
4242
# if we do the go get in the repo, it will create / update a go.mod and go.sum
4343
cd "${TMP_DIR}"
44-
GO111MODULE=on GOBIN="${TMP_DIR}" go get "github.com/client9/misspell/cmd/misspell@${TOOL_VERSION}"
44+
GO111MODULE=on GOBIN="${TMP_DIR}" go install "github.com/client9/misspell/cmd/misspell@${TOOL_VERSION}"
4545
export PATH="${TMP_DIR}:${PATH}"
4646
fi
4747

0 commit comments

Comments
 (0)