github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

releng: Point debian-base image references to K8s Infra

Browse Source 
Signed-off-by: Stephen Augustus <saugustus@vmware.com>
This commit is contained in:
Stephen Augustus 2020-05-02 22:51:40 -04:00
parent 0357843651
commit f828821eea
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/common.sh
View File

@ -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_BUILD_IMAGE_CROSS_TAG="$(cat "${KUBE_ROOT}/build/build-image/cross/VERSION")"
readonly KUBE_DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY:-k8s.gcr.io}" 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 # 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 # and build image. This is especially useful for automated build systems like

2
build/debian-base/Makefile
View File

@ -14,7 +14,7 @@
all: all-build all: all-build
REGISTRY ?= staging-k8s.gcr.io REGISTRY ?= gcr.io/k8s-staging-build-image
IMAGE ?= $(REGISTRY)/debian-base IMAGE ?= $(REGISTRY)/debian-base
BUILD_IMAGE ?= debian-build BUILD_IMAGE ?= debian-build

4
build/debian-iptables/Makefile
View File

@ -14,14 +14,14 @@
.PHONY: build push all all-build all-push-images all-push push-manifest .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 IMAGE=$(REGISTRY)/debian-iptables
TAG?=v12.0.1 TAG?=v12.0.1
ARCH?=amd64 ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x ALL_ARCH = amd64 arm arm64 ppc64le s390x
TEMP_DIR:=$(shell mktemp -d) 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 BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.0.0
# This option is for running docker manifest command # This option is for running docker manifest command

12
build/dependencies.yaml
View File

@ -91,17 +91,17 @@ dependencies:
- path: build/debian-iptables/Makefile - path: build/debian-iptables/Makefile
match: BASEIMAGE\?\=\$\(BASE_REGISTRY\)\/debian-base-\$\(ARCH\) match: BASEIMAGE\?\=\$\(BASE_REGISTRY\)\/debian-base-\$\(ARCH\)
- path: cluster/images/etcd/Makefile - 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 - 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 - 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 - 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 - 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 - 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" - name: "k8s.gcr.io/debian-iptables"
version: 12.0.1 version: 12.0.1

2
build/workspace.bzl
View File

@ -102,7 +102,7 @@ def debian_image_dependencies():
name = "debian-base-" + arch, name = "debian-base-" + arch,
architecture = arch, architecture = arch,
digest = _digest(_DEBIAN_BASE_DIGEST, arch), digest = _digest(_DEBIAN_BASE_DIGEST, arch),
registry = "k8s.gcr.io", registry = "us.gcr.io/k8s-artifacts-prod/build-image",
repository = "debian-base", repository = "debian-base",
tag = "v2.0.0", # ignored, but kept here for documentation tag = "v2.0.0", # ignored, but kept here for documentation
) )

2
cluster/images/etcd-empty-dir-cleanup/Dockerfile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 / COPY etcdctl etcd-empty-dir-cleanup.sh /
RUN chmod a+rx /etcdctl /etcd-empty-dir-cleanup.sh RUN chmod a+rx /etcdctl /etcd-empty-dir-cleanup.sh

10
cluster/images/etcd/Makefile
View File

@ -67,19 +67,19 @@ GOARM?=7
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
ifeq ($(ARCH),amd64) 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 endif
ifeq ($(ARCH),arm) 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 endif
ifeq ($(ARCH),arm64) 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 endif
ifeq ($(ARCH),ppc64le) 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 endif
ifeq ($(ARCH),s390x) 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 endif
build: build: