Skip to content

Commit d8a513e

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#90697 from justaugustus/base-images
base-images: Use new debian-base:v2.1.0 and build new debian-iptables:v12.1.0
2 parents 8e3766f + d95dcc6 commit d8a513e

File tree

10 files changed

+33
-32
lines changed

10 files changed

+33
-32
lines changed

‎build/common.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ readonly KUBE_BUILD_IMAGE_REPO=kube-build
4343
readonly KUBE_BUILD_IMAGE_CROSS_TAG="$(cat "${KUBE_ROOT}/build/build-image/cross/VERSION")"
4444

4545
readonly KUBE_DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY:-k8s.gcr.io}"
46-
readonly KUBE_BASE_IMAGE_REGISTRY="${KUBE_BASE_IMAGE_REGISTRY:-k8s.gcr.io}"
46+
readonly KUBE_BASE_IMAGE_REGISTRY="${KUBE_BASE_IMAGE_REGISTRY:-us.gcr.io/k8s-artifacts-prod/build-image}"
4747

4848
# This version number is used to cause everyone to rebuild their data containers
4949
# and build image. This is especially useful for automated build systems like
@@ -94,7 +94,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
9494
# $1 - server architecture
9595
kube::build::get_docker_wrapped_binaries() {
9696
local arch=$1
97-
local debian_base_version=v2.0.0
97+
local debian_base_version=v2.1.0
9898
local debian_iptables_version=v12.0.1
9999
### If you change any of these lists, please also update DOCKERIZED_BINARIES
100100
### in build/BUILD. And kube::golang::server_image_targets

‎build/debian-base/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
all: all-build
1616

17-
REGISTRY ?= staging-k8s.gcr.io
17+
REGISTRY ?= gcr.io/k8s-staging-build-image
1818
IMAGE ?= $(REGISTRY)/debian-base
1919
BUILD_IMAGE ?= debian-build
2020

‎build/debian-base/cloudbuild.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ options:
66
steps:
77
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964'
88
entrypoint: make
9+
dir: ./build/debian-base
910
env:
1011
- DOCKER_CLI_EXPERIMENTAL=enabled
1112
- REGISTRY=gcr.io/$PROJECT_ID

‎build/debian-iptables/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414

1515
.PHONY: build push all all-build all-push-images all-push push-manifest
1616

17-
REGISTRY?="staging-k8s.gcr.io"
17+
REGISTRY?="gcr.io/k8s-staging-build-image"
1818
IMAGE=$(REGISTRY)/debian-iptables
19-
TAG?=v12.0.1
19+
TAG?=v12.1.0
2020
ARCH?=amd64
2121
ALL_ARCH = amd64 arm arm64 ppc64le s390x
2222
TEMP_DIR:=$(shell mktemp -d)
2323

24-
BASE_REGISTRY?=k8s.gcr.io
25-
BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.0.0
24+
BASE_REGISTRY?=us.gcr.io/k8s-artifacts-prod/build-image
25+
BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.1.0
2626

2727
# This option is for running docker manifest command
2828
export DOCKER_CLI_EXPERIMENTAL := enabled

‎build/debian-iptables/cloudbuild.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ options:
66
steps:
77
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964'
88
entrypoint: make
9+
dir: ./build/debian-iptables
910
env:
1011
- DOCKER_CLI_EXPERIMENTAL=enabled
1112
- REGISTRY=gcr.io/$PROJECT_ID
12-
- BASE_REGISTRY=gcr.io/$PROJECT_ID
1313
- IMAGE=gcr.io/$PROJECT_ID/debian-iptables
1414
args:
1515
- all-push

‎build/dependencies.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ dependencies:
8282
match: TAG \?=
8383

8484
- name: "k8s.gcr.io/debian-base: dependents"
85-
version: 2.0.0
85+
version: 2.1.0
8686
refPaths:
8787
- path: build/common.sh
8888
match: debian_base_version=
@@ -91,20 +91,20 @@ dependencies:
9191
- path: build/debian-iptables/Makefile
9292
match: BASEIMAGE\?\=\$\(BASE_REGISTRY\)\/debian-base-\$\(ARCH\)
9393
- path: cluster/images/etcd/Makefile
94-
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base:v\d+\.\d+\.\d+
94+
match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base:v\d+\.\d+\.\d+
9595
- path: cluster/images/etcd/Makefile
96-
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-arm:v\d+\.\d+\.\d+
96+
match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-arm:v\d+\.\d+\.\d+
9797
- path: cluster/images/etcd/Makefile
98-
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-arm64:v\d+\.\d+\.\d+
98+
match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-arm64:v\d+\.\d+\.\d+
9999
- path: cluster/images/etcd/Makefile
100-
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-ppc64le:v\d+\.\d+\.\d+
100+
match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-ppc64le:v\d+\.\d+\.\d+
101101
- path: cluster/images/etcd/Makefile
102-
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-s390x:v\d+\.\d+\.\d+
102+
match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-s390x:v\d+\.\d+\.\d+
103103
- path: cluster/images/etcd-empty-dir-cleanup/Dockerfile
104-
match: k8s.gcr.io\/debian-base:v\d+\.\d+\.\d+
104+
match: us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base:v\d+\.\d+\.\d+
105105

106106
- name: "k8s.gcr.io/debian-iptables"
107-
version: 12.0.1
107+
version: 12.1.0
108108
refPaths:
109109
- path: build/debian-iptables/Makefile
110110
match: TAG\?=

‎build/workspace.bzl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ def cri_tarballs():
7373

7474
# Use go get -u github.com/estesp/manifest-tool to find these values
7575
_DEBIAN_BASE_DIGEST = {
76-
"manifest": "sha256:ebda8587ec0f49eb88ee3a608ef018484908cbc5aa32556a0d78356088c185d4",
77-
"amd64": "sha256:d7be39e143d4e6677a28c81c0a84868b40800fc979dea1848bb19d526668a00c",
78-
"arm": "sha256:fc731da13b0bc9013b85a86b583fc92e50869b5bc8e7aa6ca730ec0240954c7d",
79-
"arm64": "sha256:12502c3eed050fa9b6d5fe353a44bfc5f437dc325c8912b1a48dcc180df36f1e",
80-
"ppc64le": "sha256:4277aa59b63c5a1369e6d84a295ecc4ffa08985dcf114de9f7b6de1af4fcbc86",
81-
"s390x": "sha256:78ef2a6b017539379c1654b4e52ba8519bfec821c62d0b3a1dbd15104b711e21",
76+
"manifest": "sha256:b118abac0bcf633b9db4086584ee718526fe394cf1bd18aee036e6cc497860f6",
77+
"amd64": "sha256:a67798e4746faaab3fde5b7407fa8bba75d8b1214d168dc7ad2b5364f6fc4319",
78+
"arm": "sha256:3ab4332e481610acbcba7a801711e29506b4bd4ecb38f72590253674d914c449",
79+
"arm64": "sha256:8d53ac4da977eb20d6219ee49b9cdff8c066831ecab0e4294d0a02179d26b1d7",
80+
"ppc64le": "sha256:a631023e795fe18df7faa8fe1264e757a6c74a232b9a2659657bf65756f3f4aa",
81+
"s390x": "sha256:dac908eaa61d2034aec252576a470a7e4ab184c361f89170526f707a0c3c6082",
8282
}
8383

8484
_DEBIAN_IPTABLES_DIGEST = {
@@ -102,9 +102,9 @@ def debian_image_dependencies():
102102
name = "debian-base-" + arch,
103103
architecture = arch,
104104
digest = _digest(_DEBIAN_BASE_DIGEST, arch),
105-
registry = "k8s.gcr.io",
105+
registry = "us.gcr.io/k8s-artifacts-prod/build-image",
106106
repository = "debian-base",
107-
tag = "v2.0.0", # ignored, but kept here for documentation
107+
tag = "v2.1.0", # ignored, but kept here for documentation
108108
)
109109

110110
container_pull(

‎cluster/images/etcd-empty-dir-cleanup/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM k8s.gcr.io/debian-base:v2.0.0
15+
FROM us.gcr.io/k8s-artifacts-prod/build-image/debian-base:v2.1.0
1616

1717
COPY etcdctl etcd-empty-dir-cleanup.sh /
1818
RUN chmod a+rx /etcdctl /etcd-empty-dir-cleanup.sh

‎cluster/images/etcd-empty-dir-cleanup/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ETCD_VERSION = 3.4.7
2020
REGISTRY = k8s.gcr.io
2121
# Images should be pushed to staging-k8s.gcr.io.
2222
PUSH_REGISTRY = staging-k8s.gcr.io
23-
TAG = 3.4.7.0
23+
TAG = 3.4.7.1
2424

2525
clean:
2626
rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz

‎cluster/images/etcd/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ LATEST_ETCD_VERSION?=3.4.7
3434
# REVISION provides a version number fo this image and all it's bundled
3535
# artifacts. It should start at zero for each LATEST_ETCD_VERSION and increment
3636
# for each revision of this image at that etcd version.
37-
REVISION?=0
37+
REVISION?=1
3838

3939
# IMAGE_TAG Uniquely identifies k8s.gcr.io/etcd docker image with a tag of the form "<etcd-version>-<revision>".
4040
IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION)
@@ -67,19 +67,19 @@ GOARM?=7
6767
TEMP_DIR:=$(shell mktemp -d)
6868

6969
ifeq ($(ARCH),amd64)
70-
BASEIMAGE?=k8s.gcr.io/debian-base:v2.0.0
70+
BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base:v2.1.0
7171
endif
7272
ifeq ($(ARCH),arm)
73-
BASEIMAGE?=k8s.gcr.io/debian-base-arm:v2.0.0
73+
BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-arm:v2.1.0
7474
endif
7575
ifeq ($(ARCH),arm64)
76-
BASEIMAGE?=k8s.gcr.io/debian-base-arm64:v2.0.0
76+
BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-arm64:v2.1.0
7777
endif
7878
ifeq ($(ARCH),ppc64le)
79-
BASEIMAGE?=k8s.gcr.io/debian-base-ppc64le:v2.0.0
79+
BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-ppc64le:v2.1.0
8080
endif
8181
ifeq ($(ARCH),s390x)
82-
BASEIMAGE?=k8s.gcr.io/debian-base-s390x:v2.0.0
82+
BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-s390x:v2.1.0
8383
endif
8484

8585
build:

0 commit comments

Comments
 (0)