Merge pull request kubernetes#919 from hakman/go-version-workflows

Go version workflows
kmala · May 17, 2024 · 6a08c73 · 6a08c73
2 parents 68cbc26 + e747b3f
commit 6a08c73
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml
@@ -42,10 +42,8 @@ jobs:
       - id: govulncheck
         uses: golang/govulncheck-action@v1
         with:
-          go-version-input: 1.22.2
           go-version-file: go.mod
       - id: govulncheck-tests-e2e
         uses: golang/govulncheck-action@v1
         with:
-          go-version-input: 1.22.2
           go-version-file: tests/e2e/go.mod
diff --git a/.github/workflows/update-deps.yaml b/.github/workflows/update-deps.yaml
@@ -17,10 +17,10 @@ jobs:
       contents: write
       pull-requests: write
     steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
         with:
-          go-version: '1.22.2'
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+          go-version-file: go.mod
       - name: Update Dependencies
         id: update_deps
         run: |
@@ -45,4 +45,3 @@ jobs:
             release-note-none
           body: |
             Updating go.mod with latest dependencies.
-
diff --git a/.ko.yaml b/.ko.yaml
@@ -1 +1 @@
-defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.2-bookworm.0
+defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.3-bookworm.0
diff --git a/Dockerfile b/Dockerfile
@@ -14,15 +14,15 @@
 ##                               BUILD ARGS                                   ##
 ################################################################################
 # This build arg allows the specification of a custom Golang image.
-ARG GOLANG_IMAGE=golang:1.22.2
+ARG GOLANG_IMAGE=golang:1.22.3
 
 # The distroless image on which the CPI manager image is built.
 #
 # Please do not use "latest". Explicit tags should be used to provide
 # deterministic builds. Follow what kubernetes uses to build
 # kube-controller-manager, for example for 1.23.x:
 # https://github.com/kubernetes/kubernetes/blob/release-1.24/build/common.sh#L94
-ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.2-bookworm.0
+ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.3-bookworm.0
 
 ################################################################################
 ##                              BUILD STAGE                                   ##

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -17,7 +17,7 @@ steps:
       - --platform=linux/amd64,linux/arm64
       - .
   # Build cloudbuild artifacts (for attestation)
-  - name: 'docker.io/library/golang:1.22.2-bookworm'
+  - name: 'docker.io/library/golang:1.22.3-bookworm'
     id: cloudbuild-artifacts
     entrypoint: make
     env:

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/cloud-provider-aws
 
-go 1.22.2
+go 1.22.3
 
 require (
 	github.com/aws/aws-sdk-go v1.53.0

diff --git a/tests/e2e/go.mod b/tests/e2e/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/cloud-provider-aws/tests/e2e
 
-go 1.18
+go 1.22.3
 
 require (
 	github.com/onsi/ginkgo/v2 v2.9.4
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.2-bookworm.0
		defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.3-bookworm.0