diff --git a/.github/workflows/pr-linter-check.yml b/.github/workflows/pr-linter-check.yml index 79d7918b2..439b12920 100644 --- a/.github/workflows/pr-linter-check.yml +++ b/.github/workflows/pr-linter-check.yml @@ -28,5 +28,5 @@ jobs: - name: Linter check uses: golangci/golangci-lint-action@v9 with: - version: v2.5.0 + version: v2.13.1 args: --verbose diff --git a/Dockerfile b/Dockerfile index 46fd212fe..6696c9045 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.25.11-trixie AS velero-builder +FROM --platform=$BUILDPLATFORM golang:1.26.7-trixie AS velero-builder ARG GOPROXY ARG BIN @@ -49,7 +49,7 @@ RUN mkdir -p /output/usr/bin && \ go clean -modcache -cache # Restic binary build section -FROM --platform=$BUILDPLATFORM golang:1.25.11-trixie AS restic-builder +FROM --platform=$BUILDPLATFORM golang:1.26.7-trixie AS restic-builder ARG GOPROXY ARG BIN @@ -73,7 +73,7 @@ RUN mkdir -p /output/usr/bin && \ go clean -modcache -cache # Velero image packing section -FROM paketobuildpacks/run-jammy-tiny:0.2.139 +FROM paketobuildpacks/run-jammy-tiny:0.2.165 LABEL maintainer="Xun Jiang " diff --git a/Dockerfile-Windows b/Dockerfile-Windows index a6330f214..29f1955a5 100644 --- a/Dockerfile-Windows +++ b/Dockerfile-Windows @@ -15,7 +15,7 @@ ARG OS_VERSION=1809 # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.25.11-trixie AS velero-builder +FROM --platform=$BUILDPLATFORM golang:1.26.7-trixie AS velero-builder ARG GOPROXY ARG BIN diff --git a/Tiltfile b/Tiltfile index 63e3a231f..143ea74ee 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.25.11 as tilt-helper +FROM golang:1.26.7 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 d34b1b092..11460ffca 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/vmware-tanzu/velero go 1.25.8 -toolchain go1.25.11 +toolchain go1.26.7 require ( cloud.google.com/go/storage v1.57.2 diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index 430784b5f..aacf8556f 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.25.11-trixie +FROM --platform=$TARGETPLATFORM golang:1.26.7-trixie ARG GOPROXY @@ -98,7 +98,7 @@ RUN ARCH=$(go env GOARCH) && \ # get golangci-lint # Use "go install" so the download goes through GOPROXY instead of the GitHub # release API/CDN, which has been returning intermittent/persistent HTTP 504s. -RUN go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.5.0 +RUN go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.13.1 # install kubectl RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/$(go env GOARCH)/kubectl