From 82fd96be98362ae38be440725e2bfe549dbf237f Mon Sep 17 00:00:00 2001 From: Wesley Hayutin Date: Wed, 18 Feb 2026 11:10:29 -0700 Subject: [PATCH 1/2] DNM: update golang to 1.25.3 for future CVE Update go.mod from go 1.23.0/toolchain go1.23.6 to go 1.25.3/toolchain go1.25.3. Update Dockerfile.ubi and Dockerfile-velero-restore-helper.ubi builder images to quay.io/konveyor/builder:ubi9-v1.25.3. Co-authored-by: Cursor --- Dockerfile-velero-restore-helper.ubi | 2 +- Dockerfile.ubi | 4 ++-- go.mod | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Dockerfile-velero-restore-helper.ubi b/Dockerfile-velero-restore-helper.ubi index 6ba5c1c33d..91e178c8ab 100644 --- a/Dockerfile-velero-restore-helper.ubi +++ b/Dockerfile-velero-restore-helper.ubi @@ -1,4 +1,4 @@ -FROM quay.io/konveyor/builder:latest AS builder +FROM quay.io/konveyor/builder:ubi9-v1.25.3 AS builder ENV GOPATH=$APP_ROOT COPY . $APP_ROOT/src/github.com/vmware-tanzu/velero WORKDIR $APP_ROOT/src/github.com/vmware-tanzu/velero diff --git a/Dockerfile.ubi b/Dockerfile.ubi index 2bc631638b..68dc88867f 100644 --- a/Dockerfile.ubi +++ b/Dockerfile.ubi @@ -1,11 +1,11 @@ -FROM quay.io/konveyor/builder:ubi9-v1.23 AS builder +FROM quay.io/konveyor/builder:ubi9-v1.25.3 AS builder ENV GOPATH=$APP_ROOT COPY . /go/src/github.com/vmware-tanzu/velero WORKDIR /go/src/github.com/vmware-tanzu/velero RUN CGO_ENABLED=0 GOOS=linux go build -a -mod=mod -ldflags '-extldflags "-static" -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=1.12.4' -o /go/src/velero github.com/vmware-tanzu/velero/cmd/velero RUN CGO_ENABLED=0 GOOS=linux go build -a -mod=mod -ldflags '-extldflags "-static"' -o /go/src/velero-helper github.com/vmware-tanzu/velero/cmd/velero-helper -FROM quay.io/konveyor/builder:ubi9-v1.23 AS restic-builder +FROM quay.io/konveyor/builder:ubi9-v1.25.3 AS restic-builder ENV GOPATH=$APP_ROOT RUN mkdir -p $APP_ROOT/src/github.com/restic \ && cd $APP_ROOT/src/github.com/restic \ diff --git a/go.mod b/go.mod index d8c890203f..3f9e6874a2 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/vmware-tanzu/velero -go 1.23.0 - -toolchain go1.23.6 +go 1.25.3 require ( cloud.google.com/go/storage v1.30.1 From e878a12147c300de1fa4bd82a5aaea7630a73f3b Mon Sep 17 00:00:00 2001 From: Wesley Hayutin Date: Wed, 18 Feb 2026 12:03:44 -0700 Subject: [PATCH 2/2] update setenv --- Makefile.prow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.prow b/Makefile.prow index 445ac9ea3e..e47c8e86c0 100644 --- a/Makefile.prow +++ b/Makefile.prow @@ -92,7 +92,7 @@ $(GOBIN)/golangci-lint: $(GOBIN)/setup-envtest: @echo "Installing envtest tools" - go install sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20230216140739-c98506dc3b8e + go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest $(GOBIN)/protoc: @echo "Installing protoc and plugins"