Skip to content

Commit 15e64f7

Browse files
authored
Merge pull request #357 from yselkowitz/registry-k8s-io
Move from k8s.gcr.io to registry.k8s.io
2 parents 96bd620 + bfdb3e0 commit 15e64f7

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

deploy/kubernetes-1.21-test/hostpath/csi-hostpath-attacher.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
serviceAccountName: csi-attacher
3838
containers:
3939
- name: csi-attacher
40-
image: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0
40+
image: registry.k8s.io/sig-storage/csi-attacher:v3.4.0
4141
args:
4242
- --v=5
4343
- --csi-address=/csi/csi.sock

deploy/kubernetes-1.21-test/hostpath/csi-hostpath-plugin.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
serviceAccountName: csi-external-health-monitor-controller
3232
containers:
3333
- name: hostpath
34-
image: k8s.gcr.io/sig-storage/hostpathplugin:v1.7.3
34+
image: registry.k8s.io/sig-storage/hostpathplugin:v1.7.3
3535
args:
3636
- "--drivername=hostpath.csi.k8s.io"
3737
- "--v=5"
@@ -77,13 +77,13 @@ spec:
7777
volumeMounts:
7878
- mountPath: /csi
7979
name: socket-dir
80-
image: k8s.gcr.io/sig-storage/livenessprobe:v2.6.0
80+
image: registry.k8s.io/sig-storage/livenessprobe:v2.6.0
8181
args:
8282
- --csi-address=/csi/csi.sock
8383
- --health-port=9898
8484

8585
- name: csi-external-health-monitor-controller
86-
image: k8s.gcr.io/sig-storage/csi-external-health-monitor-controller:v0.4.0
86+
image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.4.0
8787
args:
8888
- "--v=5"
8989
- "--csi-address=$(ADDRESS)"
@@ -97,7 +97,7 @@ spec:
9797
mountPath: /csi
9898

9999
- name: node-driver-registrar
100-
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0
100+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0
101101
args:
102102
- --v=5
103103
- --csi-address=/csi/csi.sock

deploy/kubernetes-1.21-test/hostpath/csi-hostpath-provisioner.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
serviceAccountName: csi-provisioner
3838
containers:
3939
- name: csi-provisioner
40-
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0
40+
image: registry.k8s.io/sig-storage/csi-provisioner:v3.1.0
4141
args:
4242
- -v=5
4343
- --csi-address=/csi/csi.sock

deploy/kubernetes-1.21-test/hostpath/csi-hostpath-resizer.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
serviceAccountName: csi-resizer
3838
containers:
3939
- name: csi-resizer
40-
image: k8s.gcr.io/sig-storage/csi-resizer:v1.4.0
40+
image: registry.k8s.io/sig-storage/csi-resizer:v1.4.0
4141
args:
4242
- -v=5
4343
- -csi-address=/csi/csi.sock

deploy/kubernetes-1.21-test/hostpath/csi-hostpath-snapshotter.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
serviceAccountName: csi-snapshotter
3838
containers:
3939
- name: csi-snapshotter
40-
image: k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1
40+
image: registry.k8s.io/sig-storage/csi-snapshotter:v5.0.1
4141
args:
4242
- -v=5
4343
- --csi-address=/csi/csi.sock

deploy/kubernetes-1.21/hostpath/csi-hostpath-plugin.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ spec:
218218
serviceAccountName: csi-hostpathplugin-sa
219219
containers:
220220
- name: hostpath
221-
image: k8s.gcr.io/sig-storage/hostpathplugin:v1.7.3
221+
image: registry.k8s.io/sig-storage/hostpathplugin:v1.7.3
222222
args:
223223
- "--drivername=hostpath.csi.k8s.io"
224224
- "--v=5"
@@ -261,7 +261,7 @@ spec:
261261
name: dev-dir
262262

263263
- name: csi-external-health-monitor-controller
264-
image: k8s.gcr.io/sig-storage/csi-external-health-monitor-controller:v0.4.0
264+
image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.4.0
265265
args:
266266
- "--v=5"
267267
- "--csi-address=$(ADDRESS)"
@@ -275,7 +275,7 @@ spec:
275275
mountPath: /csi
276276

