Skip to content

Commit 6704af4

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#93916 from justaugustus/base-images
build: Update to [email protected] and [email protected]
2 parents 1e8f7a9 + 2186323 commit 6704af4

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

‎build/common.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ 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.1.2
98-
local debian_iptables_version=v12.1.1
97+
local debian_base_version=v2.1.3
98+
local debian_iptables_version=v12.1.2
9999
local go_runner_version=v0.1.1
100100
### If you change any of these lists, please also update DOCKERIZED_BINARIES
101101
### in build/BUILD. And kube::golang::server_image_targets

‎build/dependencies.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ dependencies:
104104

105105
# Base images
106106
- name: "k8s.gcr.io/debian-base: dependents"
107-
version: 2.1.2
107+
version: 2.1.3
108108
refPaths:
109109
- path: build/common.sh
110110
match: debian_base_version=
@@ -122,7 +122,7 @@ dependencies:
122122
match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-s390x:v\d+\.\d+\.\d+
123123

124124
- name: "k8s.gcr.io/debian-iptables: dependents"
125-
version: 12.1.1
125+
version: 12.1.2
126126
refPaths:
127127
- path: build/common.sh
128128
match: debian_iptables_version=

‎build/workspace.bzl‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -74,29 +74,29 @@ def cri_tarballs():
7474
# Use skopeo to find these values: https://github.com/containers/skopeo
7575
#
7676
# Example
77-
# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/debian-base:v2.1.2
78-
# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-base:v2.1.2
77+
# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/debian-base:v2.1.3
78+
# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-base:v2.1.3
7979
_DEBIAN_BASE_DIGEST = {
80-
"manifest": "sha256:06190f821324ca89131437c51bdfe4b8515dc8ed26eba69c8f3698da227f5256",
81-
"amd64": "sha256:c9d003ca6daeaff7b1faf4356d010c67be310ff7b6c0af7b44f570571f15fc43",
82-
"arm": "sha256:52bda74a65e94166951ef5e33e6da847573e2a89dd6bc0bc3250a661adce1712",
83-
"arm64": "sha256:4e172c7b2a8ae261431e05509839c8b8c23a49ededed13af898c90896d466726",
84-
"ppc64le": "sha256:ad2190b49b3aebb1027b8fe685261c41ffbde170f49accc0816c296e59e9e927",
85-
"s390x": "sha256:813741dd7fc9585940f558ac142fd5121cf74d9c804ffa04e22a9df4da0f785d",
80+
"manifest": "sha256:37cfe133a6ff3fc3aa4aa5ab9fda127861902940b8e8078fff7191c7a81be8d8",
81+
"amd64": "sha256:dc06e242160076b72bd75135fb3dd0a9e91f386b2d812ec10cbf9e65864c755d",
82+
"arm": "sha256:9c52e9b31d679102586381fb4a03bba73fc05992adacce31df3db6d2f75f010e",
83+
"arm64": "sha256:9a3ae250d59f317c9cf1f7bf0b61c0d90e70012ee82996867655401968076ee4",
84+
"ppc64le": "sha256:d7c50e06d954bedb1f362ce42380f7a059423f8cbd9e7b426a7f2d73dfb4431a",
85+
"s390x": "sha256:7e6d43baf4972f7faa33f1179fb92ff858a3e0e23f78b96a5821d13199b9da91",
8686
}
8787

