Skip to content

Commit ad10662

Browse files
authored
chore: migrate from disallowed registries (#2455)
Signed-off-by: GitHub <[email protected]>
1 parent 1a9c936 commit ad10662

File tree

14 files changed

+18
-18
lines changed

14 files changed

+18
-18
lines changed

hack/manifests/busybox-ds.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
effect: NoSchedule
4242
containers:
4343
- name: busybox
44-
image: docker.io/busybox:latest
44+
image: mcr.microsoft.com/cbl-mariner/busybox:2.0
4545
command: ["sleep","3600"]
4646
imagePullPolicy: Always
4747
volumeMounts:

hack/manifests/busybox.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
effect: NoSchedule
4242
containers:
4343
- name: busybox
44-
image: docker.io/busybox:latest
44+
image: mcr.microsoft.com/cbl-mariner/busybox:2.0
4545
command: ["sleep","3600"]
4646
imagePullPolicy: Always
4747
volumeMounts:

hack/manifests/cni-installer.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
mountPath: /etc/cni/net.d
6060
containers:
6161
- name: pause
62-
image: registry.k8s.io/pause:2.0
62+
image: mcr.microsoft.com/oss/kubernetes/pause:3.6
6363
hostNetwork: true
6464
volumes:
6565
- name: cni-conflist

hack/manifests/scaler.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ spec:
2525
topologyKey: "kubernetes.io/hostname"
2626
containers:
2727
- name: anti-affinity
28-
image: registry.k8s.io/pause:2.0
28+
image: mcr.microsoft.com/oss/kubernetes/pause:3.6
2929
hostNetwork: true

npm/deploy/kustomize/overlays/controller/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
containerPort: 10091
3737
- name: http
3838
containerPort: 10092
39-
image: azure-npm:v1.4.1
39+
image: mcr.microsoft.com/containernetworking/azure-npm:v1.4.1
4040
command: ["azure-npm"]
4141
args: ["controlplane"]
4242
resources:

npm/deploy/kustomize/overlays/daemon/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
ports:
3535
- name: metrics
3636
containerPort: 10091
37-
image: azure-npm:v1.4.1
37+
image: mcr.microsoft.com/containernetworking/azure-npm:v1.4.1
3838
command: ["azure-npm"]
3939
args: ["daemon"]
4040
resources:

npm/deploy/manifests/controller/azure-npm.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ spec:
149149
fieldPath: spec.nodeName
150150
- name: NPM_CONFIG
151151
value: /etc/azure-npm/azure-npm.json
152-
image: azure-npm:v1.4.1
152+
image: mcr.microsoft.com/containernetworking/azure-npm:v1.4.1
153153
name: azure-npm
154154
resources:
155155
limits:

npm/deploy/manifests/daemon/azure-npm.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ spec:
135135
valueFrom:
136136
fieldRef:
137137
fieldPath: spec.nodeName
138-
image: azure-npm:v1.4.1
138+
image: mcr.microsoft.com/containernetworking/azure-npm:v1.4.1
139139
name: azure-npm
140140
ports:
141141
- name: metrics

test/integration/manifests/datapath/linux-deployment-ipv6.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
fieldPath: status.podIP
4242
- name: HOSTS_TO_RESOLVE
4343
value: "2001:4860:4860::8888 www.bing.com"
44-
image: "docker.io/bloomberg/goldpinger:v3.7.0"
44+
image: "mcr.microsoft.com/aks/e2e/bloomberg-goldpinger:v3.7.0"
4545
tolerations:
4646
- key: node-role.kubernetes.io/master
4747
effect: NoSchedule
@@ -85,4 +85,4 @@ spec:
8585
initialDelaySeconds: 5
8686
periodSeconds: 5
8787
nodeSelector:
88-
kubernetes.io/os: linux
88+
kubernetes.io/os: linux

test/integration/manifests/datapath/linux-deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
fieldPath: status.podIP
4040
- name: HOSTS_TO_RESOLVE
4141
value: "1.1.1.1 8.8.8.8 www.bing.com"
42-
image: "docker.io/bloomberg/goldpinger:v3.7.0"
42+
image: "mcr.microsoft.com/aks/e2e/bloomberg-goldpinger:v3.7.0"
4343
tolerations:
4444
- key: node-role.kubernetes.io/master
4545
effect: NoSchedule
@@ -83,4 +83,4 @@ spec:
8383
initialDelaySeconds: 5
8484
periodSeconds: 5
8585
nodeSelector:
86-
kubernetes.io/os: linux
86+
kubernetes.io/os: linux

test/integration/manifests/goldpinger/daemonset-ipv6.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spec:
6161
fieldPath: status.podIP
6262
- name: HOSTS_TO_RESOLVE
6363
value: "2001:4860:4860::8888 www.bing.com"
64-
image: "docker.io/bloomberg/goldpinger:v3.7.0"
64+
image: "mcr.microsoft.com/aks/e2e/bloomberg-goldpinger:v3.7.0"
6565
securityContext:
6666
allowPrivilegeEscalation: false
6767
readOnlyRootFilesystem: true
@@ -79,4 +79,4 @@ spec:
7979
path: /healthz
8080
port: 8080
8181
initialDelaySeconds: 5
82-
periodSeconds: 5
82+
periodSeconds: 5

test/integration/manifests/goldpinger/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
fieldPath: status.podIP
6060
# - name: HOSTS_TO_RESOLVE
6161
# value: "1.1.1.1 8.8.8.8 www.bing.com"
62-
image: "docker.io/bloomberg/goldpinger:v3.7.0"
62+
image: "mcr.microsoft.com/aks/e2e/bloomberg-goldpinger:v3.7.0"
6363
securityContext:
6464
allowPrivilegeEscalation: false
6565
readOnlyRootFilesystem: true
@@ -77,4 +77,4 @@ spec:
7777
path: /healthz
7878
port: 8080
7979
initialDelaySeconds: 5
80-
periodSeconds: 5
80+
periodSeconds: 5

test/integration/manifests/goldpinger/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ spec:
5757
fieldPath: status.podIP
5858
- name: HOSTS_TO_RESOLVE
5959
value: "1.1.1.1 8.8.8.8 www.bing.com"
60-
image: "docker.io/bloomberg/goldpinger:v3.7.0"
60+
image: "mcr.microsoft.com/aks/e2e/bloomberg-goldpinger:v3.7.0"
6161
securityContext:
6262
allowPrivilegeEscalation: false
6363
readOnlyRootFilesystem: true

test/kubemark/aks-e/hollow-node.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
spec:
1717
initContainers:
1818
- name: init-inotify-limit
19-
image: busybox:1.32
19+
image: mcr.microsoft.com/cbl-mariner/busybox:2.0
2020
command: ['sysctl', '-w', 'fs.inotify.max_user_instances=1000']
2121
securityContext:
2222
privileged: true

0 commit comments

Comments
 (0)