diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 80a84b6a..b9782dfa 100755 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -13,7 +13,7 @@ on: - cron: '0 19 * * 1-5' env: - DEFAULT_GO_VERSION: ^1.22.0 + DEFAULT_GO_VERSION: ^1.25.0 GITHUB_USERNAME: ${{ secrets.EC2_BOT_GITHUB_USERNAME }} GITHUB_TOKEN: ${{ secrets.EC2_BOT_GITHUB_TOKEN }} WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }} @@ -71,7 +71,7 @@ jobs: cache: false - name: Set up golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v9 with: version: latest args: --timeout=5m diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b760aa12..7c44bd87 100755 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,7 +10,7 @@ permissions: id-token: write env: - DEFAULT_GO_VERSION: ^1.22.0 + DEFAULT_GO_VERSION: ^1.25.0 GITHUB_USERNAME: ${{ secrets.EC2_BOT_GITHUB_USERNAME }} GITHUB_TOKEN: ${{ secrets.EC2_BOT_GITHUB_TOKEN }} WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }} diff --git a/Dockerfile b/Dockerfile index 7d879865..bc9f09dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.22 as builder +FROM --platform=$BUILDPLATFORM golang:1.25 as builder ## GOLANG env ARG GOPROXY="https://proxy.golang.org|direct" diff --git a/Dockerfile.windows b/Dockerfile.windows index 092eb04e..ad86ea36 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -1,7 +1,7 @@ ARG WINDOWS_VERSION=1809 # Build the manager binary -FROM --platform=windows/amd64 golang:1.22 as builder +FROM --platform=windows/amd64 golang:1.25 as builder ## GOLANG env ENV GO111MODULE="on" CGO_ENABLED="0" GOOS="windows" GOARCH="amd64" diff --git a/README.md b/README.md index 64b03109..fb4aee51 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ kubernetes - + go-version diff --git a/go.mod b/go.mod index 2a01b7b8..41f569e8 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/aws/aws-node-termination-handler -go 1.22.0 +go 1.25 -toolchain go1.22.2 +toolchain go1.25.5 require ( github.com/Masterminds/sprig/v3 v3.2.3 diff --git a/test/webhook-test-proxy/Dockerfile b/test/webhook-test-proxy/Dockerfile index a0119541..9227505f 100644 --- a/test/webhook-test-proxy/Dockerfile +++ b/test/webhook-test-proxy/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.22-alpine as builder +FROM golang:1.25-alpine as builder ## GOLANG env ARG GOPROXY="https://proxy.golang.org|direct" diff --git a/test/webhook-test-proxy/Dockerfile.windows b/test/webhook-test-proxy/Dockerfile.windows index 5810b1cc..98eda76c 100644 --- a/test/webhook-test-proxy/Dockerfile.windows +++ b/test/webhook-test-proxy/Dockerfile.windows @@ -1,7 +1,7 @@ ARG WINDOWS_VERSION=1903 # Build the manager binary -FROM --platform=windows/amd64 golang:1.22 AS builder +FROM --platform=windows/amd64 golang:1.25 AS builder ## GOLANG env ENV GO111MODULE="on" CGO_ENABLED="0" GOOS="windows" GOARCH="amd64"