8888
# Use skopeo to find these values: https://github.com/containers/skopeo
8989
#
9090
# Example
91-
# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/debian-iptables:v12.1.1
92-
# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-iptables:v12.1.1
91+
# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/debian-iptables:v12.1.2
92+
# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-iptables:v12.1.2
9393
_DEBIAN_IPTABLES_DIGEST = {
94-
"manifest": "sha256:b92101e2910d9fe1415f35b6f7b696cf4a586f40f176ede019035bacc957a7a4",
95-
"amd64": "sha256:4b402df0d030b267f3dcdc6506d212d6b4c7fff6552b67f0c99be7ec1842f32a",
96-
"arm": "sha256:e976a5c88105db9a3ed462c2899aabbc5758f4f76e24098981010a226d344439",
97-
"arm64": "sha256:6da5b6aacb8c17615e1001aac0121517f541421036b20808a375f0dd79bf8564",
98-
"ppc64le": "sha256:63cf48fd9de1407302019ab524f7ed9ff7a05d9ecacc1a6ac77ee57fed21a078",
99-
"s390x": "sha256:be4039f250f26e1321d048e4dd6e81b78a80825c2dd490bacc0ac80ebb94bbc5",
94+
"manifest": "sha256:fff1fd5ab38fefde8c9eee5470ed6ea737f30e5ab86e1c0c0d429fa6add28a84",
95+
"amd64": "sha256:448c0e019689da3f4e238922824551d02578473f7b5d11604fffd528056caafa",
96+
"arm": "sha256:08e267a6297640eb0b218a783cabaef0a039cc4734b4a2d9cb54ee41cd82656a",
97+
"arm64": "sha256:a83cf1d501ad33f5aa93e2719baa59b054939b8a819c3997f915a6acfaa8e31a",
98+
"ppc64le": "sha256:c86649ac541c35431a4df8ba44e7c61923d9e34679fd17da7723db7b6ecc5245",
99+
"s390x": "sha256:53437fe32e13bb0bd2af08ddaaf2e908add8ab576574d881ba79544f34a774b2",
100100
}
101101

102102
# Use skopeo to find these values: https://github.com/containers/skopeo
@@ -137,7 +137,7 @@ def image_dependencies():
137137
registry = "k8s.gcr.io/build-image",
138138
repository = "debian-base",
139139
# Ensure the digests above are updated to match a new tag
140-
tag = "v2.1.2", # ignored, but kept here for documentation
140+
tag = "v2.1.3", # ignored, but kept here for documentation
141141
)
142142

143143
container_pull(
@@ -147,7 +147,7 @@ def image_dependencies():
147147
registry = "k8s.gcr.io/build-image",
148148
repository = "debian-iptables",
149149
# Ensure the digests above are updated to match a new tag
150-
tag = "v12.1.1", # ignored, but kept here for documentation
150+
tag = "v12.1.2", # ignored, but kept here for documentation
151151
)
152152

153153
def etcd_tarballs():

‎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.9
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?=2
37+
REVISION?=3
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/build-image/debian-base:v2.1.2
70+
BASEIMAGE?=k8s.gcr.io/build-image/debian-base:v2.1.3
7171
endif
7272
ifeq ($(ARCH),arm)
73-
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:v2.1.2
73+
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:v2.1.3
7474
endif
7575
ifeq ($(ARCH),arm64)
76-
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:v2.1.2
76+
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:v2.1.3
7777
endif
7878
ifeq ($(ARCH),ppc64le)
79-
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:v2.1.2
79+
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:v2.1.3
8080
endif
8181
ifeq ($(ARCH),s390x)
82-
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:v2.1.2
82+
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:v2.1.3
8383
endif
8484

8585
RUNNERIMAGE?=gcr.io/distroless/static:latest

‎test/utils/image/manifest.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ func initImageConfigs() map[int]Config {
210210
configs[CheckMetadataConcealment] = Config{e2eRegistry, "metadata-concealment", "1.2"}
211211
configs[CudaVectorAdd] = Config{e2eRegistry, "cuda-vector-add", "1.0"}
212212
configs[CudaVectorAdd2] = Config{e2eRegistry, "cuda-vector-add", "2.0"}
213-
configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "v12.1.1"}
213+
configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "v12.1.2"}
214214
configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"}
215215
configs[Etcd] = Config{gcRegistry, "etcd", "3.4.9"}
216216
configs[GlusterDynamicProvisioner] = Config{dockerGluster, "glusterdynamic-provisioner", "v1.0"}

0 commit comments

Comments
 (0)