277277
- name: node-driver-registrar
278-
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0
278+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0
279279
args:
280280
- --v=5
281281
- --csi-address=/csi/csi.sock
@@ -303,13 +303,13 @@ spec:
303303
volumeMounts:
304304
- mountPath: /csi
305305
name: socket-dir
306-
image: k8s.gcr.io/sig-storage/livenessprobe:v2.6.0
306+
image: registry.k8s.io/sig-storage/livenessprobe:v2.6.0
307307
args:
308308
- --csi-address=/csi/csi.sock
309309
- --health-port=9898
310310

311311
- name: csi-attacher
312-
image: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0
312+
image: registry.k8s.io/sig-storage/csi-attacher:v3.4.0
313313
args:
314314
- --v=5
315315
- --csi-address=/csi/csi.sock
@@ -323,7 +323,7 @@ spec:
323323
name: socket-dir
324324

325325
- name: csi-provisioner
326-
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0
326+
image: registry.k8s.io/sig-storage/csi-provisioner:v3.1.0
327327
args:
328328
- -v=5
329329
- --csi-address=/csi/csi.sock
@@ -338,7 +338,7 @@ spec:
338338
name: socket-dir
339339

340340
- name: csi-resizer
341-
image: k8s.gcr.io/sig-storage/csi-resizer:v1.4.0
341+
image: registry.k8s.io/sig-storage/csi-resizer:v1.4.0
342342
args:
343343
- -v=5
344344
- -csi-address=/csi/csi.sock
@@ -352,7 +352,7 @@ spec:
352352
name: socket-dir
353353

354354
- name: csi-snapshotter
355-
image: k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1
355+
image: registry.k8s.io/sig-storage/csi-snapshotter:v5.0.1
356356
args:
357357
- -v=5
358358
- --csi-address=/csi/csi.sock

deploy/kubernetes-distributed/app-generic-ephemeral.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
spec:
1414
containers:
1515
- name: my-frontend
16-
image: k8s.gcr.io/pause
16+
image: registry.k8s.io/pause
1717
volumeMounts:
1818
- mountPath: "/data"
1919
name: my-csi-volume

deploy/kubernetes-distributed/hostpath/csi-hostpath-plugin.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
serviceAccountName: csi-provisioner
2626
containers:
2727
- name: csi-provisioner
28-
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0
28+
image: registry.k8s.io/sig-storage/csi-provisioner:v3.1.0
2929
args:
3030
- -v=5
3131
- --csi-address=/csi/csi.sock
@@ -60,7 +60,7 @@ spec:
6060
name: socket-dir
6161

6262
- name: node-driver-registrar
63-
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0
63+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0
6464
args:
6565
- --v=5
6666
- --csi-address=/csi/csi.sock
@@ -85,7 +85,7 @@ spec:
8585
name: csi-data-dir
8686

8787
- name: hostpath
88-
image: k8s.gcr.io/sig-storage/hostpathplugin:v1.7.3
88+
image: registry.k8s.io/sig-storage/hostpathplugin:v1.7.3
8989
args:
9090
- --drivername=hostpath.csi.k8s.io
9191
- --v=5
@@ -132,7 +132,7 @@ spec:
132132
volumeMounts:
133133
- mountPath: /csi
134134
name: socket-dir
135-
image: k8s.gcr.io/sig-storage/livenessprobe:v2.6.0
135+
image: registry.k8s.io/sig-storage/livenessprobe:v2.6.0
136136
args:
137137
- --csi-address=/csi/csi.sock
138138
- --health-port=9898

hack/bump-image-versions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ livenessprobe
3636
for image in $images; do
3737
latest=$(gcloud container images list-tags k8s.gcr.io/sig-storage/$image --format='get(tags)' --filter='tags~^v AND NOT tags~v2020 AND NOT tags~-rc' --sort-by=tags | tail -n 1)
3838

39-
sed -i -e "s;\(image: k8s.gcr.io/sig-storage/$image:\).*;\1$latest;" $(find deploy -type f)
39+
sed -i -e "s;\(image: registry.k8s.io/sig-storage/$image:\).*;\1$latest;" $(find deploy -type f)
4040
done

0 commit comments

Comments
 (0)