From 37dc893bd3f94bd643767c51d70c804ea2697205 Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Wed, 23 Oct 2024 15:15:56 +0800 Subject: [PATCH] Bump Golang version and Velero tag for v1.11.0. Signed-off-by: Xun Jiang --- .github/workflows/pr.yaml | 2 +- .github/workflows/push.yml | 2 +- Dockerfile | 2 +- go.mod | 6 ++---- go.sum | 4 ++-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 0ccbb63..5da9287 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -10,7 +10,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: '1.22' + go-version: '1.22.8' id: go - name: Check out the code diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index bcc01f6..88cdb17 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: '1.22' + go-version: '1.22.8' id: go - name: Check out code into the Go module directory diff --git a/Dockerfile b/Dockerfile index 54e6f46..91115f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=$BUILDPLATFORM golang:1.22-bookworm AS build +FROM --platform=$BUILDPLATFORM golang:1.22.8-bookworm AS build ARG TARGETOS ARG TARGETARCH diff --git a/go.mod b/go.mod index 0463ffa..107f44d 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/vmware-tanzu/velero-plugin-for-gcp -go 1.22.6 - -toolchain go1.22.8 +go 1.22.8 require ( cloud.google.com/go/storage v1.40.0 @@ -11,7 +9,7 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 - github.com/vmware-tanzu/velero v0.0.0-20241009105421-ba0dbb91f941 + github.com/vmware-tanzu/velero v1.15.0-rc.1 golang.org/x/oauth2 v0.19.0 google.golang.org/api v0.172.0 k8s.io/api v0.29.0 diff --git a/go.sum b/go.sum index 2e3dab5..18597e2 100644 --- a/go.sum +++ b/go.sum @@ -293,8 +293,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/vmware-tanzu/velero v0.0.0-20241009105421-ba0dbb91f941 h1:QX1KPBw5mtS+CtQzRyDJpDZPY8WE9apgQ4YolEeoK7o= -github.com/vmware-tanzu/velero v0.0.0-20241009105421-ba0dbb91f941/go.mod h1:1Jk51qruLY/LCG8RMy6nVLVctIlWqJ9KBNXWroHzJZg= +github.com/vmware-tanzu/velero v1.15.0-rc.1 h1:NDfTZbOfkV2wnBHj9W/YPnPMREMwXjMbrrUw/mxS/ec= +github.com/vmware-tanzu/velero v1.15.0-rc.1/go.mod h1:28VhzPJRBo91GBRkgs4Ird0fx2vCpepBWmhF+5Pn/WQ= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=