From 03048e8b25799cda61e272fff55bfd43d226f9f4 Mon Sep 17 00:00:00 2001 From: pacoxu Date: Tue, 26 Jan 2021 14:24:56 +0800 Subject: [PATCH] update debian-iptables to buster-v1.4.0 for base change Signed-off-by: pacoxu --- build/common.sh | 2 +- build/dependencies.yaml | 2 +- build/workspace.bzl | 18 +++++++++--------- test/utils/image/manifest.go | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/common.sh b/build/common.sh index 06f19465984..62a119f3f63 100755 --- a/build/common.sh +++ b/build/common.sh @@ -91,7 +91,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 # # $1 - server architecture kube::build::get_docker_wrapped_binaries() { - local debian_iptables_version=buster-v1.3.0 + local debian_iptables_version=buster-v1.4.0 local go_runner_version=buster-v2.2.2 ### 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 07dbbc2ac2c..c76c02f74c8 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -136,7 +136,7 @@ dependencies: match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-s390x:[a-zA-Z]+\-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/debian-iptables: dependents" - version: buster-v1.3.0 + version: buster-v1.4.0 refPaths: - path: build/common.sh match: debian_iptables_version= diff --git a/build/workspace.bzl b/build/workspace.bzl index 0c6c773fc48..174540781f7 100644 --- a/build/workspace.bzl +++ b/build/workspace.bzl @@ -88,15 +88,15 @@ _DEBIAN_BASE_DIGEST = { # Use skopeo to find these values: https://github.com/containers/skopeo # # Example -# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/debian-iptables:buster-v1.3.0 -# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-iptables:buster-v1.3.0 +# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/debian-iptables:buster-v1.4.0 +# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-iptables:buster-v1.4.0 _DEBIAN_IPTABLES_DIGEST = { - "manifest": "sha256:4c9410a4ee555dcb0e8b7bd6fc77c65ac400f7c5bd4555df8187630efaea6ea4", - "amd64": "sha256:e30919918299988b318f0208e7fd264dee21a6be9d74bbd9f7fc15e78eade9b4", - "arm": "sha256:bf59578f532bfd3378c4a713eeb14cf0dbed224d5ad03f549165f8d853997ca4", - "arm64": "sha256:3d7ede6013b0516f1ec3852590895d4a7b6ec8f5e15bebc1a55237bba4538da2", - "ppc64le": "sha256:ebd3bb280f8da8fc6a7158b7c2fc59b4552487bffd95d0b5ac1b190aff7b0fd9", - "s390x": "sha256:a73b94aace7a571f36149aa917d4c7ee13453ed24a31f26549dd13b386dae4c1", + "manifest": "sha256:87f97cf2b62eb107871ee810f204ccde41affb70b29883aa898e93df85dea0f0", + "amd64": "sha256:da837f39cf3af78adb796c0caa9733449ae99e51cf624590c328e4c9951ace7a", + "arm": "sha256:bb6677337a4dbc3e578a3e87642d99be740dea391dc5e8987f04211c5e23abcd", + "arm64": "sha256:6ad4717d69db2cc47bc2efc91cebb96ba736be1de49e62e0deffdbaf0fa2318c", + "ppc64le": "sha256:168ccfeb861239536826a26da24ab5f68bb5349d7439424b7008b01e8f6534fc", + "s390x": "sha256:5a88d4f4c29bac5b5c93195059b928f7346be11d0f0f7f6da0e14c0bfdbd1362", } # Use skopeo to find these values: https://github.com/containers/skopeo @@ -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 = "buster-v1.3.0", # ignored, but kept here for documentation + tag = "buster-v1.4.0", # ignored, but kept here for documentation ) def etcd_tarballs(): diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 377de521a2b..ca581b6b7d2 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -222,7 +222,7 @@ func initImageConfigs() (map[int]Config, 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", "buster-v1.3.0"} + configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "buster-v1.4.0"} configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"} configs[Etcd] = Config{gcRegistry, "etcd", "3.4.13-0"} configs[GlusterDynamicProvisioner] = Config{dockerGluster, "glusterdynamic-provisioner", "v1.0"}