Merge pull request #3549 from cpanato/update-go

Build Go 1.22.2 and 1.21.9
kubernetes · Apr 4, 2024 · 8e92a59 · 8e92a59
2 parents 0da4282 + 8d0407b
commit 8e92a59
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 72 deletions.
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -22,7 +22,7 @@ dependencies:
 
   # Golang
   - name: "golang"
-    version: 1.22.1
+    version: 1.22.2
     refPaths:
     - path: images/build/cross/Makefile
       match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -117,7 +117,7 @@ dependencies:
 
   # go-runner
   - name: "registry.k8s.io/build-image/go-runner (go1.22-bookworm)"
-    version: v2.3.1-go1.22.1-bookworm.0
+    version: v2.3.1-go1.22.2-bookworm.0
     refPaths:
     - path: images/build/go-runner/variants.yaml
       match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
@@ -131,7 +131,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/go-runner (go1.21-bookworm)"
-    version: v2.3.1-go1.21.8-bookworm.0
+    version: v2.3.1-go1.21.9-bookworm.0
     refPaths:
     - path: images/build/go-runner/variants.yaml
       match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
@@ -146,7 +146,7 @@ dependencies:
 
   # kube-cross
   - name: "registry.k8s.io/build-image/kube-cross (v1.30-go1.22)"
-    version: v1.30.0-go1.22.1-bullseye.0
+    version: v1.30.0-go1.22.2-bullseye.0
     refPaths:
     - path: images/build/cross/variants.yaml
       match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
@@ -166,7 +166,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/kube-cross (v1.29-go1.21)"
-    version: v1.29.0-go1.21.8-bullseye.0
+    version: v1.29.0-go1.21.9-bullseye.0
     refPaths:
     - path: images/build/cross/variants.yaml
       match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
@@ -186,7 +186,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.21)"
-    version: v1.28.0-go1.21.8-bullseye.0
+    version: v1.28.0-go1.21.9-bullseye.0
     refPaths:
     - path: images/build/cross/variants.yaml
       match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
@@ -206,7 +206,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/kube-cross (v1.27-go1.21)"
-    version: v1.27.0-go1.21.8-bullseye.0
+    version: v1.27.0-go1.21.9-bullseye.0
     refPaths:
     - path: images/build/cross/variants.yaml
       match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
@@ -225,26 +225,6 @@ dependencies:
     - path: images/build/cross/variants.yaml
       match: REVISION:\ '\d+'
 
-  - name: "registry.k8s.io/build-image/kube-cross (v1.26-go1.21)"
-    version: v1.26.0-go1.21.8-bullseye.0
-    refPaths:
-    - path: images/build/cross/variants.yaml
-      match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
-
-  - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.26-go1.21)"
-    version: go1.21-bullseye
-    refPaths:
-    - path: images/build/cross/variants.yaml
-      match: "CONFIG: 'go\\d+.\\d+-bullseye'"
-
-  - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.26-go1.21)"
-    version: 0
-    refPaths:
-    - path: images/build/cross/Makefile
-      match: REVISION \?= \d+
-    - path: images/build/cross/variants.yaml
-      match: REVISION:\ '\d+'
-
   - name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.30-cross1.22)"
     version: v1.30.0-go1.22.1-bullseye.0
     refPaths:
@@ -309,7 +289,7 @@ dependencies:
 
   # Golang (previous release branches: 1.29)
   - name: "golang (previous release branches: 1.29)"
-    version: 1.21.8
+    version: 1.21.9
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -326,7 +306,7 @@ dependencies:
 
   # Golang (previous release branches: 1.28)
   - name: "golang (previous release branches: 1.28)"
-    version: 1.21.8
+    version: 1.21.9
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -349,7 +329,7 @@ dependencies:
 
   # Golang (previous release branches: 1.27)
   - name: "golang (previous release branches: 1.27)"
-    version: 1.21.8
+    version: 1.21.9
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -364,17 +344,6 @@ dependencies:
     - path: images/releng/k8s-ci-builder/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
 
-  # Golang (previous release branches: 1.26)
-  - name: "golang (previous release branches: 1.26)"
-    version: 1.21.8
-    refPaths:
-    - path: images/build/cross/variants.yaml
-      match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
-    - path: images/build/go-runner/variants.yaml
-      match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
-    - path: images/releng/ci/variants.yaml
-      match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
-
   - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.26)"
     version: 1.21.8
     refPaths:

diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile
@@ -28,7 +28,7 @@ IMGNAME = kube-cross
 # - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while:
 # - v1.100-go1.17-bullseye.0 does not
 KUBERNETES_VERSION ?= v1.30.0
-GO_VERSION ?= 1.22.1
+GO_VERSION ?= 1.22.2
 GO_MAJOR_VERSION ?= 1.22
 OS_CODENAME ?= bullseye
 REVISION ?= 0

diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml
@@ -2,45 +2,36 @@ variants:
   v1.30-go1.22-bullseye:
     CONFIG: 'go1.22-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.30.0-go1.22.1-bullseye.0'
+    IMAGE_VERSION: 'v1.30.0-go1.22.2-bullseye.0'
     KUBERNETES_VERSION: 'v1.30.0'
-    GO_VERSION: '1.22.1'
+    GO_VERSION: '1.22.2'
     GO_MAJOR_VERSION: '1.22'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
   v1.29-go1.21-bullseye:
     CONFIG: 'go1.21-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.29.0-go1.21.8-bullseye.0'
+    IMAGE_VERSION: 'v1.29.0-go1.21.9-bullseye.0'
     KUBERNETES_VERSION: 'v1.29.0'
