Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use registry.k8s.io registry in CI jobs #3436

Merged
merged 1 commit into from
Apr 20, 2022
Merged

Use registry.k8s.io registry in CI jobs #3436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/e2e/data/cni/calico_eks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ spec:
nodeSelector:
beta.kubernetes.io/os: linux
containers:
- image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.7.1
- image: registry.k8s.io/cluster-proportional-autoscaler-amd64:1.7.1
name: autoscaler
command:
- /cluster-proportional-autoscaler
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/data/e2e_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ images:
loadBehavior: tryLoad
- name: quay.io/jetstack/cert-manager-controller:v1.5.3
loadBehavior: tryLoad
- name: k8s.gcr.io/cluster-api/cluster-api-controller:v1.1.2
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.1.2
loadBehavior: tryLoad
- name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v1.1.2
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.1.2
loadBehavior: tryLoad
- name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v1.1.2
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.1.2
loadBehavior: tryLoad

providers:
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/data/e2e_eks_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ images:
loadBehavior: tryLoad
- name: quay.io/jetstack/cert-manager-controller:v1.5.3
loadBehavior: tryLoad
- name: k8s.gcr.io/cluster-api/cluster-api-controller:v1.1.2
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.1.2
loadBehavior: tryLoad
- name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v1.1.2
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.1.2
loadBehavior: tryLoad
- name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v1.1.2
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.1.2
loadBehavior: tryLoad


Expand Down
18 changes: 9 additions & 9 deletions ...ta/infrastructure-aws/kustomize_sources/external-cloud-provider/aws-ebs-csi-external.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ spec:
key: access_key
name: aws-secret
optional: true
image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0
image: registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.2.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 5
Expand Down Expand Up @@ -415,7 +415,7 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
image: registry.k8s.io/sig-storage/csi-provisioner:v2.1.1
name: csi-provisioner
volumeMounts:
- mountPath: /var/lib/csi/sockets/pluginproxy/
Expand All @@ -427,7 +427,7 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
image: k8s.gcr.io/sig-storage/csi-attacher:v3.1.0
image: registry.k8s.io/sig-storage/csi-attacher:v3.1.0
name: csi-attacher
volumeMounts:
- mountPath: /var/lib/csi/sockets/pluginproxy/
Expand All @@ -438,7 +438,7 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
image: k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3
image: registry.k8s.io/sig-storage/csi-snapshotter:v3.0.3
name: csi-snapshotter
volumeMounts:
- mountPath: /var/lib/csi/sockets/pluginproxy/
Expand All @@ -449,15 +449,15 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
image: k8s.gcr.io/sig-storage/csi-resizer:v1.0.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.0.0
imagePullPolicy: Always
name: csi-resizer
volumeMounts:
- mountPath: /var/lib/csi/sockets/pluginproxy/
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.2.0
name: liveness-probe
volumeMounts:
- mountPath: /csi
Expand Down Expand Up @@ -544,7 +544,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0
image: registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.2.0
livenessProbe:
failureThreshold: 5
httpGet:
Expand Down Expand Up @@ -577,7 +577,7 @@ spec:
value: /csi/csi.sock
- name: DRIVER_REG_SOCK_PATH
value: /var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.1.0
name: node-driver-registrar
volumeMounts:
- mountPath: /csi
Expand All @@ -586,7 +586,7 @@ spec:
name: registration-dir
- args:
- --csi-address=/csi/csi.sock
image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.2.0
name: liveness-probe
volumeMounts:
- mountPath: /csi
Expand Down
18 changes: 9 additions & 9 deletions test/e2e/data/infrastructure-aws/kustomize_sources/external-csi/aws-ebs-csi-external.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ spec:
key: access_key
name: aws-secret
optional: true
image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0
image: registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.2.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 5
Expand Down Expand Up @@ -415,7 +415,7 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
image: registry.k8s.io/sig-storage/csi-provisioner:v2.1.1
name: csi-provisioner
volumeMounts:
- mountPath: /var/lib/csi/sockets/pluginproxy/
Expand All @@ -427,7 +427,7 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
image: k8s.gcr.io/sig-storage/csi-attacher:v3.1.0
image: registry.k8s.io/sig-storage/csi-attacher:v3.1.0
name: csi-attacher
volumeMounts:
- mountPath: /var/lib/csi/sockets/pluginproxy/
Expand All @@ -438,7 +438,7 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
image: k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3
image: registry.k8s.io/sig-storage/csi-snapshotter:v3.0.3
name: csi-snapshotter
volumeMounts:
- mountPath: /var/lib/csi/sockets/pluginproxy/
Expand All @@ -449,15 +449,15 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
image: k8s.gcr.io/sig-storage/csi-resizer:v1.0.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.0.0
imagePullPolicy: Always
name: csi-resizer
volumeMounts:
- mountPath: /var/lib/csi/sockets/pluginproxy/
name: socket-dir
- args:
- --csi-address=/csi/csi.sock
image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.2.0
name: liveness-probe
volumeMounts:
- mountPath: /csi
Expand Down Expand Up @@ -544,7 +544,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0
image: registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.2.0
livenessProbe:
failureThreshold: 5
httpGet:
Expand Down Expand Up @@ -577,7 +577,7 @@ spec:
value: /csi/csi.sock
- name: DRIVER_REG_SOCK_PATH
value: /var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.1.0
name: node-driver-registrar
volumeMounts:
- mountPath: /csi
Expand All @@ -586,7 +586,7 @@ spec:
name: registration-dir
- args:
- --csi-address=/csi/csi.sock
image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.2.0
name: liveness-probe
volumeMounts:
- mountPath: /csi
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/suites/unmanaged/unmanaged_functional_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ func createStatefulSetInfo(isIntreeCSI bool, prefix string) statefulSetInfo {
svcPort: int32(80),
svcPortName: fmt.Sprintf("%s%s", prefix, "-web"),
containerName: fmt.Sprintf("%s%s", prefix, "-nginx"),
containerImage: "k8s.gcr.io/nginx-slim:0.8",
containerImage: "registry.k8s.io/nginx-slim:0.8",
containerPort: int32(80),
podTerminationGracePeriod: int64(30),
volMountPath: "/usr/share/nginx/html",
Expand Down