Skip to content

Commit ba6c182

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2905 from rjsadow/master
Updated registry references to registry.k8s.io
2 parents 018442e + b944a86 commit ba6c182

File tree

8 files changed

+57
-56
lines changed

8 files changed

+57
-56
lines changed

‎.github/workflows/scorecards-analysis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
github.com:443
3838
index.docker.io:443
3939
k8s.gcr.io:443
40+
registry.k8s.io:443
4041
sigstore-tuf-root.storage.googleapis.com:443
4142
4243
- name: "Checkout code"

‎dependencies.yaml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -151,27 +151,27 @@ dependencies:
151151
match: REVISION:\ '\d+'
152152

153153
# go-runner
154-
- name: "k8s.gcr.io/build-image/go-runner (go1.20-bullseye)"
154+
- name: "registry.k8s.io/build-image/go-runner (go1.20-bullseye)"
155155
version: v2.3.1-go1.20.1-bullseye.0
156156
refPaths:
157157
- path: images/build/go-runner/variants.yaml
158158
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
159159

160-
- name: "k8s.gcr.io/build-image/go-runner: image revision (go1.20-bullseye)"
160+
- name: "registry.k8s.io/build-image/go-runner: image revision (go1.20-bullseye)"
161161
version: 0
162162
refPaths:
163163
- path: images/build/go-runner/Makefile
164164
match: REVISION \?= \d+
165165
- path: images/build/go-runner/variants.yaml
166166
match: REVISION:\ '\d+'
167167

168-
- name: "k8s.gcr.io/build-image/go-runner (go1.19-bullseye)"
168+
- name: "registry.k8s.io/build-image/go-runner (go1.19-bullseye)"
169169
version: v2.3.1-go1.19.6-bullseye.0
170170
refPaths:
171171
- path: images/build/go-runner/variants.yaml
172172
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
173173

174-
- name: "k8s.gcr.io/build-image/go-runner: image revision (go1.19-bullseye)"
174+
- name: "registry.k8s.io/build-image/go-runner: image revision (go1.19-bullseye)"
175175
version: 0
176176
refPaths:
177177
- path: images/build/go-runner/Makefile
@@ -180,131 +180,131 @@ dependencies:
180180
match: REVISION:\ '\d+'
181181

182182
# kube-cross
183-
- name: "k8s.gcr.io/build-image/kube-cross (v1.27-go1.20)"
183+
- name: "registry.k8s.io/build-image/kube-cross (v1.27-go1.20)"
184184
version: v1.27.0-go1.20.1-bullseye.0
185185
refPaths:
186186
- path: images/build/cross/variants.yaml
187187
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
188188

189-
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.27-go1.20)"
189+
- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.27-go1.20)"
190190
version: go1.20-bullseye
191191
refPaths:
192192
- path: images/build/cross/variants.yaml
193193
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
194194

195-
- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.27-go1.20)"
195+
- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.27-go1.20)"
196196
version: 0
197197
refPaths:
198198
- path: images/build/cross/Makefile
199199
match: REVISION \?= \d+
200200
- path: images/build/cross/variants.yaml
201201
match: REVISION:\ '\d+'
202202

203-
- name: "k8s.gcr.io/build-image/kube-cross (v1.26-go1.19)"
203+
- name: "registry.k8s.io/build-image/kube-cross (v1.26-go1.19)"
204204
version: v1.26.0-go1.19.6-bullseye.0
205205
refPaths:
206206
- path: images/build/cross/variants.yaml
207207
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
208208

209-
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.26-go1.19)"
209+
- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.26-go1.19)"
210210
version: go1.19-bullseye
211211
refPaths:
212212
- path: images/build/cross/variants.yaml
213213
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
214214

215-
- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.26-go1.19)"
215+
- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.26-go1.19)"
216216
version: 0
217217
refPaths:
218218
- path: images/build/cross/Makefile
219219
match: REVISION \?= \d+
220220
- path: images/build/cross/variants.yaml
221221
match: REVISION:\ '\d+'
222222

223-
- name: "k8s.gcr.io/build-image/kube-cross (v1.25-go1.19)"
223+
- name: "registry.k8s.io/build-image/kube-cross (v1.25-go1.19)"
224224
version: v1.25.0-go1.19.6-bullseye.0
225225
refPaths:
226226
- path: images/build/cross/variants.yaml
227227
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
228228

229-
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.25-go1.19)"
229+
- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.25-go1.19)"
230230
version: go1.19-bullseye
231231
refPaths:
232232
- path: images/build/cross/variants.yaml
233233
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
234234

235-
- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.25-go1.19)"
235+
- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.25-go1.19)"
236236
version: 0
237237
refPaths:
238238
- path: images/build/cross/Makefile
239239
match: REVISION \?= \d+
240240
- path: images/build/cross/variants.yaml
241241
match: REVISION:\ '\d+'
242242

