From 4ff21d55a0557f0a93770900ca2cd979551f1b38 Mon Sep 17 00:00:00 2001 From: Jeffrey Nelson Date: Wed, 17 Jan 2024 12:56:03 -0600 Subject: [PATCH] upgrade Golang version to 1.21.6 (#2755) --- .github/workflows/deps.yml | 4 ++-- Makefile | 2 +- test/agent/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml index cbd82b64c9..8612ad4068 100644 --- a/.github/workflows/deps.yml +++ b/.github/workflows/deps.yml @@ -26,14 +26,14 @@ jobs: - id: govulncheck uses: ./.github/actions/govulncheck with: - go-version-input: 1.21.5 + go-version-input: 1.21.6 go-version-file: go.mod cache: false repo-checkout: false - id: govulncheck-tests-agent uses: ./.github/actions/govulncheck with: - go-version-input: 1.21.5 + go-version-input: 1.21.6 go-version-file: test/agent/go.mod cache: false repo-checkout: false diff --git a/Makefile b/Makefile index e18ab3b26c..f94cf95aed 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ # VERSION is the source revision that executables and images are built from. VERSION ?= $(shell git describe --tags --always --dirty || echo "unknown") # GOLANG_IMAGE is the building golang container image used. -GOLANG_IMAGE ?= public.ecr.aws/eks-distro-build-tooling/golang:1.21.5-6-gcc-al2 +GOLANG_IMAGE ?= public.ecr.aws/eks-distro-build-tooling/golang:1.21.6-7-gcc-al2 # BASE_IMAGE_CNI is the base layer image for the primary AWS VPC CNI plugin container BASE_IMAGE_CNI ?= public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-iptables:latest.2 # BASE_IMAGE_CNI_INIT is the base layer image for the AWS VPC CNI init container diff --git a/test/agent/Dockerfile b/test/agent/Dockerfile index 82ddfa2daf..4b828713f6 100644 --- a/test/agent/Dockerfile +++ b/test/agent/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/eks-distro-build-tooling/golang:1.21.4-5-gcc-al2 as builder +FROM public.ecr.aws/eks-distro-build-tooling/golang:1.21.6-7-gcc-al2 as builder WORKDIR /workspace ENV GOPROXY direct