-    GO_VERSION: '1.21.8'
+    GO_VERSION: '1.21.9'
     GO_MAJOR_VERSION: '1.21'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
   v1.28-go1.21-bullseye:
     CONFIG: 'go1.21-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.28.0-go1.21.8-bullseye.0'
+    IMAGE_VERSION: 'v1.28.0-go1.21.9-bullseye.0'
     KUBERNETES_VERSION: 'v1.28.0'
-    GO_VERSION: '1.21.8'
+    GO_VERSION: '1.21.9'
     GO_MAJOR_VERSION: '1.21'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
   v1.27-go1.21-bullseye:
     CONFIG: 'go1.21-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.27.0-go1.21.8-bullseye.0'
+    IMAGE_VERSION: 'v1.27.0-go1.21.9-bullseye.0'
     KUBERNETES_VERSION: 'v1.27.0'
-    GO_VERSION: '1.21.8'
-    GO_MAJOR_VERSION: '1.21'
-    OS_CODENAME: 'bullseye'
-    REVISION: '0'
-  v1.26-go1.21-bullseye:
-    CONFIG: 'go1.21-bullseye'
-    TYPE: 'default'
-    IMAGE_VERSION: 'v1.26.0-go1.21.8-bullseye.0'
-    KUBERNETES_VERSION: 'v1.26.0'
-    GO_VERSION: '1.21.8'
+    GO_VERSION: '1.21.9'
     GO_MAJOR_VERSION: '1.21'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile
@@ -19,7 +19,7 @@ IMGNAME = go-runner
 APP_VERSION = $(shell cat VERSION)
 GO_MAJOR_VERSION ?= 1.22
 REVISION ?= 0
-GO_VERSION ?= 1.22.1
+GO_VERSION ?= 1.22.2
 OS_CODENAME ?= bookworm
 
 # Build args

diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml
@@ -1,25 +1,25 @@
 variants:
   go1.22-bookworm:
     CONFIG: 'go1.22-bookworm'
-    IMAGE_VERSION: 'v2.3.1-go1.22.1-bookworm.0'
+    IMAGE_VERSION: 'v2.3.1-go1.22.2-bookworm.0'
     GO_MAJOR_VERSION: '1.22'
     OS_CODENAME: 'bookworm'
     REVISION: '0'
-    GO_VERSION: '1.22.1'
+    GO_VERSION: '1.22.2'
     DISTROLESS_IMAGE: 'static-debian12'
   go1.21-bookworm:
     CONFIG: 'go1.21-bookworm'
-    IMAGE_VERSION: 'v2.3.1-go1.21.8-bookworm.0'
+    IMAGE_VERSION: 'v2.3.1-go1.21.9-bookworm.0'
     GO_MAJOR_VERSION: '1.21'
     OS_CODENAME: 'bookworm'
     REVISION: '0'
-    GO_VERSION: '1.21.8'
+    GO_VERSION: '1.21.9'
     DISTROLESS_IMAGE: 'static-debian12'
   go1.21-bullseye:
     CONFIG: 'go1.21-bullseye'
-    IMAGE_VERSION: 'v2.3.1-go1.21.8-bullseye.0'
+    IMAGE_VERSION: 'v2.3.1-go1.21.9-bullseye.0'
     GO_MAJOR_VERSION: '1.21'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
-    GO_VERSION: '1.21.8'
+    GO_VERSION: '1.21.9'
     DISTROLESS_IMAGE: 'static-debian11'
diff --git a/images/releng/ci/Dockerfile b/images/releng/ci/Dockerfile
@@ -32,8 +32,8 @@ RUN apt-get update && \
     && rm -rf /var/lib/apt/lists/*
 
 # install goreleaser
-ARG GORELEASER_VERSION=v1.24.0
-ARG GORELEASER_SHA=99709684e3f543ed32a771e1565055e43d2ec524e631bcd8d331c2d8ed6a584f
+ARG GORELEASER_VERSION=v1.25.1
+ARG GORELEASER_SHA=8156fef4026559881de6ba65a3882c5a52a4e5a981e0b316ea051cd617f61cbf
 RUN  \
     GORELEASER_DOWNLOAD_FILE=goreleaser_Linux_x86_64.tar.gz && \
     GORELEASER_DOWNLOAD_URL=https://github.com/goreleaser/goreleaser/releases/download/${GORELEASER_VERSION}/${GORELEASER_DOWNLOAD_FILE} && \
@@ -44,8 +44,8 @@ RUN  \
     goreleaser -v
 
 # install ko
-ARG KO_VERSION=v0.15.1
-ARG KO_SHA=5b06079590371954cceadf0ddcfa8471afb039c29a2e971043915957366a2f39
+ARG KO_VERSION=v0.15.2
+ARG KO_SHA=d11f03f23261d16f9e7802291e9d098e84f5daecc7931e8573bece9025b6a2c5
 RUN  \
     KO_DOWNLOAD_FILE=ko_${KO_VERSION#v}_Linux_x86_64.tar.gz && \
     KO_DOWNLOAD_URL=https://github.com/ko-build/ko/releases/download/${KO_VERSION}/${KO_DOWNLOAD_FILE} && \

diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml
@@ -1,11 +1,11 @@
 variants:
   go1.22-bookworm:
     CONFIG: 'go1.22-bookworm'
-    GO_VERSION: '1.22.1'
+    GO_VERSION: '1.22.2'
     OS_CODENAME: 'bookworm'
     REVISION: '0'
   go1.21-bookworm:
     CONFIG: 'go1.21-bookworm'
-    GO_VERSION: '1.21.8'
+    GO_VERSION: '1.21.9'
     OS_CODENAME: 'bookworm'
     REVISION: '0'