Skip to content

Commit 20858ff

Browse files
authored
Merge pull request #424 from andyzhangx/update-csi-release-tools
fix: build with go1.26.4 to fix go CVE
2 parents 431b00d + 88296be commit 20858ff

2 files changed

Lines changed: 4 additions & 15 deletions

File tree

release-tools/prow.sh

Lines changed: 3 additions & 2 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.26.3" "Go version for building the component" # depends on component's source code
89+
configvar CSI_PROW_GO_VERSION_BUILD "1.26.4" "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
@@ -853,7 +853,8 @@ install_snapshot_controller() {
853853
854854
# Now replace registry and/or tag
855855
NEW_TAG="csiprow"
856-
line="$(echo "$nocomments" | sed -e "s;$image;${name}:${NEW_TAG};")"
856+
escaped_image=$(printf '%s\n' "$image" | sed -e 's/[\/&;]/\\&/g')
857+
line="$(echo "$nocomments" | sed -e "s;${escaped_image};${name}:${NEW_TAG};")"
857858
echo " using $line" >&2
858859
fi
859860
echo "$line"

release-tools/verify-vendor.sh

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
if [ -f Gopkg.toml ]; then
18-
echo "Repo uses 'dep' for vendoring."
19-
case "$(dep version 2>/dev/null | grep 'version *:')" in
20-
*v0.[56789]*)
21-
if dep check; then
22-
echo "vendor up-to-date"
23-
else
24-
exit 1
25-
fi
26-
;;
27-
*) echo "skipping check, dep >= 0.5 required";;
28-
esac
29-
elif [ -f go.mod ]; then
17+
if [ -f go.mod ]; then
3018
echo "Repo uses 'go mod'."
3119
# shellcheck disable=SC2235
3220
if [ "${JOB_NAME}" ] &&

0 commit comments

Comments
 (0)