Skip to content

Commit e3ab9f6

Browse files
committed
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]>
1 parent 0a7c325 commit e3ab9f6

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

dependencies.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -389,18 +389,16 @@ dependencies:
389389
- name: "Debian: codename (next candidate)"
390390
version: bullseye
391391
refPaths:
392-
# TODO(bullseye): Uncomment as part of https://github.com/kubernetes/release/pull/2249
393-
#- path: images/build/cross/variants.yaml
394-
# match: "OS_CODENAME: '(bullseye|buster)'"
392+
- path: images/build/cross/variants.yaml
393+
match: "OS_CODENAME: '(bullseye|buster)'"
395394
- path: images/build/debian-base/variants.yaml
396395
match: "CONFIG: '(bullseye|buster)'"
397396
- path: images/build/go-runner/variants.yaml
398397
match: "OS_CODENAME: '(bullseye|buster)'"
399398
- path: images/releng/ci/variants.yaml
400399
match: "OS_CODENAME: '(bullseye|buster)'"
401-
# TODO(bullseye): Uncomment as part of https://github.com/kubernetes/release/pull/2249
402-
#- path: images/releng/k8s-ci-builder/variants.yaml
403-
# match: "OS_CODENAME: '(bullseye|buster)'"
400+
- path: images/releng/k8s-ci-builder/variants.yaml
401+
match: "OS_CODENAME: '(bullseye|buster)'"
404402

405403
- name: "k8s.gcr.io/build-image/debian-base"
406404
version: buster-v1.9.0

images/build/cross/variants.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
variants:
2+
go1.17-bullseye:
3+
CONFIG: 'go1.17-bullseye'
4+
TYPE: 'default'
5+
IMAGE_VERSION: 'v1.23.0-go1.17.1-bullseye.0'
6+
KUBERNETES_VERSION: 'v1.23.0'
7+
GO_VERSION: '1.17.1'
8+
GO_MAJOR_VERSION: '1.17'
9+
OS_CODENAME: 'bullseye'
10+
REVISION: '0'
11+
PROTOBUF_VERSION: '3.7.0'
212
go1.17-buster:
313
CONFIG: 'go1.17-buster'
414
TYPE: 'default'

images/releng/k8s-ci-builder/variants.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ variants:
33
CONFIG: default
44
GO_VERSION: '1.16.7'
55
OS_CODENAME: 'buster'
6+
next:
7+
CONFIG: next
8+
GO_VERSION: '1.17.1'
9+
OS_CODENAME: 'bullseye'
610
'1.23':
711
CONFIG: '1.23'
812
GO_VERSION: '1.17.1'

0 commit comments

Comments
 (0)