Skip to content

Commit 589c324

Browse files
authored
Merge pull request #857 from andyzhangx/go-guild-1.22.5
fix: build with go 1.22.5 to fix golang CVE
2 parents 6642f04 + c7b22de commit 589c324

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

release-tools/build.make

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ IMAGE_NAME=$(REGISTRY_NAME)/$*
6262

6363
ifdef V
6464
# Adding "-alsologtostderr" assumes that all test binaries contain glog. This is not guaranteed.
65-
TESTARGS = -v -args -alsologtostderr -v 5
65+
TESTARGS = -race -v -args -alsologtostderr -v 5
6666
else
67-
TESTARGS =
67+
TESTARGS = -race
6868
endif
6969

7070
# Specific packages can be excluded from each of the tests below by setting the *_FILTER_CMD variables

release-tools/prow.sh

Lines changed: 7 additions & 4 deletions
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.22.3" "Go version for building the component" # depends on component's source code
89+
configvar CSI_PROW_GO_VERSION_BUILD "1.22.5" "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
@@ -231,8 +231,11 @@ configvar CSI_PROW_E2E_VERSION "$(version_to_git "${CSI_PROW_KUBERNETES_VERSION}
231231
configvar CSI_PROW_E2E_REPO "https://github.com/kubernetes/kubernetes" "E2E repo"
232232
configvar CSI_PROW_E2E_IMPORT_PATH "k8s.io/kubernetes" "E2E package"
233233

234-
# Local path for e2e tests. Set to "none" to disable.
235-
configvar CSI_PROW_SIDECAR_E2E_IMPORT_PATH "none" "CSI Sidecar E2E package"
234+
# Local path & package path for e2e tests. Set to "none" to disable.
235+
# When using versioned go modules, the import path is the module path whereas the path
236+
# should not contain the version and be the directory where the module is checked out.
237+
configvar CSI_PROW_SIDECAR_E2E_IMPORT_PATH "none" "CSI Sidecar E2E package (go import path)"
238+
configvar CSI_PROW_SIDECAR_E2E_PATH "${CSI_PROW_SIDECAR_E2E_IMPORT_PATH}" "CSI Sidecar E2E path (directory)"
236239

237240
# csi-sanity testing from the csi-test repo can be run against the installed
238241
# CSI driver. For this to work, deploying the driver must expose the Unix domain
@@ -1035,7 +1038,7 @@ run_e2e () (
10351038
trap move_junit EXIT
10361039
10371040
if [ "${name}" == "local" ]; then
1038-
cd "${GOPATH}/src/${CSI_PROW_SIDECAR_E2E_IMPORT_PATH}" &&
1041+
cd "${GOPATH}/src/${CSI_PROW_SIDECAR_E2E_PATH}" &&
10391042
run_with_loggers env KUBECONFIG="$KUBECONFIG" KUBE_TEST_REPO_LIST="$(if [ -e "${CSI_PROW_WORK}/e2e-repo-list" ]; then echo "${CSI_PROW_WORK}/e2e-repo-list"; fi)" ginkgo --timeout="${CSI_PROW_GINKGO_TIMEOUT}" -v "$@" "${CSI_PROW_WORK}/e2e-local.test" -- -report-dir "${ARTIFACTS}" -report-prefix local
10401043
else
10411044
cd "${GOPATH}/src/${CSI_PROW_E2E_IMPORT_PATH}" &&

0 commit comments

Comments
 (0)