diff --git a/.github/workflows/go-coverage.yml b/.github/workflows/go-coverage.yml index f18a61009f7e..7797d69da808 100644 --- a/.github/workflows/go-coverage.yml +++ b/.github/workflows/go-coverage.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' check-latest: true cache: true - name: Run go test with coverage diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 348f2c838c0a..040d6324ebc7 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -19,13 +19,13 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: - version: v1.56.2 + version: v1.59.1 only-new-issues: true # Disable package caching to avoid a double cache with setup-go. skip-pkg-cache: true diff --git a/Makefile b/Makefile index 820c8b6720ea..5eaf217706f0 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ SHELL := /bin/bash ARTIFACTS_BUCKET?=my-s3-bucket GIT_VERSION?=$(shell git describe --tag) GIT_TAG?=$(shell git tag -l "v*.*.*" --sort -v:refname | head -1) -GOLANG_VERSION?="1.21" +GOLANG_VERSION?="1.22" GO_VERSION ?= $(shell source ./scripts/common.sh && build::common::get_go_path $(GOLANG_VERSION)) GO ?= $(GO_VERSION)/go GO_TEST ?= $(GO) test @@ -164,7 +164,7 @@ LOCAL_E2E_TESTS ?= $(DOCKER_E2E_TEST) EMBED_CONFIG_FOLDER = pkg/files/config -export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.29.x +export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.30.x UNAME := $(shell uname -s) diff --git a/go.mod b/go.mod index 172194ffab9e..4cf222908e60 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aws/eks-anywhere -go 1.21 +go 1.22 require ( github.com/Masterminds/sprig v2.22.0+incompatible diff --git a/internal/thirdparty/capc/go.mod b/internal/thirdparty/capc/go.mod index 66f369d77d36..586361bc0c25 100644 --- a/internal/thirdparty/capc/go.mod +++ b/internal/thirdparty/capc/go.mod @@ -1,6 +1,6 @@ module thirdparty.eks-a..com/capc -go 1.21 +go 1.22 require ( k8s.io/api v0.29.2 diff --git a/test/e2e/tools/eks-anywhere-test-tool/go.mod b/test/e2e/tools/eks-anywhere-test-tool/go.mod index 585f8df612e6..656412a95cba 100644 --- a/test/e2e/tools/eks-anywhere-test-tool/go.mod +++ b/test/e2e/tools/eks-anywhere-test-tool/go.mod @@ -1,6 +1,6 @@ module github.com/aws/eks-anywhere-test-tool -go 1.21 +go 1.22 require ( github.com/aws/aws-sdk-go v1.44.256