From 75ac8baad3f45d63cbcd84fdd75dfc4e0f1f8dba Mon Sep 17 00:00:00 2001
From: staebler <staebler@redhat.com>
Date: Tue, 15 Mar 2022 13:58:15 -0400
Subject: [PATCH] hack: update go version used in hack/verify-vendor.sh

Update the go version used for verifying vendoring from 1.16 to 1.17.
The CI job uses its own image and does not use the image specified
in the script. Therefore, the go version in the script must match
the go version in the CI job, particularly when there are breaking
changes between go versions (as there are between 1.16 and 1.17
when it comes to modules).
---
 hack/verify-vendor.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hack/verify-vendor.sh b/hack/verify-vendor.sh
index 5be1cc8d05d..b168f59c488 100755
--- a/hack/verify-vendor.sh
+++ b/hack/verify-vendor.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ "$IS_CONTAINER" != "" ]; then
-  set -euxo pipefail
+  set -eux
   go mod tidy
   go mod vendor
   go mod verify
@@ -11,6 +11,6 @@ else
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
     --workdir /go/src/github.com/openshift/installer \
-    docker.io/openshift/origin-release:golang-1.16 \
+    docker.io/golang:1.17 \
     ./hack/verify-vendor.sh "${@}"
 fi