diff --git a/dependencies.yaml b/dependencies.yaml index 00e0eec294d..14b98c623c9 100644 --- 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 @@ -450,9 +448,8 @@ dependencies: refPaths: - path: images/build/debian-iptables/variants.yaml match: "DEBIAN_BASE_VERSION: '(bullseye|buster)-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" - # TODO(bullseye): Uncomment as part of https://github.com/kubernetes/release/pull/2249 - #- path: images/build/setcap/variants.yaml - # match: "DEBIAN_BASE_VERSION: '(bullseye|buster)-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" + - path: images/build/setcap/variants.yaml + match: "DEBIAN_BASE_VERSION: '(bullseye|buster)-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" - name: "k8s.gcr.io/build-image/debian-iptables (next candidate)" version: bullseye-v1.0.0 @@ -461,7 +458,7 @@ dependencies: match: "IMAGE_VERSION: '(bullseye|buster)-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" - name: "k8s.gcr.io/build-image/setcap (next candidate)" - version: buster-v2.0.4 + version: bullseye-v1.0.0 refPaths: - path: images/build/setcap/variants.yaml match: "IMAGE_VERSION: '(bullseye|buster)-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" diff --git a/hack/init-buildx.sh b/hack/init-buildx.sh index 67936a8d76b..ac3c156adbf 100755 --- a/hack/init-buildx.sh +++ b/hack/init-buildx.sh @@ -60,9 +60,9 @@ fi # Ensure qemu is in binfmt_misc # NOTE: Please always pin this to a digest for predictability/auditability -# Last updated: 08/21/2020 +# Last updated: 09/18/2021 if [ "$(uname)" == 'Linux' ]; then - docker run --rm --privileged multiarch/qemu-user-static@sha256:c772ee1965aa0be9915ee1b018a0dd92ea361b4fa1bcab5bbc033517749b2af4 --reset -p yes + docker run --rm --privileged multiarch/qemu-user-static:5.2.0-2@sha256:14ef836763dd8a1d69927699811f89338b129faa3bd9eb52cd696bc3d84aa81a --reset -p yes fi # Ensure we use a builder that can leverage it (the default on linux will not) diff --git a/images/build/cross/cloudbuild.yaml b/images/build/cross/cloudbuild.yaml index 1a21fa351a0..e2f2a5697f6 100644 --- a/images/build/cross/cloudbuild.yaml +++ b/images/build/cross/cloudbuild.yaml @@ -1,5 +1,5 @@ # See https://cloud.google.com/cloud-build/docs/build-config -timeout: 3600s +timeout: 5400s options: substitution_option: ALLOW_LOOSE diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index 3ff4ddc8a4e..dab98ceef28 100644 --- 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/build/setcap/Dockerfile b/images/build/setcap/Dockerfile index 4e75ca8fe0d..1a6ba8ef704 100644 --- a/images/build/setcap/Dockerfile +++ b/images/build/setcap/Dockerfile @@ -16,5 +16,9 @@ ARG BASEIMAGE FROM ${BASEIMAGE} +ARG BASEIMAGE + RUN apt-get update \ + && CODENAME=$(. /etc/os-release; echo $VERSION_CODENAME) && \ + if [ "bullseye" = "$CODENAME" ]; then apt-get -y --allow-change-held-packages install libcap2; fi \ && apt-get -y --no-install-recommends install libcap2-bin diff --git a/images/build/setcap/variants.yaml b/images/build/setcap/variants.yaml index a2ea703e087..4ccc18d1fdb 100644 --- a/images/build/setcap/variants.yaml +++ b/images/build/setcap/variants.yaml @@ -1,4 +1,10 @@ variants: + # Debian 11 - Kubernetes 1.23 and newer + bullseye: + CONFIG: 'bullseye' + IMAGE_VERSION: 'bullseye-v1.0.0' + DEBIAN_BASE_VERSION: 'bullseye-v1.0.0' + # Debian 10 - Kubernetes 1.22 and older buster: CONFIG: 'buster' IMAGE_VERSION: 'buster-v2.0.4' diff --git a/images/releng/k8s-ci-builder/Dockerfile b/images/releng/k8s-ci-builder/Dockerfile index 3517c28ba06..1b2421489c4 100644 --- a/images/releng/k8s-ci-builder/Dockerfile +++ b/images/releng/k8s-ci-builder/Dockerfile @@ -75,9 +75,9 @@ RUN echo "Installing Packages ..." \ mercurial \ pkg-config \ procps \ - python \ - python-dev \ - python-pip \ + python3 \ + python3-dev \ + python3-pip \ rsync \ software-properties-common \ unzip \ diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml index 6304551aa11..2db956c12bc 100644 --- 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'