Skip to content

Commit eb74db4

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3436 from sedefsavas/registry-change
Use registry.k8s.io registry in CI jobs
2 parents 2082599 + 5ffa42c commit eb74db4

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

‎test/e2e/data/cni/calico_eks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ spec:
686686
nodeSelector:
687687
beta.kubernetes.io/os: linux
688688
containers:
689-
- image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.7.1
689+
- image: registry.k8s.io/cluster-proportional-autoscaler-amd64:1.7.1
690690
name: autoscaler
691691
command:
692692
- /cluster-proportional-autoscaler

‎test/e2e/data/e2e_conf.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ images:
2727
loadBehavior: tryLoad
2828
- name: quay.io/jetstack/cert-manager-controller:v1.5.3
2929
loadBehavior: tryLoad
30-
- name: k8s.gcr.io/cluster-api/cluster-api-controller:v1.1.2
30+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.1.2
3131
loadBehavior: tryLoad
32-
- name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v1.1.2
32+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.1.2
3333
loadBehavior: tryLoad
34-
- name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v1.1.2
34+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.1.2
3535
loadBehavior: tryLoad
3636

3737
providers:

‎test/e2e/data/e2e_eks_conf.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ images:
2323
loadBehavior: tryLoad
2424
- name: quay.io/jetstack/cert-manager-controller:v1.5.3
2525
loadBehavior: tryLoad
26-
- name: k8s.gcr.io/cluster-api/cluster-api-controller:v1.1.2
26+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.1.2
2727
loadBehavior: tryLoad
28-
- name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v1.1.2
28+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.1.2
2929
loadBehavior: tryLoad
30-
- name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v1.1.2
30+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.1.2
3131
loadBehavior: tryLoad
3232

3333

‎test/e2e/data/infrastructure-aws/kustomize_sources/external-cloud-provider/aws-ebs-csi-external.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ spec:
379379
key: access_key
380380
name: aws-secret
381381
optional: true
382-
image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0
382+
image: registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.2.0
383383
imagePullPolicy: IfNotPresent
384384
livenessProbe:
385385
failureThreshold: 5
@@ -415,7 +415,7 @@ spec:
415415
env:
416416
- name: ADDRESS
417417
value: /var/lib/csi/sockets/pluginproxy/csi.sock
418-
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
418+
image: registry.k8s.io/sig-storage/csi-provisioner:v2.1.1
419419
name: csi-provisioner
420420
volumeMounts:
421421
- mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -427,7 +427,7 @@ spec:
427427
env:
428428
- name: ADDRESS
429429
value: /var/lib/csi/sockets/pluginproxy/csi.sock
430-
image: k8s.gcr.io/sig-storage/csi-attacher:v3.1.0
430+
image: registry.k8s.io/sig-storage/csi-attacher:v3.1.0
431431
name: csi-attacher
432432
volumeMounts:
433433
- mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -438,7 +438,7 @@ spec:
438438
env:
439439
- name: ADDRESS
440440
value: /var/lib/csi/sockets/pluginproxy/csi.sock
441-
image: k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3
441+
image: registry.k8s.io/sig-storage/csi-snapshotter:v3.0.3
442442
name: csi-snapshotter
443443
volumeMounts:
444444
- mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -449,15 +449,15 @@ spec:
449449
env:
450450
- name: ADDRESS
451451
value: /var/lib/csi/sockets/pluginproxy/csi.sock
452-
image: k8s.gcr.io/sig-storage/csi-resizer:v1.0.0
452+
image: registry.k8s.io/sig-storage/csi-resizer:v1.0.0
453453
imagePullPolicy: Always
454454
name: csi-resizer
455455
volumeMounts:
456456
- mountPath: /var/lib/csi/sockets/pluginproxy/
457457
name: socket-dir
458458
- args:
459459
- --csi-address=/csi/csi.sock
460-
image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0
460+
image: registry.k8s.io/sig-storage/livenessprobe:v2.2.0
461461
name: liveness-probe
462462
volumeMounts:
463463
- mountPath: /csi
@@ -544,7 +544,7 @@ spec:
544544
valueFrom:
545545
fieldRef:
546546
fieldPath: spec.nodeName
547-
image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0
547+
image: registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.2.0
548548
livenessProbe:
549549
failureThreshold: 5
550550
httpGet:
@@ -577,7 +577,7 @@ spec:
577577
value: /csi/csi.sock
578578
- name: DRIVER_REG_SOCK_PATH
579579
value: /var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock
580-
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0
580+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.1.0
581581
name: node-driver-registrar
582582
volumeMounts:
583583
- mountPath: /csi
@@ -586,7 +586,7 @@ spec:
586586
name: registration-dir
587587
- args:
588588
- --csi-address=/csi/csi.sock
589-
image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0
589+
image: registry.k8s.io/sig-storage/livenessprobe:v2.2.0
590590
name: liveness-probe
591591
volumeMounts:
592592
- mountPath: /csi