243-
- name: "k8s.gcr.io/build-image/kube-cross (v1.24-go1.19)"
243+
- name: "registry.k8s.io/build-image/kube-cross (v1.24-go1.19)"
244244
version: v1.24.0-go1.19.6-bullseye.0
245245
refPaths:
246246
- path: images/build/cross/variants.yaml
247247
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
248248

249-
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.24-go1.19)"
249+
- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.24-go1.19)"
250250
version: go1.19-bullseye
251251
refPaths:
252252
- path: images/build/cross/variants.yaml
253253
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
254254

255-
- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.24-go1.19)"
255+
- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.24-go1.19)"
256256
version: 0
257257
refPaths:
258258
- path: images/build/cross/Makefile
259259
match: REVISION \?= \d+
260260
- path: images/build/cross/variants.yaml
261261
match: REVISION:\ '\d+'
262262

263-
- name: "k8s.gcr.io/build-image/kube-cross (v1.23-go1.19)"
263+
- name: "registry.k8s.io/build-image/kube-cross (v1.23-go1.19)"
264264
version: v1.23.0-go1.19.6-bullseye.0
265265
refPaths:
266266
- path: images/build/cross/variants.yaml
267267
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
268268

269-
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.23-go1.19)"
269+
- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.23-go1.19)"
270270
version: go1.19-bullseye
271271
refPaths:
272272
- path: images/build/cross/variants.yaml
273273
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
274274

275-
- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.23-go1.19)"
275+
- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.23-go1.19)"
276276
version: 0
277277
refPaths:
278278
- path: images/build/cross/Makefile
279279
match: REVISION \?= \d+
280280
- path: images/build/cross/variants.yaml
281281
match: REVISION:\ '\d+'
282282

283-
- name: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.27-cross1.20)"
283+
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.27-cross1.20)"
284284
version: v1.27.0-go1.20-bullseye.0
285285
refPaths:
286286
- path: images/k8s-cloud-builder/variants.yaml
287287
match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
288288

289-
- name: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.26-cross1.20)"
289+
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.26-cross1.20)"
290290
version: v1.26.0-go1.19.5-bullseye.0
291291
refPaths:
292292
- path: images/k8s-cloud-builder/variants.yaml
293293
match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
294294

295-
- name: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.25-cross1.20)"
295+
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.25-cross1.20)"
296296
version: v1.25.0-go1.19.5-bullseye.0
297297
refPaths:
298298
- path: images/k8s-cloud-builder/variants.yaml
299299
match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
300300

301-
- name: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.24-cross1.20)"
301+
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.24-cross1.20)"
302302
version: v1.24.0-go1.19.5-bullseye.0
303303
refPaths:
304304
- path: images/k8s-cloud-builder/variants.yaml
305305
match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
306306

307-
- name: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.23-cross1.20)"
307+
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.23-cross1.20)"
308308
version: v1.23.0-go1.19.5-bullseye.0
309309
refPaths:
310310
- path: images/k8s-cloud-builder/variants.yaml
@@ -330,7 +330,7 @@ dependencies:
330330
- path: images/releng/ci/variants.yaml
331331
match: REVISION:\ '\d+'
332332

333-
- name: "k8s.gcr.io/build-image/kube-cross: config variant (next candidate)"
333+
- name: "registry.k8s.io/build-image/kube-cross: config variant (next candidate)"
334334
version: go1.20-bullseye
335335
refPaths:
336336
- path: images/build/cross/variants.yaml
@@ -438,15 +438,15 @@ dependencies:
438438
- path: images/releng/k8s-ci-builder/variants.yaml
439439
match: "OS_CODENAME: 'bullseye'"
440440

441-
- name: "k8s.gcr.io/build-image/debian-base"
441+
- name: "registry.k8s.io/build-image/debian-base"
442442
version: bullseye-v1.4.2
443443
refPaths:
444444
- path: images/build/debian-base/Makefile
445445
match: IMAGE_VERSION\ \?=\ bullseye-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
446446
- path: images/build/debian-base/variants.yaml
447447
match: "IMAGE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
448448

449-
- name: "k8s.gcr.io/build-image/debian-base: dependents"
449+
- name: "registry.k8s.io/build-image/debian-base: dependents"
450450
version: bullseye-v1.4.2
451451
refPaths:
452452
- path: images/build/debian-iptables/Makefile
@@ -458,27 +458,27 @@ dependencies:
458458
- path: images/build/setcap/variants.yaml
459459
match: "DEBIAN_BASE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
460460

461-
- name: "k8s.gcr.io/build-image/debian-iptables"
461+
- name: "registry.k8s.io/build-image/debian-iptables"
462462
version: bullseye-v1.5.1
463463
refPaths:
464464
- path: images/build/debian-iptables/Makefile
465465
match: IMAGE_VERSION\ \?=\ bullseye-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
466466
- path: images/build/debian-iptables/variants.yaml
467467
match: "IMAGE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
468468

469-
- name: "k8s.gcr.io/build-image/distroless-iptables"
469+
- name: "registry.k8s.io/build-image/distroless-iptables"
470470
version: v0.2.0
471471
refPaths:
472472
- path: images/build/distroless-iptables/Makefile
473473
match: IMAGE_VERSION\ \?=\ v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
474474

475-
- name: "k8s.gcr.io/build-image/go-runner: dependents"
475+
- name: "registry.k8s.io/build-image/go-runner: dependents"
476476
version: v2.3.1-go1.19.5-bullseye.0
477477
refPaths:
478478
- path: images/build/debian-iptables/Makefile
479479
match: GORUNNER_VERSION \?= v\d+\.\d+\.\d+-go\d+.\d+(alpha|beta|rc)?\.?(\d+)?-bullseye\.\d+
480480

481-
- name: "k8s.gcr.io/build-image/setcap"
481+
- name: "registry.k8s.io/build-image/setcap"
482482
version: bullseye-v1.4.1
483483
refPaths:
484484
- path: images/build/setcap/Makefile
@@ -487,27 +487,27 @@ dependencies:
487487
match: "IMAGE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
488488

489489
# Base images (next candidate)
490-
- name: "k8s.gcr.io/build-image/debian-base (next candidate)"
490+
- name: "registry.k8s.io/build-image/debian-base (next candidate)"
491491
version: bullseye-v1.4.2
492492
refPaths:
493493
- path: images/build/debian-base/variants.yaml
494494
match: "IMAGE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
495495

496-
- name: "k8s.gcr.io/build-image/debian-base: dependents (next candidate)"
496+
- name: "registry.k8s.io/build-image/debian-base: dependents (next candidate)"
497497
version: bullseye-v1.4.2
498498
refPaths:
499499
- path: images/build/debian-iptables/variants.yaml
500500
match: "DEBIAN_BASE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
501501
- path: images/build/setcap/variants.yaml
502502
match: "DEBIAN_BASE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
503503

504-
- name: "k8s.gcr.io/build-image/debian-iptables (next candidate)"
504+
- name: "registry.k8s.io/build-image/debian-iptables (next candidate)"
505505
version: bullseye-v1.5.1
506506
refPaths:
507507
- path: images/build/debian-iptables/variants.yaml
508508
match: "IMAGE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
509509

510-
- name: "k8s.gcr.io/build-image/setcap (next candidate)"
510+
- name: "registry.k8s.io/build-image/setcap (next candidate)"
511511
version: bullseye-v1.4.1
512512
refPaths:
513513
- path: images/build/setcap/variants.yaml

‎images/build/debian-iptables/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ GORUNNER_VERSION ?= v2.3.1-go1.19.5-bullseye.0
2626
ARCH?=amd64
2727
ALL_ARCH = amd64 arm arm64 ppc64le s390x
2828

29-
BASE_REGISTRY?=k8s.gcr.io/build-image
29+
BASE_REGISTRY?=registry.k8s.io/build-image
3030

3131
# Build args
3232
BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):$(DEBIAN_BASE_VERSION)

‎images/build/debian-iptables/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### debian-iptables
22

3-
Serves as the base image for `k8s.gcr.io/kube-proxy-${ARCH}` and multiarch (not `amd64`) `k8s.gcr.io/flannel-${ARCH}` images.
3+
Serves as the base image for `registry.k8s.io/kube-proxy-${ARCH}` and multiarch (not `amd64`) `registry.k8s.io/flannel-${ARCH}` images.
44

55
This image is compiled for multiple architectures.
66

@@ -11,11 +11,11 @@ If you're editing the Dockerfile or some other thing, please bump the `TAG` in t
1111
```console
1212
Build and push images for all the architectures
1313
$ make all-push
14-
# ---> staging-k8s.gcr.io/debian-iptables-amd64:TAG
15-
# ---> staging-k8s.gcr.io/debian-iptables-arm:TAG
16-
# ---> staging-k8s.gcr.io/debian-iptables-arm64:TAG
17-
# ---> staging-k8s.gcr.io/debian-iptables-ppc64le:TAG
18-
# ---> staging-k8s.gcr.io/debian-iptables-s390x:TAG
14+
# ---> gcr.io/k8s-staging-build-image/debian-iptables-amd64:TAG
15+
# ---> gcr.io/k8s-staging-build-image/debian-iptables-arm:TAG
16+
# ---> gcr.io/k8s-staging-build-image/debian-iptables-arm64:TAG
17+
# ---> gcr.io/k8s-staging-build-image/debian-iptables-ppc64le:TAG
18+
# ---> gcr.io/k8s-staging-build-image/debian-iptables-s390x:TAG
1919
```
2020

2121
If you don't want to push the images, run `make build ARCH={target_arch}` or `make all-build` instead

‎images/build/distroless-iptables/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### distroless-iptables
22

3-
Serves as the base image for `k8s.gcr.io/kube-proxy-${ARCH}`.
3+
Serves as the base image for `registry.k8s.io/kube-proxy-${ARCH}`.
44

55
This image is compiled for multiple architectures.
66

@@ -11,11 +11,11 @@ If you're editing the Dockerfile or some other thing, please bump the `TAG` in t
1111
```console
1212
Build and push images for all the architectures
1313
$ make all-push
14-
# ---> staging-k8s.gcr.io/distroless-iptables-amd64:TAG
15-
# ---> staging-k8s.gcr.io/distroless-iptables-arm:TAG
16-
# ---> staging-k8s.gcr.io/distroless-iptables-arm64:TAG
17-
# ---> staging-k8s.gcr.io/distroless-iptables-ppc64le:TAG
18-
# ---> staging-k8s.gcr.io/distroless-iptables-s390x:TAG
14+
# ---> gcr.io/k8s-staging-build-image/distroless-iptables-amd64:TAG
15+
# ---> gcr.io/k8s-staging-build-image/distroless-iptables-arm:TAG
16+
# ---> gcr.io/k8s-staging-build-image/distroless-iptables-arm64:TAG
17+
# ---> gcr.io/k8s-staging-build-image/distroless-iptables-ppc64le:TAG
18+
# ---> gcr.io/k8s-staging-build-image/distroless-iptables-s390x:TAG
1919
```
2020

2121
If you don't want to push the images, run `make build ARCH={target_arch}` or `make all-build` instead.

‎images/build/setcap/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ DEBIAN_BASE_VERSION ?= bullseye-v1.4.2
2525
ARCH?=amd64
2626
ALL_ARCH = amd64 arm arm64 ppc64le s390x
2727

28-
BASE_REGISTRY?=k8s.gcr.io/build-image
28+
BASE_REGISTRY?=registry.k8s.io/build-image
2929
BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):$(DEBIAN_BASE_VERSION)
3030

3131
# Build args

‎images/build/setcap/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ Build and push images for all the architectures:
1515

1616
```console
1717
$ make all-push
18-
# ---> staging-k8s.gcr.io/setcap-amd64:TAG
19-
# ---> staging-k8s.gcr.io/setcap-arm:TAG
20-
# ---> staging-k8s.gcr.io/setcap-arm64:TAG
21-
# ---> staging-k8s.gcr.io/setcap-ppc64le:TAG
22-
# ---> staging-k8s.gcr.io/setcap-s390x:TAG
18+
# ---> gcr.io/k8s-staging-build-image/setcap-amd64:TAG
19+
# ---> gcr.io/k8s-staging-build-image/setcap-arm:TAG
20+
# ---> gcr.io/k8s-staging-build-image/setcap-arm64:TAG
21+
# ---> gcr.io/k8s-staging-build-image/setcap-ppc64le:TAG
22+
# ---> gcr.io/k8s-staging-build-image/setcap-s390x:TAG
2323
```
2424

2525
If you don't want to push the images, run `make sub-build-{target_arch}` or `make all-build` instead

‎images/k8s-cloud-builder/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
ARG KUBE_CROSS_VERSION
16-
FROM k8s.gcr.io/build-image/kube-cross:${KUBE_CROSS_VERSION}
16+
FROM registry.k8s.io/build-image/kube-cross:${KUBE_CROSS_VERSION}
1717

1818
##------------------------------------------------------------
1919
# global ARGs & ENVs
@@ -50,7 +50,7 @@ RUN apt-get -q update \
5050
# We want to get rid of python2, we want only python3
5151
#
5252
# Right now, the image chain looks like this:
53-
# k8s-cloud-builder <- k8s.gcr.io/kube-cross:v1.13.4-1 <- golang:1.13.4 <- buildpack-deps:buster-scm <- debian:buster
53+
# k8s-cloud-builder <- registry.k8s.io/kube-cross:v1.13.4-1 <- golang:1.13.4 <- buildpack-deps:buster-scm <- debian:buster
5454
# python2 comes in with buildpack-deps:buster-scm, because that image installs
5555
# mercurial which in turn has a hard dependency on python2
5656
RUN apt-get -qqy purge ".*python2.*" \

0 commit comments

Comments
 (0)