diff --git a/.github/workflows/crds-verify-kind.yaml b/.github/workflows/crds-verify-kind.yaml index b1020addbb..9ed9936990 100644 --- a/.github/workflows/crds-verify-kind.yaml +++ b/.github/workflows/crds-verify-kind.yaml @@ -14,7 +14,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' id: go # Look for a CLI that's made for this PR - name: Fetch built CLI diff --git a/.github/workflows/e2e-test-kind.yaml b/.github/workflows/e2e-test-kind.yaml index 084fb852d4..951009480c 100644 --- a/.github/workflows/e2e-test-kind.yaml +++ b/.github/workflows/e2e-test-kind.yaml @@ -14,7 +14,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' id: go # Look for a CLI that's made for this PR - name: Fetch built CLI @@ -82,7 +82,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' id: go - name: Check out the code uses: actions/checkout@v2 diff --git a/.github/workflows/pr-ci-check.yml b/.github/workflows/pr-ci-check.yml index f289c57fab..286ca370b5 100644 --- a/.github/workflows/pr-ci-check.yml +++ b/.github/workflows/pr-ci-check.yml @@ -10,7 +10,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' id: go - name: Check out the code uses: actions/checkout@v2 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 955cad1346..793b144f8d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' id: go - uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index 9faec3529c..0d461642ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.21-bookworm as velero-builder +FROM --platform=$BUILDPLATFORM golang:1.22-bookworm as velero-builder ARG GOPROXY ARG BIN @@ -47,7 +47,7 @@ RUN mkdir -p /output/usr/bin && \ go clean -modcache -cache # Restic binary build section -FROM --platform=$BUILDPLATFORM golang:1.21-bookworm as restic-builder +FROM --platform=$BUILDPLATFORM golang:1.22-bookworm as restic-builder ARG BIN ARG TARGETOS diff --git a/Tiltfile b/Tiltfile index 8ab2209040..994f27717a 100644 --- a/Tiltfile +++ b/Tiltfile @@ -52,7 +52,7 @@ git_sha = str(local("git rev-parse HEAD", quiet = True, echo_off = True)).strip( tilt_helper_dockerfile_header = """ # Tilt image -FROM golang:1.21 as tilt-helper +FROM golang:1.22 as tilt-helper # Support live reloading with Tilt RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \ diff --git a/changelogs/unreleased/7658-reasonerjt b/changelogs/unreleased/7658-reasonerjt new file mode 100644 index 0000000000..fade392a6c --- /dev/null +++ b/changelogs/unreleased/7658-reasonerjt @@ -0,0 +1 @@ +Bump up golang to v1.22 \ No newline at end of file diff --git a/go.mod b/go.mod index 1a269ce3f3..7d95ee2814 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/vmware-tanzu/velero -go 1.21 - -toolchain go1.21.3 +go 1.22 require ( cloud.google.com/go/storage v1.39.1 diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index a60266fc78..71bd253ecd 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=$TARGETPLATFORM golang:1.21-bookworm +FROM --platform=$TARGETPLATFORM golang:1.22-bookworm ARG GOPROXY