From ef831a4addee6cedc76aa0ad85b6a679961e5fe6 Mon Sep 17 00:00:00 2001 From: Angel Montero Date: Tue, 12 May 2026 19:30:36 +0000 Subject: [PATCH 1/2] Upgrade Go version to 1.26.3 to address security vulnerabilities --- .github/workflows/integration-linux.yml | 2 +- .github/workflows/linters-checks.yml | 2 +- .github/workflows/unit-tests-darwin.yml | 2 +- .github/workflows/unit-tests-linux.yml | 2 +- .github/workflows/unit-tests-windows.yml | 2 +- .github/workflows/verify-examples.yml | 2 +- go.mod | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration-linux.yml b/.github/workflows/integration-linux.yml index c6f10181f41..c4c4583dc16 100644 --- a/.github/workflows/integration-linux.yml +++ b/.github/workflows/integration-linux.yml @@ -35,7 +35,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 with: - go-version: 1.26.2 + go-version: 1.26.3 id: go - name: Set up Java diff --git a/.github/workflows/linters-checks.yml b/.github/workflows/linters-checks.yml index 66031befc97..22153fe4c25 100644 --- a/.github/workflows/linters-checks.yml +++ b/.github/workflows/linters-checks.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 with: - go-version: 1.26.2 + go-version: 1.26.3 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/unit-tests-darwin.yml b/.github/workflows/unit-tests-darwin.yml index efdf1a5869a..8dbd4007a33 100644 --- a/.github/workflows/unit-tests-darwin.yml +++ b/.github/workflows/unit-tests-darwin.yml @@ -23,7 +23,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 with: - go-version: 1.26.2 + go-version: 1.26.3 id: go # Retrieve build locations with `go env` diff --git a/.github/workflows/unit-tests-linux.yml b/.github/workflows/unit-tests-linux.yml index f73b82d7fe8..f53f3dd423d 100644 --- a/.github/workflows/unit-tests-linux.yml +++ b/.github/workflows/unit-tests-linux.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 with: - go-version: 1.26.2 + go-version: 1.26.3 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/unit-tests-windows.yml b/.github/workflows/unit-tests-windows.yml index 713bea4f128..6c312fc7f5c 100644 --- a/.github/workflows/unit-tests-windows.yml +++ b/.github/workflows/unit-tests-windows.yml @@ -24,7 +24,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 with: - go-version: 1.26.2 + go-version: 1.26.3 id: go # Retrieve build locations with `go env` diff --git a/.github/workflows/verify-examples.yml b/.github/workflows/verify-examples.yml index 928017a401d..3d5d7a69a15 100644 --- a/.github/workflows/verify-examples.yml +++ b/.github/workflows/verify-examples.yml @@ -23,7 +23,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 with: - go-version: 1.26.2 + go-version: 1.26.3 id: go # Skip changes not affecting examples or integration/examples diff --git a/go.mod b/go.mod index 3b46fb115b7..2083dac032e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/GoogleContainerTools/skaffold/v2 -go 1.26.2 +go 1.26.3 // broken on Windows, see https://github.com/karrick/godirwalk/issues/70 exclude github.com/karrick/godirwalk v1.17.0 From 32389489819afed6c764bc2785b0b58d994d6f41 Mon Sep 17 00:00:00 2001 From: Angel Montero Date: Tue, 12 May 2026 19:54:29 +0000 Subject: [PATCH 2/2] Update Dockerfile.deps base image to Go 1.26.3 --- deploy/skaffold/Dockerfile.deps | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deploy/skaffold/Dockerfile.deps b/deploy/skaffold/Dockerfile.deps index 5f64d4711cd..2fccb43707f 100644 --- a/deploy/skaffold/Dockerfile.deps +++ b/deploy/skaffold/Dockerfile.deps @@ -17,7 +17,7 @@ ARG ARCH=amd64 FROM ${BASE_PREFIX}docker:28.1.1 as docker-source FROM docker/buildx-bin:0.23.0 as buildx-source -FROM ${BASE_PREFIX}golang:1.26.2 as golang-source +FROM ${BASE_PREFIX}golang:1.26.3 as golang-source # Download kubectl FROM ${BASE_PREFIX}alpine:3.21.2 as download-kubectl @@ -169,7 +169,6 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge jq \ apt-transport-https && \ rm -rf /var/lib/apt/lists/* - # Use the alias created at the top COPY --from=golang-source /usr/local/go /usr/local/go ENV PATH /usr/local/go/bin:/root/go/bin:$PATH