From f828821eea331df7186e943bb49fde407695817f Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Sat, 2 May 2020 22:51:40 -0400 Subject: [PATCH] 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: