From 03578436514cd7829837fe7dc59017cf904ccf20 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Sat, 2 May 2020 05:53:03 -0400 Subject: [PATCH 1/5] build: Fixup GCB configs for debian-{base,iptables} images - Fix dir arguments - Drop 'BASE_REGISTRY' env var from debian-iptables config Signed-off-by: Stephen Augustus --- build/debian-base/cloudbuild.yaml | 1 + build/debian-iptables/cloudbuild.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/debian-base/cloudbuild.yaml b/build/debian-base/cloudbuild.yaml index 87181af413b..2d8320a869b 100644 --- a/build/debian-base/cloudbuild.yaml +++ b/build/debian-base/cloudbuild.yaml @@ -6,6 +6,7 @@ options: steps: - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964' entrypoint: make + dir: ./build/debian-base env: - DOCKER_CLI_EXPERIMENTAL=enabled - REGISTRY=gcr.io/$PROJECT_ID diff --git a/build/debian-iptables/cloudbuild.yaml b/build/debian-iptables/cloudbuild.yaml index 670edd9feb4..014cd9db1e7 100644 --- a/build/debian-iptables/cloudbuild.yaml +++ b/build/debian-iptables/cloudbuild.yaml @@ -6,10 +6,10 @@ options: steps: - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964' entrypoint: make + dir: ./build/debian-iptables env: - DOCKER_CLI_EXPERIMENTAL=enabled - REGISTRY=gcr.io/$PROJECT_ID - - BASE_REGISTRY=gcr.io/$PROJECT_ID - IMAGE=gcr.io/$PROJECT_ID/debian-iptables args: - all-push From f828821eea331df7186e943bb49fde407695817f Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Sat, 2 May 2020 22:51:40 -0400 Subject: [PATCH 2/5] releng: Point debian-base image references to K8s Infra Signed-off-by: Stephen Augustus --- build/common.sh | 2 +- build/debian-base/Makefile | 2 +- build/debian-iptables/Makefile | 4 ++-- build/dependencies.yaml | 12 ++++++------ build/workspace.bzl | 2 +- cluster/images/etcd-empty-dir-cleanup/Dockerfile | 2 +- cluster/images/etcd/Makefile | 10 +++++----- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/common.sh b/build/common.sh index a6f8b75aa96..fdf7773055d 100755 --- a/build/common.sh +++ b/build/common.sh @@ -43,7 +43,7 @@ readonly KUBE_BUILD_IMAGE_REPO=kube-build readonly KUBE_BUILD_IMAGE_CROSS_TAG="$(cat "${KUBE_ROOT}/build/build-image/cross/VERSION")" readonly KUBE_DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY:-k8s.gcr.io}" -readonly KUBE_BASE_IMAGE_REGISTRY="${KUBE_BASE_IMAGE_REGISTRY:-k8s.gcr.io}" +readonly KUBE_BASE_IMAGE_REGISTRY="${KUBE_BASE_IMAGE_REGISTRY:-us.gcr.io/k8s-artifacts-prod/build-image}" # This version number is used to cause everyone to rebuild their data containers # and build image. This is especially useful for automated build systems like diff --git a/build/debian-base/Makefile b/build/debian-base/Makefile index ffe9837effc..19e1f73844d 100755 --- a/build/debian-base/Makefile +++ b/build/debian-base/Makefile @@ -14,7 +14,7 @@ all: all-build -REGISTRY ?= staging-k8s.gcr.io +REGISTRY ?= gcr.io/k8s-staging-build-image IMAGE ?= $(REGISTRY)/debian-base BUILD_IMAGE ?= debian-build diff --git a/build/debian-iptables/Makefile b/build/debian-iptables/Makefile index 1e7c4f5f93c..3694ec29932 100644 --- a/build/debian-iptables/Makefile +++ b/build/debian-iptables/Makefile @@ -14,14 +14,14 @@ .PHONY: build push all all-build all-push-images all-push push-manifest -REGISTRY?="staging-k8s.gcr.io" +REGISTRY?="gcr.io/k8s-staging-build-image" IMAGE=$(REGISTRY)/debian-iptables TAG?=v12.0.1 ARCH?=amd64 ALL_ARCH = amd64 arm arm64 ppc64le s390x TEMP_DIR:=$(shell mktemp -d) -BASE_REGISTRY?=k8s.gcr.io +BASE_REGISTRY?=us.gcr.io/k8s-artifacts-prod/build-image BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.0.0 # This option is for running docker manifest command diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 70beb72db64..2c5e0ba3c19 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -91,17 +91,17 @@ dependencies: - path: build/debian-iptables/Makefile match: BASEIMAGE\?\=\$\(BASE_REGISTRY\)\/debian-base-\$\(ARCH\) - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base:v\d+\.\d+\.\d+ + match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base:v\d+\.\d+\.\d+ - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-arm:v\d+\.\d+\.\d+ + match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-arm:v\d+\.\d+\.\d+ - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-arm64:v\d+\.\d+\.\d+ + match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-arm64:v\d+\.\d+\.\d+ - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-ppc64le:v\d+\.\d+\.\d+ + match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-ppc64le:v\d+\.\d+\.\d+ - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-s390x:v\d+\.\d+\.\d+ + match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-s390x:v\d+\.\d+\.\d+ - path: cluster/images/etcd-empty-dir-cleanup/Dockerfile - match: k8s.gcr.io\/debian-base:v\d+\.\d+\.\d+ + match: us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base:v\d+\.\d+\.\d+ - name: "k8s.gcr.io/debian-iptables" version: 12.0.1 diff --git a/build/workspace.bzl b/build/workspace.bzl index 08e54096b2e..d4e3104d5ea 100644 --- a/build/workspace.bzl +++ b/build/workspace.bzl @@ -102,7 +102,7 @@ def debian_image_dependencies(): name = "debian-base-" + arch, architecture = arch, digest = _digest(_DEBIAN_BASE_DIGEST, arch), - registry = "k8s.gcr.io", + registry = "us.gcr.io/k8s-artifacts-prod/build-image", repository = "debian-base", tag = "v2.0.0", # ignored, but kept here for documentation ) diff --git a/cluster/images/etcd-empty-dir-cleanup/Dockerfile b/cluster/images/etcd-empty-dir-cleanup/Dockerfile index 0775a5e496f..96dfd7d22d9 100644 --- a/cluster/images/etcd-empty-dir-cleanup/Dockerfile +++ b/cluster/images/etcd-empty-dir-cleanup/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM k8s.gcr.io/debian-base:v2.0.0 +FROM us.gcr.io/k8s-artifacts-prod/build-image/debian-base:v2.0.0 COPY etcdctl etcd-empty-dir-cleanup.sh / RUN chmod a+rx /etcdctl /etcd-empty-dir-cleanup.sh diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 4d722209400..4b3bf1e1863 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/debian-base:v2.0.0 + BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base:v2.0.0 endif ifeq ($(ARCH),arm) - BASEIMAGE?=k8s.gcr.io/debian-base-arm:v2.0.0 + BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-arm:v2.0.0 endif ifeq ($(ARCH),arm64) - BASEIMAGE?=k8s.gcr.io/debian-base-arm64:v2.0.0 + BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-arm64:v2.0.0 endif ifeq ($(ARCH),ppc64le) - BASEIMAGE?=k8s.gcr.io/debian-base-ppc64le:v2.0.0 + BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-ppc64le:v2.0.0 endif ifeq ($(ARCH),s390x) - BASEIMAGE?=k8s.gcr.io/debian-base-s390x:v2.0.0 + BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-s390x:v2.0.0 endif build: From 64300d8fffa9b02583a4f8449975ed42702f4080 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Sat, 2 May 2020 21:15:52 -0400 Subject: [PATCH 3/5] deps: Update dependents to use debian-base:v2.1.0 Signed-off-by: Stephen Augustus --- build/common.sh | 2 +- build/debian-iptables/Makefile | 2 +- build/dependencies.yaml | 2 +- build/workspace.bzl | 14 +++++++------- cluster/images/etcd-empty-dir-cleanup/Dockerfile | 2 +- cluster/images/etcd/Makefile | 10 +++++----- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/common.sh b/build/common.sh index fdf7773055d..c3839ccf4bd 100755 --- a/build/common.sh +++ b/build/common.sh @@ -94,7 +94,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 # $1 - server architecture kube::build::get_docker_wrapped_binaries() { local arch=$1 - local debian_base_version=v2.0.0 + local debian_base_version=v2.1.0 local debian_iptables_version=v12.0.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/debian-iptables/Makefile b/build/debian-iptables/Makefile index 3694ec29932..5e16f57c411 100644 --- a/build/debian-iptables/Makefile +++ b/build/debian-iptables/Makefile @@ -22,7 +22,7 @@ ALL_ARCH = amd64 arm arm64 ppc64le s390x TEMP_DIR:=$(shell mktemp -d) BASE_REGISTRY?=us.gcr.io/k8s-artifacts-prod/build-image -BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.0.0 +BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.1.0 # This option is for running docker manifest command export DOCKER_CLI_EXPERIMENTAL := enabled diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 2c5e0ba3c19..115beb4eccf 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -82,7 +82,7 @@ dependencies: match: TAG \?= - name: "k8s.gcr.io/debian-base: dependents" - version: 2.0.0 + version: 2.1.0 refPaths: - path: build/common.sh match: debian_base_version= diff --git a/build/workspace.bzl b/build/workspace.bzl index d4e3104d5ea..0a274499efe 100644 --- a/build/workspace.bzl +++ b/build/workspace.bzl @@ -73,12 +73,12 @@ def cri_tarballs(): # Use go get -u github.com/estesp/manifest-tool to find these values _DEBIAN_BASE_DIGEST = { - "manifest": "sha256:ebda8587ec0f49eb88ee3a608ef018484908cbc5aa32556a0d78356088c185d4", - "amd64": "sha256:d7be39e143d4e6677a28c81c0a84868b40800fc979dea1848bb19d526668a00c", - "arm": "sha256:fc731da13b0bc9013b85a86b583fc92e50869b5bc8e7aa6ca730ec0240954c7d", - "arm64": "sha256:12502c3eed050fa9b6d5fe353a44bfc5f437dc325c8912b1a48dcc180df36f1e", - "ppc64le": "sha256:4277aa59b63c5a1369e6d84a295ecc4ffa08985dcf114de9f7b6de1af4fcbc86", - "s390x": "sha256:78ef2a6b017539379c1654b4e52ba8519bfec821c62d0b3a1dbd15104b711e21", + "manifest": "sha256:b118abac0bcf633b9db4086584ee718526fe394cf1bd18aee036e6cc497860f6", + "amd64": "sha256:a67798e4746faaab3fde5b7407fa8bba75d8b1214d168dc7ad2b5364f6fc4319", + "arm": "sha256:3ab4332e481610acbcba7a801711e29506b4bd4ecb38f72590253674d914c449", + "arm64": "sha256:8d53ac4da977eb20d6219ee49b9cdff8c066831ecab0e4294d0a02179d26b1d7", + "ppc64le": "sha256:a631023e795fe18df7faa8fe1264e757a6c74a232b9a2659657bf65756f3f4aa", + "s390x": "sha256:dac908eaa61d2034aec252576a470a7e4ab184c361f89170526f707a0c3c6082", } _DEBIAN_IPTABLES_DIGEST = { @@ -104,7 +104,7 @@ def debian_image_dependencies(): digest = _digest(_DEBIAN_BASE_DIGEST, arch), registry = "us.gcr.io/k8s-artifacts-prod/build-image", repository = "debian-base", - tag = "v2.0.0", # ignored, but kept here for documentation + tag = "v2.1.0", # ignored, but kept here for documentation ) container_pull( diff --git a/cluster/images/etcd-empty-dir-cleanup/Dockerfile b/cluster/images/etcd-empty-dir-cleanup/Dockerfile index 96dfd7d22d9..37e2ebefb4e 100644 --- a/cluster/images/etcd-empty-dir-cleanup/Dockerfile +++ b/cluster/images/etcd-empty-dir-cleanup/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM us.gcr.io/k8s-artifacts-prod/build-image/debian-base:v2.0.0 +FROM us.gcr.io/k8s-artifacts-prod/build-image/debian-base:v2.1.0 COPY etcdctl etcd-empty-dir-cleanup.sh / RUN chmod a+rx /etcdctl /etcd-empty-dir-cleanup.sh diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 4b3bf1e1863..251113fbb5d 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?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base:v2.0.0 + BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base:v2.1.0 endif ifeq ($(ARCH),arm) - BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-arm:v2.0.0 + BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-arm:v2.1.0 endif ifeq ($(ARCH),arm64) - BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-arm64:v2.0.0 + BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-arm64:v2.1.0 endif ifeq ($(ARCH),ppc64le) - BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-ppc64le:v2.0.0 + BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-ppc64le:v2.1.0 endif ifeq ($(ARCH),s390x) - BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-s390x:v2.0.0 + BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-s390x:v2.1.0 endif build: From 7109a86f47cf1f67275533f1c6e69bbc1ce174ac Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Sat, 2 May 2020 21:22:29 -0400 Subject: [PATCH 4/5] build: Build debian-iptables:v12.1.0 image Signed-off-by: Stephen Augustus --- build/debian-iptables/Makefile | 2 +- build/dependencies.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/debian-iptables/Makefile b/build/debian-iptables/Makefile index 5e16f57c411..4a669177c43 100644 --- a/build/debian-iptables/Makefile +++ b/build/debian-iptables/Makefile @@ -16,7 +16,7 @@ REGISTRY?="gcr.io/k8s-staging-build-image" IMAGE=$(REGISTRY)/debian-iptables -TAG?=v12.0.1 +TAG?=v12.1.0 ARCH?=amd64 ALL_ARCH = amd64 arm arm64 ppc64le s390x TEMP_DIR:=$(shell mktemp -d) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 115beb4eccf..a1787f90497 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -104,7 +104,7 @@ dependencies: match: us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base:v\d+\.\d+\.\d+ - name: "k8s.gcr.io/debian-iptables" - version: 12.0.1 + version: 12.1.0 refPaths: - path: build/debian-iptables/Makefile match: TAG\?= From d95dcc61f33cfb862abcb2406ef3290f62375753 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 5 May 2020 15:15:30 -0400 Subject: [PATCH 5/5] cluster/images/etcd: Bump etcd image tags for new debian-base Signed-off-by: Stephen Augustus --- cluster/images/etcd-empty-dir-cleanup/Makefile | 2 +- cluster/images/etcd/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/images/etcd-empty-dir-cleanup/Makefile b/cluster/images/etcd-empty-dir-cleanup/Makefile index 4e3836c1232..9caa5494d76 100644 --- a/cluster/images/etcd-empty-dir-cleanup/Makefile +++ b/cluster/images/etcd-empty-dir-cleanup/Makefile @@ -20,7 +20,7 @@ ETCD_VERSION = 3.4.7 REGISTRY = k8s.gcr.io # Images should be pushed to staging-k8s.gcr.io. PUSH_REGISTRY = staging-k8s.gcr.io -TAG = 3.4.7.0 +TAG = 3.4.7.1 clean: rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 251113fbb5d..5287e1736be 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -34,7 +34,7 @@ LATEST_ETCD_VERSION?=3.4.7 # 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?=0 +REVISION?=1 # IMAGE_TAG Uniquely identifies k8s.gcr.io/etcd docker image with a tag of the form "-". IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION)