images: Build go1.17-bullseye variants (part two)

- kube-cross:v1.23.0-go1.17.1-bullseye.0 - k8s-ci-builder Signed-off-by: Stephen Augustus <[email protected]>
kubernetes · Sep 17, 2021 · 07b215b · 07b215b
1 parent 8c24e2f
commit 07b215b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -389,18 +389,16 @@ dependencies:
   - name: "Debian: codename (next candidate)"
     version: bullseye
     refPaths:
-    # TODO(bullseye): Uncomment as part of https://github.com/kubernetes/release/pull/2249
-    #- path: images/build/cross/variants.yaml
-    #  match: "OS_CODENAME: '(bullseye|buster)'"
+    - path: images/build/cross/variants.yaml
+      match: "OS_CODENAME: '(bullseye|buster)'"
     - path: images/build/debian-base/variants.yaml
       match: "CONFIG: '(bullseye|buster)'"
     - path: images/build/go-runner/variants.yaml
       match: "OS_CODENAME: '(bullseye|buster)'"
     - path: images/releng/ci/variants.yaml
       match: "OS_CODENAME: '(bullseye|buster)'"
-    # TODO(bullseye): Uncomment as part of https://github.com/kubernetes/release/pull/2249
-    #- path: images/releng/k8s-ci-builder/variants.yaml
-    #  match: "OS_CODENAME: '(bullseye|buster)'"
+    - path: images/releng/k8s-ci-builder/variants.yaml
+      match: "OS_CODENAME: '(bullseye|buster)'"
 
   - name: "k8s.gcr.io/build-image/debian-base"
     version: buster-v1.9.0

diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml
@@ -1,4 +1,14 @@
 variants:
+  v1.23-go1.17-bullseye:
+    CONFIG: 'go1.17-bullseye'
+    TYPE: 'default'
+    IMAGE_VERSION: 'v1.23.0-go1.17.1-bullseye.0'
+    KUBERNETES_VERSION: 'v1.23.0'
+    GO_VERSION: '1.17.1'
+    GO_MAJOR_VERSION: '1.17'
+    OS_CODENAME: 'bullseye'
+    REVISION: '0'
+    PROTOBUF_VERSION: '3.7.0'
   v1.23-go1.17-buster:
     CONFIG: 'go1.17-buster'
     TYPE: 'default'

diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml
@@ -3,6 +3,10 @@ variants:
     CONFIG: default
     GO_VERSION: '1.16.8'
     OS_CODENAME: 'buster'
+  next:
+    CONFIG: next
+    GO_VERSION: '1.17.1'
+    OS_CODENAME: 'bullseye'
   '1.23':
     CONFIG: '1.23'
     GO_VERSION: '1.17.1'