Merge pull request #3461 from cpanato/build-go

build go images with 1.21.7 for old release branches and drop go1.20 images build
kubernetes · Feb 10, 2024 · 93a8c9f · 93a8c9f
2 parents e643549 + 82dd8ba
commit 93a8c9f
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 65 deletions.
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -140,28 +140,6 @@ dependencies:
     - path: images/build/go-runner/variants.yaml
       match: REVISION:\ '\d+'
 
-  - name: "registry.k8s.io/build-image/go-runner (go1.20-bullseye)"
-    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-]+)*))?)
-
-  - name: "registry.k8s.io/build-image/go-runner: image revision (go1.20-bullseye)"
-    version: 0
-    refPaths:
-    - path: images/build/go-runner/Makefile
-      match: REVISION \?= \d+
-    - path: images/build/go-runner/variants.yaml
-      match: REVISION:\ '\d+'
-
-  - name: "registry.k8s.io/build-image/go-runner: image revision (go1.20-bullseye)"
-    version: 0
-    refPaths:
-    - path: images/build/go-runner/Makefile
-      match: REVISION \?= \d+
-    - path: images/build/go-runner/variants.yaml
-      match: REVISION:\ '\d+'
-
   # kube-cross
   - name: "registry.k8s.io/build-image/kube-cross (v1.30-go1.22)"
     version: v1.30.0-go1.22-bullseye.0
@@ -203,59 +181,59 @@ dependencies:
     - path: images/build/cross/variants.yaml
       match: REVISION:\ '\d+'
 
-  - name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.20)"
-    version: v1.28.0-go1.20.14-bullseye.0
+  - name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.21)"
+    version: v1.28.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-]+)*))?)'"
 
-  - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.28-go1.20)"
-    version: go1.20-bullseye
+  - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.28-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.28-go1.20)"
+  - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.28-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.27-go1.20)"
-    version: v1.27.0-go1.20.14-bullseye.0
+  - name: "registry.k8s.io/build-image/kube-cross (v1.27-go1.21)"
+    version: v1.27.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-]+)*))?)'"
 
-  - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.27-go1.20)"
-    version: go1.20-bullseye
+  - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.27-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.27-go1.20)"
+  - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.27-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.26-go1.20)"
-    version: v1.26.0-go1.20.14-bullseye.0
+  - name: "registry.k8s.io/build-image/kube-cross (v1.26-go1.21)"
+    version: v1.26.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-]+)*))?)'"
 
-  - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.26-go1.20)"
-    version: go1.20-bullseye
+  - 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.20)"
+  - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.26-go1.21)"
     version: 0
     refPaths:
     - path: images/build/cross/Makefile
@@ -350,7 +328,7 @@ dependencies:
 
   # Golang (previous release branches: 1.28)
   - name: "golang (previous release branches: 1.28)"
-    version: 1.20.14
+    version: 1.21.7
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -373,7 +351,7 @@ dependencies:
 
   # Golang (previous release branches: 1.27)
   - name: "golang (previous release branches: 1.27)"
-    version: 1.20.14
+    version: 1.21.7
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -390,7 +368,7 @@ dependencies:
 
   # Golang (previous release branches: 1.26)
   - name: "golang (previous release branches: 1.26)"
-    version: 1.20.14
+    version: 1.21.7
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml
@@ -17,30 +17,30 @@ variants:
     GO_MAJOR_VERSION: '1.21'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
-  v1.28-go1.20-bullseye:
-    CONFIG: 'go1.20-bullseye'
+  v1.28-go1.21-bullseye:
+    CONFIG: 'go1.21-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.28.0-go1.20.14-bullseye.0'
+    IMAGE_VERSION: 'v1.28.0-go1.21.7-bullseye.0'
     KUBERNETES_VERSION: 'v1.28.0'
-    GO_VERSION: '1.20.14'
-    GO_MAJOR_VERSION: '1.20'
+    GO_VERSION: '1.21.7'
+    GO_MAJOR_VERSION: '1.21'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
-  v1.27-go1.20-bullseye:
-    CONFIG: 'go1.20-bullseye'
+  v1.27-go1.21-bullseye:
+    CONFIG: 'go1.21-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.27.0-go1.20.14-bullseye.0'
+    IMAGE_VERSION: 'v1.27.0-go1.21.7-bullseye.0'
     KUBERNETES_VERSION: 'v1.27.0'
-    GO_VERSION: '1.20.14'
-    GO_MAJOR_VERSION: '1.20'
+    GO_VERSION: '1.21.7'
+    GO_MAJOR_VERSION: '1.21'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
-  v1.26-go1.20-bullseye:
-    CONFIG: 'go1.20-bullseye'
+  v1.26-go1.21-bullseye:
+    CONFIG: 'go1.21-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.26.0-go1.20.14-bullseye.0'
+    IMAGE_VERSION: 'v1.26.0-go1.21.7-bullseye.0'
     KUBERNETES_VERSION: 'v1.26.0'
-    GO_VERSION: '1.20.14'
-    GO_MAJOR_VERSION: '1.20'
+    GO_VERSION: '1.21.7'
+    GO_MAJOR_VERSION: '1.21'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml
@@ -15,11 +15,11 @@ variants:
     REVISION: '0'
     GO_VERSION: '1.21.7'
     DISTROLESS_IMAGE: 'static-debian12'
-  go1.20-bullseye:
-    CONFIG: 'go1.20-bullseye'
-    IMAGE_VERSION: 'v2.3.1-go1.20.14-bullseye.0'
-    GO_MAJOR_VERSION: '1.20'
+  go1.21-bullseye:
+    CONFIG: 'go1.21-bullseye'
+    IMAGE_VERSION: 'v2.3.1-go1.21.7-bullseye.0'
+    GO_MAJOR_VERSION: '1.21'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
-    GO_VERSION: '1.20.14'
+    GO_VERSION: '1.21.7'
     DISTROLESS_IMAGE: 'static-debian11'
diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml
@@ -9,8 +9,3 @@ variants:
     GO_VERSION: '1.21.7'
     OS_CODENAME: 'bookworm'
     REVISION: '0'
-  go1.20-bookworm:
-    CONFIG: 'go1.20-bookworm'
-    GO_VERSION: '1.20.14'
-    OS_CODENAME: 'bookworm'
-    REVISION: '0'