‎test/e2e/data/infrastructure-aws/kustomize_sources/external-csi/aws-ebs-csi-external.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ spec:
379379
key: access_key
380380
name: aws-secret
381381
optional: true
382-
image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0
382+
image: registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.2.0
383383
imagePullPolicy: IfNotPresent
384384
livenessProbe:
385385
failureThreshold: 5
@@ -415,7 +415,7 @@ spec:
415415
env:
416416
- name: ADDRESS
417417
value: /var/lib/csi/sockets/pluginproxy/csi.sock
418-
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
418+
image: registry.k8s.io/sig-storage/csi-provisioner:v2.1.1
419419
name: csi-provisioner
420420
volumeMounts:
421421
- mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -427,7 +427,7 @@ spec:
427427
env:
428428
- name: ADDRESS
429429
value: /var/lib/csi/sockets/pluginproxy/csi.sock
430-
image: k8s.gcr.io/sig-storage/csi-attacher:v3.1.0
430+
image: registry.k8s.io/sig-storage/csi-attacher:v3.1.0
431431
name: csi-attacher
432432
volumeMounts:
433433
- mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -438,7 +438,7 @@ spec:
438438
env:
439439
- name: ADDRESS
440440
value: /var/lib/csi/sockets/pluginproxy/csi.sock
441-
image: k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3
441+
image: registry.k8s.io/sig-storage/csi-snapshotter:v3.0.3
442442
name: csi-snapshotter
443443
volumeMounts:
444444
- mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -449,15 +449,15 @@ spec:
449449
env:
450450
- name: ADDRESS
451451
value: /var/lib/csi/sockets/pluginproxy/csi.sock
452-
image: k8s.gcr.io/sig-storage/csi-resizer:v1.0.0
452+
image: registry.k8s.io/sig-storage/csi-resizer:v1.0.0
453453
imagePullPolicy: Always
454454
name: csi-resizer
455455
volumeMounts:
456456
- mountPath: /var/lib/csi/sockets/pluginproxy/
457457
name: socket-dir
458458
- args:
459459
- --csi-address=/csi/csi.sock
460-
image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0
460+
image: registry.k8s.io/sig-storage/livenessprobe:v2.2.0
461461
name: liveness-probe
462462
volumeMounts:
463463
- mountPath: /csi
@@ -544,7 +544,7 @@ spec:
544544
valueFrom:
545545
fieldRef:
546546
fieldPath: spec.nodeName
547-
image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0
547+
image: registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.2.0
548548
livenessProbe:
549549
failureThreshold: 5
550550
httpGet:
@@ -577,7 +577,7 @@ spec:
577577
value: /csi/csi.sock
578578
- name: DRIVER_REG_SOCK_PATH
579579
value: /var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock
580-
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0
580+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.1.0
581581
name: node-driver-registrar
582582
volumeMounts:
583583
- mountPath: /csi
@@ -586,7 +586,7 @@ spec:
586586
name: registration-dir
587587
- args:
588588
- --csi-address=/csi/csi.sock
589-
image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0
589+
image: registry.k8s.io/sig-storage/livenessprobe:v2.2.0
590590
name: liveness-probe
591591
volumeMounts:
592592
- mountPath: /csi

‎test/e2e/suites/unmanaged/unmanaged_functional_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ func createStatefulSetInfo(isIntreeCSI bool, prefix string) statefulSetInfo {
980980
svcPort: int32(80),
981981
svcPortName: fmt.Sprintf("%s%s", prefix, "-web"),
982982
containerName: fmt.Sprintf("%s%s", prefix, "-nginx"),
983-
containerImage: "k8s.gcr.io/nginx-slim:0.8",
983+
containerImage: "registry.k8s.io/nginx-slim:0.8",
984984
containerPort: int32(80),
985985
podTerminationGracePeriod: int64(30),
986986
volMountPath: "/usr/share/nginx/html",

0 commit comments

Comments
 (0)