From 9ac863aaa452bf0e49ebd3f79b5391b57f41239c Mon Sep 17 00:00:00 2001
From: Scott Seago <sseago@redhat.com>
Date: Thu, 22 Aug 2024 11:36:44 -0400
Subject: [PATCH] Downgrade golang from 1.22.6 to 1.22.5

---
 .github/workflows/crds-verify-kind.yaml | 2 +-
 .github/workflows/e2e-test-kind.yaml    | 4 ++--
 .github/workflows/pr-ci-check.yml       | 2 +-
 .github/workflows/push.yml              | 2 +-
 Dockerfile                              | 4 ++--
 Tiltfile                                | 2 +-
 go.mod                                  | 2 +-
 hack/build-image/Dockerfile             | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/crds-verify-kind.yaml b/.github/workflows/crds-verify-kind.yaml
index 73437916fe..13b6fbbd26 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.22.6'
+          go-version: '1.22.5'
         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 5651d79462..f71f2c5630 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.22.6'
+          go-version: '1.22.5'
         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.22.6'
+          go-version: '1.22.5'
         id: go
       - name: Check out the code
         uses: actions/checkout@v4
diff --git a/.github/workflows/pr-ci-check.yml b/.github/workflows/pr-ci-check.yml
index 8af7a8f5a6..bbf9fb1dd3 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.22.6'
+          go-version: '1.22.5'
         id: go
       - name: Check out the code
         uses: actions/checkout@v4
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 82d42db55e..9a19477384 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.22.6'
+        go-version: '1.22.5'
       id: go
 
     - uses: actions/checkout@v4
diff --git a/Dockerfile b/Dockerfile
index 03115569ae..7c5905caeb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Velero binary build section
-FROM --platform=$BUILDPLATFORM golang:1.22.6-bookworm as velero-builder
+FROM --platform=$BUILDPLATFORM golang:1.22.5-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.22.6-bookworm as restic-builder
+FROM --platform=$BUILDPLATFORM golang:1.22.5-bookworm as restic-builder
 
 ARG BIN
 ARG TARGETOS
diff --git a/Tiltfile b/Tiltfile
index cf07e1913b..6be5057f08 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.22.6 as tilt-helper
+FROM golang:1.22.5 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/go.mod b/go.mod
index e642b5e5fe..43eb2c865b 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/velero
 
-go 1.22.6
+go 1.22.5
 
 require (
 	cloud.google.com/go/storage v1.40.0
diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile
index b959299a97..7521f72450 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.22.6-bookworm
+FROM --platform=$TARGETPLATFORM golang:1.22.5-bookworm
 
 ARG GOPROXY