From 87e13f76653eea8c1a0c0b4f33adad4a03c4294c Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 4 Aug 2020 00:49:59 -0400 Subject: [PATCH 1/2] build: Update to debian-base@v2.1.0 and debian-iptables@v12.1.1 Signed-off-by: Stephen Augustus --- build/common.sh | 4 ++-- build/dependencies.yaml | 4 ++-- build/workspace.bzl | 36 ++++++++++++++++++------------------ cluster/images/etcd/Makefile | 10 +++++----- test/utils/image/manifest.go | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/build/common.sh b/build/common.sh index f000b76c33c..e0bf9eda171 100755 --- a/build/common.sh +++ b/build/common.sh @@ -94,8 +94,8 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 # $1 - server architecture kube::build::get_docker_wrapped_binaries() { local arch=$1 - local debian_base_version=v2.1.0 - local debian_iptables_version=v12.1.0 + local debian_base_version=v2.1.2 + local debian_iptables_version=v12.1.1 local go_runner_version=v0.1.1 ### If you change any of these lists, please also update DOCKERIZED_BINARIES ### in build/BUILD. And kube::golang::server_image_targets diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 4b2b67e2c8e..988248bcf2e 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -104,7 +104,7 @@ dependencies: # Base images - name: "k8s.gcr.io/debian-base: dependents" - version: 2.1.0 + version: 2.1.2 refPaths: - path: build/common.sh match: debian_base_version= @@ -122,7 +122,7 @@ dependencies: match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-s390x:v\d+\.\d+\.\d+ - name: "k8s.gcr.io/debian-iptables: dependents" - version: 12.1.0 + version: 12.1.1 refPaths: - path: build/common.sh match: debian_iptables_version= diff --git a/build/workspace.bzl b/build/workspace.bzl index f23d3725a00..08f1ac08c86 100644 --- a/build/workspace.bzl +++ b/build/workspace.bzl @@ -74,29 +74,29 @@ def cri_tarballs(): # Use skopeo to find these values: https://github.com/containers/skopeo # # Example -# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/debian-base:v2.1.0 -# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-base:v2.1.0 +# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/debian-base:v2.1.2 +# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-base:v2.1.2 _DEBIAN_BASE_DIGEST = { - "manifest": "sha256:b118abac0bcf633b9db4086584ee718526fe394cf1bd18aee036e6cc497860f6", - "amd64": "sha256:a67798e4746faaab3fde5b7407fa8bba75d8b1214d168dc7ad2b5364f6fc4319", - "arm": "sha256:3ab4332e481610acbcba7a801711e29506b4bd4ecb38f72590253674d914c449", - "arm64": "sha256:8d53ac4da977eb20d6219ee49b9cdff8c066831ecab0e4294d0a02179d26b1d7", - "ppc64le": "sha256:a631023e795fe18df7faa8fe1264e757a6c74a232b9a2659657bf65756f3f4aa", - "s390x": "sha256:dac908eaa61d2034aec252576a470a7e4ab184c361f89170526f707a0c3c6082", + "manifest": "sha256:06190f821324ca89131437c51bdfe4b8515dc8ed26eba69c8f3698da227f5256", + "amd64": "sha256:c9d003ca6daeaff7b1faf4356d010c67be310ff7b6c0af7b44f570571f15fc43", + "arm": "sha256:52bda74a65e94166951ef5e33e6da847573e2a89dd6bc0bc3250a661adce1712", + "arm64": "sha256:4e172c7b2a8ae261431e05509839c8b8c23a49ededed13af898c90896d466726", + "ppc64le": "sha256:ad2190b49b3aebb1027b8fe685261c41ffbde170f49accc0816c296e59e9e927", + "s390x": "sha256:813741dd7fc9585940f558ac142fd5121cf74d9c804ffa04e22a9df4da0f785d", } # Use skopeo to find these values: https://github.com/containers/skopeo # # Example -# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/debian-iptables:v12.1.0 -# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-iptables:v12.1.0 +# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/debian-iptables:v12.1.1 +# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-iptables:v12.1.1 _DEBIAN_IPTABLES_DIGEST = { - "manifest": "sha256:1ae6d76dea462973759ff1c4e02263867da1f85db9aa10462a030ca421cbf0e9", - "amd64": "sha256:2fb9fa09123a41e6369cac04eb29e26237fe9e43da8e18f676d18d8fffb906fc", - "arm": "sha256:a0e97386c073a2990265938fa15dc0db575efdb4d13c0ea63a79e0590813a998", - "arm64": "sha256:2a7df97e2c702d9852cc6234aff89b4671cd5b09086ac2b5383411315e5f115d", - "ppc64le": "sha256:f5289a6494328b7ccb695e3add65b33ca380b77fcfc9715e474f0efe26e1c506", - "s390x": "sha256:1b91a2788750552913377bf1bc99a095544dfb523d80a55674003c974c8e0905", + "manifest": "sha256:b92101e2910d9fe1415f35b6f7b696cf4a586f40f176ede019035bacc957a7a4", + "amd64": "sha256:4b402df0d030b267f3dcdc6506d212d6b4c7fff6552b67f0c99be7ec1842f32a", + "arm": "sha256:e976a5c88105db9a3ed462c2899aabbc5758f4f76e24098981010a226d344439", + "arm64": "sha256:6da5b6aacb8c17615e1001aac0121517f541421036b20808a375f0dd79bf8564", + "ppc64le": "sha256:63cf48fd9de1407302019ab524f7ed9ff7a05d9ecacc1a6ac77ee57fed21a078", + "s390x": "sha256:be4039f250f26e1321d048e4dd6e81b78a80825c2dd490bacc0ac80ebb94bbc5", } # Use skopeo to find these values: https://github.com/containers/skopeo @@ -137,7 +137,7 @@ def image_dependencies(): registry = "k8s.gcr.io/build-image", repository = "debian-base", # Ensure the digests above are updated to match a new tag - tag = "v2.1.0", # ignored, but kept here for documentation + tag = "v2.1.2", # ignored, but kept here for documentation ) container_pull( @@ -147,7 +147,7 @@ def image_dependencies(): registry = "k8s.gcr.io/build-image", repository = "debian-iptables", # Ensure the digests above are updated to match a new tag - tag = "v12.1.0", # ignored, but kept here for documentation + tag = "v12.1.1", # ignored, but kept here for documentation ) def etcd_tarballs(): diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 5e219de4263..775e7265b42 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -67,19 +67,19 @@ GOARM?=7 TEMP_DIR:=$(shell mktemp -d) ifeq ($(ARCH),amd64) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base:v2.1.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base:v2.1.2 endif ifeq ($(ARCH),arm) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:v2.1.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:v2.1.2 endif ifeq ($(ARCH),arm64) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:v2.1.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:v2.1.2 endif ifeq ($(ARCH),ppc64le) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:v2.1.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:v2.1.2 endif ifeq ($(ARCH),s390x) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:v2.1.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:v2.1.2 endif RUNNERIMAGE?=gcr.io/distroless/static:latest diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index a33f99aa4ee..ec11dbcf00c 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -210,7 +210,7 @@ func initImageConfigs() map[int]Config { configs[CheckMetadataConcealment] = Config{e2eRegistry, "metadata-concealment", "1.2"} configs[CudaVectorAdd] = Config{e2eRegistry, "cuda-vector-add", "1.0"} configs[CudaVectorAdd2] = Config{e2eRegistry, "cuda-vector-add", "2.0"} - configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "v12.1.0"} + configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "v12.1.1"} configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"} configs[Etcd] = Config{gcRegistry, "etcd", "3.4.9"} configs[GlusterDynamicProvisioner] = Config{dockerGluster, "glusterdynamic-provisioner", "v1.0"} From 876a6c85ed675444a0f6bdc3cbcc3fc6525273cd Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 4 Aug 2020 01:16:57 -0400 Subject: [PATCH 2/2] cluster/images/etcd: Build etcd@3.4.9-2 using debian-base@v2.1.2 Signed-off-by: Stephen Augustus --- cluster/images/etcd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 775e7265b42..8ab8d472e42 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -34,7 +34,7 @@ LATEST_ETCD_VERSION?=3.4.9 # REVISION provides a version number fo this image and all it's bundled # artifacts. It should start at zero for each LATEST_ETCD_VERSION and increment # for each revision of this image at that etcd version. -REVISION?=1 +REVISION?=2 # IMAGE_TAG Uniquely identifies k8s.gcr.io/etcd docker image with a tag of the form "-". IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION)