Build Go 1.21.7 and 1.20.14

Signed-off-by: cpanato <[email protected]>
kubernetes · Feb 7, 2024 · b0a2339 · b0a2339
1 parent 3b283ec
commit b0a2339
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 57 deletions.
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -22,7 +22,7 @@ dependencies:
 
   # Golang
   - name: "golang"
-    version: 1.21.6
+    version: 1.21.7
     refPaths:
     - path: images/build/cross/Makefile
       match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -123,7 +123,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/go-runner (go1.21-bookworm)"
-    version: v2.3.1-go1.21.6-bookworm.0
+    version: v2.3.1-go1.21.7-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-]+)*))?)
@@ -137,7 +137,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/go-runner (go1.20-bullseye)"
-    version: v2.3.1-go1.20.13-bullseye.0
+    version: v2.3.1-go1.20.14-bullseye.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-]+)*))?)
@@ -179,29 +179,8 @@ dependencies:
     - path: images/build/cross/variants.yaml
       match: REVISION:\ '\d+'
 
-  - name: "registry.k8s.io/build-image/kube-cross (v1.30-go1.21)"
-    version: v1.30.0-go1.21.6-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.30-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.30-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 (v1.29-go1.21)"
-    version: v1.29.0-go1.21.6-bullseye.0
+    version: v1.29.0-go1.21.7-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-]+)*))?)'"
@@ -221,7 +200,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.20)"
-    version: v1.28.0-go1.20.13-bullseye.0
+    version: v1.28.0-go1.20.14-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-]+)*))?)'"
@@ -241,7 +220,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/kube-cross (v1.27-go1.20)"
-    version: v1.27.0-go1.20.13-bullseye.0
+    version: v1.27.0-go1.20.14-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-]+)*))?)'"
@@ -261,7 +240,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/kube-cross (v1.26-go1.20)"
-    version: v1.26.0-go1.20.13-bullseye.0
+    version: v1.26.0-go1.20.14-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-]+)*))?)'"
@@ -350,7 +329,7 @@ dependencies:
 
   # Golang (previous release branches: 1.29)
   - name: "golang (previous release branches: 1.29)"
-    version: 1.21.6
+    version: 1.21.7
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -367,7 +346,7 @@ dependencies:
 
   # Golang (previous release branches: 1.28)
   - name: "golang (previous release branches: 1.28)"
-    version: 1.20.13
+    version: 1.20.14
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -390,7 +369,7 @@ dependencies:
 
   # Golang (previous release branches: 1.27)
   - name: "golang (previous release branches: 1.27)"
-    version: 1.20.13
+    version: 1.20.14
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -407,7 +386,7 @@ dependencies:
 
   # Golang (previous release branches: 1.26)
   - name: "golang (previous release branches: 1.26)"
-    version: 1.20.13
+    version: 1.20.14
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

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.21.6
+GO_VERSION ?= 1.21.7
 GO_MAJOR_VERSION ?= 1.21
 OS_CODENAME ?= bullseye
 REVISION ?= 0

diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml
@@ -8,48 +8,39 @@ variants:
     GO_MAJOR_VERSION: '1.22'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
-  v1.30-go1.21-bullseye:
-    CONFIG: 'go1.21-bullseye'
-    TYPE: 'default'
-    IMAGE_VERSION: 'v1.30.0-go1.21.6-bullseye.0'
-    KUBERNETES_VERSION: 'v1.30.0'
-    GO_VERSION: '1.21.6'
-    GO_MAJOR_VERSION: '1.21'
-    OS_CODENAME: 'bullseye'
-    REVISION: '0'
   v1.29-go1.21-bullseye:
     CONFIG: 'go1.21-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.29.0-go1.21.6-bullseye.0'
+    IMAGE_VERSION: 'v1.29.0-go1.21.7-bullseye.0'
     KUBERNETES_VERSION: 'v1.29.0'
-    GO_VERSION: '1.21.6'
+    GO_VERSION: '1.21.7'
     GO_MAJOR_VERSION: '1.21'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
   v1.28-go1.20-bullseye:
     CONFIG: 'go1.20-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.28.0-go1.20.13-bullseye.0'
+    IMAGE_VERSION: 'v1.28.0-go1.20.14-bullseye.0'
     KUBERNETES_VERSION: 'v1.28.0'
-    GO_VERSION: '1.20.13'
+    GO_VERSION: '1.20.14'
     GO_MAJOR_VERSION: '1.20'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
   v1.27-go1.20-bullseye:
     CONFIG: 'go1.20-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.27.0-go1.20.13-bullseye.0'
+    IMAGE_VERSION: 'v1.27.0-go1.20.14-bullseye.0'
     KUBERNETES_VERSION: 'v1.27.0'
-    GO_VERSION: '1.20.13'
+    GO_VERSION: '1.20.14'
     GO_MAJOR_VERSION: '1.20'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
   v1.26-go1.20-bullseye:
     CONFIG: 'go1.20-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.26.0-go1.20.13-bullseye.0'
+    IMAGE_VERSION: 'v1.26.0-go1.20.14-bullseye.0'
     KUBERNETES_VERSION: 'v1.26.0'
-    GO_VERSION: '1.20.13'
+    GO_VERSION: '1.20.14'
     GO_MAJOR_VERSION: '1.20'
     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.21
 REVISION ?= 0
-GO_VERSION ?= 1.21.6
+GO_VERSION ?= 1.21.7
 OS_CODENAME ?= bookworm
 
 # Build args

diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml
@@ -9,17 +9,17 @@ variants:
     DISTROLESS_IMAGE: 'static-debian12'
   go1.21-bookworm:
     CONFIG: 'go1.21-bookworm'
-    IMAGE_VERSION: 'v2.3.1-go1.21.6-bookworm.0'
+    IMAGE_VERSION: 'v2.3.1-go1.21.7-bookworm.0'
     GO_MAJOR_VERSION: '1.21'
     OS_CODENAME: 'bookworm'
     REVISION: '0'
-    GO_VERSION: '1.21.6'
+    GO_VERSION: '1.21.7'
     DISTROLESS_IMAGE: 'static-debian12'
   go1.20-bullseye:
     CONFIG: 'go1.20-bullseye'
-    IMAGE_VERSION: 'v2.3.1-go1.20.13-bullseye.0'
+    IMAGE_VERSION: 'v2.3.1-go1.20.14-bullseye.0'
     GO_MAJOR_VERSION: '1.20'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
-    GO_VERSION: '1.20.13'
+    GO_VERSION: '1.20.14'
     DISTROLESS_IMAGE: 'static-debian11'
diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml
@@ -6,11 +6,11 @@ variants:
     REVISION: '0'
   go1.21-bookworm:
     CONFIG: 'go1.21-bookworm'
-    GO_VERSION: '1.21.6'
+    GO_VERSION: '1.21.7'
     OS_CODENAME: 'bookworm'
     REVISION: '0'
   go1.20-bookworm:
     CONFIG: 'go1.20-bookworm'
-    GO_VERSION: '1.20.13'
+    GO_VERSION: '1.20.14'
     OS_CODENAME: 'bookworm'
     REVISION: '0'