From 13f1a90f748f1c5a87b5462607f4b8d74ede48f5 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 11 Aug 2020 22:32:42 -0400 Subject: [PATCH 1/2] build: Update to debian-base@v2.1.3 and debian-iptables@v12.1.2 Signed-off-by: Stephen Augustus --- build/common.sh | 4 ++-- build/dependencies.yaml | 4 ++-- build/workspace.bzl | 36 ++++++++++++++++++------------------ test/utils/image/manifest.go | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/build/common.sh b/build/common.sh index e0bf9eda171..32abc2ae4df 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.2 - local debian_iptables_version=v12.1.1 + local debian_base_version=v2.1.3 + local debian_iptables_version=v12.1.2 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 815590c2e0f..0d79406a521 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.2 + version: 2.1.3 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.1 + version: 12.1.2 refPaths: - path: build/common.sh match: debian_iptables_version= diff --git a/build/workspace.bzl b/build/workspace.bzl index 08f1ac08c86..15677d7b14e 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.2 -# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-base:v2.1.2 +# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/debian-base:v2.1.3 +# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-base:v2.1.3 _DEBIAN_BASE_DIGEST = { - "manifest": "sha256:06190f821324ca89131437c51bdfe4b8515dc8ed26eba69c8f3698da227f5256", - "amd64": "sha256:c9d003ca6daeaff7b1faf4356d010c67be310ff7b6c0af7b44f570571f15fc43", - "arm": "sha256:52bda74a65e94166951ef5e33e6da847573e2a89dd6bc0bc3250a661adce1712", - "arm64": "sha256:4e172c7b2a8ae261431e05509839c8b8c23a49ededed13af898c90896d466726", - "ppc64le": "sha256:ad2190b49b3aebb1027b8fe685261c41ffbde170f49accc0816c296e59e9e927", - "s390x": "sha256:813741dd7fc9585940f558ac142fd5121cf74d9c804ffa04e22a9df4da0f785d", + "manifest": "sha256:37cfe133a6ff3fc3aa4aa5ab9fda127861902940b8e8078fff7191c7a81be8d8", + "amd64": "sha256:dc06e242160076b72bd75135fb3dd0a9e91f386b2d812ec10cbf9e65864c755d", + "arm": "sha256:9c52e9b31d679102586381fb4a03bba73fc05992adacce31df3db6d2f75f010e", + "arm64": "sha256:9a3ae250d59f317c9cf1f7bf0b61c0d90e70012ee82996867655401968076ee4", + "ppc64le": "sha256:d7c50e06d954bedb1f362ce42380f7a059423f8cbd9e7b426a7f2d73dfb4431a", + "s390x": "sha256:7e6d43baf4972f7faa33f1179fb92ff858a3e0e23f78b96a5821d13199b9da91", } # 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.1 -# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-iptables:v12.1.1 +# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/debian-iptables:v12.1.2 +# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-iptables:v12.1.2 _DEBIAN_IPTABLES_DIGEST = { - "manifest": "sha256:b92101e2910d9fe1415f35b6f7b696cf4a586f40f176ede019035bacc957a7a4", - "amd64": "sha256:4b402df0d030b267f3dcdc6506d212d6b4c7fff6552b67f0c99be7ec1842f32a", - "arm": "sha256:e976a5c88105db9a3ed462c2899aabbc5758f4f76e24098981010a226d344439", - "arm64": "sha256:6da5b6aacb8c17615e1001aac0121517f541421036b20808a375f0dd79bf8564", - "ppc64le": "sha256:63cf48fd9de1407302019ab524f7ed9ff7a05d9ecacc1a6ac77ee57fed21a078", - "s390x": "sha256:be4039f250f26e1321d048e4dd6e81b78a80825c2dd490bacc0ac80ebb94bbc5", + "manifest": "sha256:fff1fd5ab38fefde8c9eee5470ed6ea737f30e5ab86e1c0c0d429fa6add28a84", + "amd64": "sha256:448c0e019689da3f4e238922824551d02578473f7b5d11604fffd528056caafa", + "arm": "sha256:08e267a6297640eb0b218a783cabaef0a039cc4734b4a2d9cb54ee41cd82656a", + "arm64": "sha256:a83cf1d501ad33f5aa93e2719baa59b054939b8a819c3997f915a6acfaa8e31a", + "ppc64le": "sha256:c86649ac541c35431a4df8ba44e7c61923d9e34679fd17da7723db7b6ecc5245", + "s390x": "sha256:53437fe32e13bb0bd2af08ddaaf2e908add8ab576574d881ba79544f34a774b2", } # 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.2", # ignored, but kept here for documentation + tag = "v2.1.3", # 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.1", # ignored, but kept here for documentation + tag = "v12.1.2", # ignored, but kept here for documentation ) def etcd_tarballs(): diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index a9d9e0a6ddc..5df50a5a5f0 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.1"} + configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "v12.1.2"} configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"} configs[Etcd] = Config{gcRegistry, "etcd", "3.4.9"} configs[GlusterDynamicProvisioner] = Config{dockerGluster, "glusterdynamic-provisioner", "v1.0"} From 21863237a7ec65ab8e77916962eef1cf00145188 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 11 Aug 2020 23:20:06 -0400 Subject: [PATCH 2/2] cluster/images/etcd: Build etcd@3.4.9-3 using debian-base@v2.1.3 Signed-off-by: Stephen Augustus --- cluster/images/etcd/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 8ab8d472e42..0100da219aa 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?=2 +REVISION?=3 # IMAGE_TAG Uniquely identifies k8s.gcr.io/etcd docker image with a tag of the form "-". IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION) @@ -67,19 +67,19 @@ GOARM?=7 TEMP_DIR:=$(shell mktemp -d) ifeq ($(ARCH),amd64) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base:v2.1.2 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base:v2.1.3 endif ifeq ($(ARCH),arm) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:v2.1.2 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:v2.1.3 endif ifeq ($(ARCH),arm64) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:v2.1.2 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:v2.1.3 endif ifeq ($(ARCH),ppc64le) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:v2.1.2 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:v2.1.3 endif ifeq ($(ARCH),s390x) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:v2.1.2 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:v2.1.3 endif RUNNERIMAGE?=gcr.io/distroless/static:latest