chore: migrate from disallowed registries (#2455)

Signed-off-by: GitHub <noreply@github.com>
Azure · Dec 20, 2023 · 7897927 · 7897927
1 parent 96b1519
commit 7897927
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 18 deletions.
diff --git a/hack/manifests/busybox-ds.yaml b/hack/manifests/busybox-ds.yaml
@@ -41,7 +41,7 @@ spec:
           effect: NoSchedule
       containers:
         - name: busybox
-          image: docker.io/busybox:latest
+          image: mcr.microsoft.com/cbl-mariner/busybox:2.0
           command: ["sleep","3600"]
           imagePullPolicy: Always
           volumeMounts:

diff --git a/hack/manifests/busybox.yaml b/hack/manifests/busybox.yaml
@@ -41,7 +41,7 @@ spec:
           effect: NoSchedule
       containers:
         - name: busybox
-          image: docker.io/busybox:latest
+          image: mcr.microsoft.com/cbl-mariner/busybox:2.0
           command: ["sleep","3600"]
           imagePullPolicy: Always
           volumeMounts:

diff --git a/hack/manifests/cni-installer.yaml b/hack/manifests/cni-installer.yaml
@@ -59,7 +59,7 @@ spec:
               mountPath: /etc/cni/net.d
       containers:
         - name: pause
-          image: registry.k8s.io/pause:2.0
+          image: mcr.microsoft.com/oss/kubernetes/pause:3.6
       hostNetwork: true
       volumes:
         - name: cni-conflist

diff --git a/hack/manifests/scaler.yaml b/hack/manifests/scaler.yaml
@@ -25,5 +25,5 @@ spec:
               topologyKey: "kubernetes.io/hostname"
       containers:
         - name: anti-affinity
-          image: registry.k8s.io/pause:2.0
+          image: mcr.microsoft.com/oss/kubernetes/pause:3.6
       hostNetwork: true
diff --git a/npm/deploy/kustomize/overlays/controller/deployment.yaml b/npm/deploy/kustomize/overlays/controller/deployment.yaml
@@ -36,7 +36,7 @@ spec:
             containerPort: 10091
           - name: http
             containerPort: 10092
-          image: azure-npm:v1.4.1
+          image:  mcr.microsoft.com/containernetworking/azure-npm:v1.4.1
           command: ["azure-npm"]
           args: ["controlplane"]
           resources:

diff --git a/npm/deploy/kustomize/overlays/daemon/deployment.yaml b/npm/deploy/kustomize/overlays/daemon/deployment.yaml
@@ -34,7 +34,7 @@ spec:
           ports:
           - name: metrics
             containerPort: 10091
-          image: azure-npm:v1.4.1
+          image:  mcr.microsoft.com/containernetworking/azure-npm:v1.4.1
           command: ["azure-npm"]
           args: ["daemon"]
           resources:

diff --git a/npm/deploy/manifests/controller/azure-npm.yaml b/npm/deploy/manifests/controller/azure-npm.yaml
@@ -149,7 +149,7 @@ spec:
               fieldPath: spec.nodeName
         - name: NPM_CONFIG
           value: /etc/azure-npm/azure-npm.json
-        image: azure-npm:v1.4.1
+        image:  mcr.microsoft.com/containernetworking/azure-npm:v1.4.1
         name: azure-npm
         resources:
           limits:

diff --git a/npm/deploy/manifests/daemon/azure-npm.yaml b/npm/deploy/manifests/daemon/azure-npm.yaml
@@ -135,7 +135,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-          image: azure-npm:v1.4.1
+          image:  mcr.microsoft.com/containernetworking/azure-npm:v1.4.1
           name: azure-npm
           ports:
             - name: metrics

diff --git a/test/integration/manifests/datapath/linux-deployment-ipv6.yaml b/test/integration/manifests/datapath/linux-deployment-ipv6.yaml
@@ -41,7 +41,7 @@ spec:
                     fieldPath: status.podIP
               - name: HOSTS_TO_RESOLVE
                 value: "2001:4860:4860::8888 www.bing.com"
-            image: "docker.io/bloomberg/goldpinger:v3.7.0"
+            image: "mcr.microsoft.com/aks/e2e/bloomberg-goldpinger:v3.7.0"
             tolerations:
               - key: node-role.kubernetes.io/master
                 effect: NoSchedule
@@ -85,4 +85,4 @@ spec:
               initialDelaySeconds: 5
               periodSeconds: 5
         nodeSelector:
-          kubernetes.io/os: linux
+          kubernetes.io/os: linux
diff --git a/test/integration/manifests/datapath/linux-deployment.yaml b/test/integration/manifests/datapath/linux-deployment.yaml
@@ -39,7 +39,7 @@ spec:
                     fieldPath: status.podIP
               - name: HOSTS_TO_RESOLVE
                 value: "1.1.1.1 8.8.8.8 www.bing.com"
-            image: "docker.io/bloomberg/goldpinger:v3.7.0"
+            image: "mcr.microsoft.com/aks/e2e/bloomberg-goldpinger:v3.7.0"
             tolerations:
               - key: node-role.kubernetes.io/master
                 effect: NoSchedule
@@ -83,4 +83,4 @@ spec:
               initialDelaySeconds: 5
               periodSeconds: 5
         nodeSelector:
-          kubernetes.io/os: linux
+          kubernetes.io/os: linux
diff --git a/test/integration/manifests/goldpinger/daemonset-ipv6.yaml b/test/integration/manifests/goldpinger/daemonset-ipv6.yaml
@@ -61,7 +61,7 @@ spec:
                   fieldPath: status.podIP
             - name: HOSTS_TO_RESOLVE
               value: "2001:4860:4860::8888 www.bing.com"
-          image: "docker.io/bloomberg/goldpinger:v3.7.0"
+          image: "mcr.microsoft.com/aks/e2e/bloomberg-goldpinger:v3.7.0"
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
@@ -79,4 +79,4 @@ spec:
               path: /healthz
               port: 8080
             initialDelaySeconds: 5
-            periodSeconds: 5
+            periodSeconds: 5
diff --git a/test/integration/manifests/goldpinger/daemonset.yaml b/test/integration/manifests/goldpinger/daemonset.yaml
@@ -59,7 +59,7 @@ spec:
                   fieldPath: status.podIP
 #            - name: HOSTS_TO_RESOLVE
 #              value: "1.1.1.1 8.8.8.8 www.bing.com"
-          image: "docker.io/bloomberg/goldpinger:v3.7.0"
+          image: "mcr.microsoft.com/aks/e2e/bloomberg-goldpinger:v3.7.0"
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
@@ -77,4 +77,4 @@ spec:
               path: /healthz
               port: 8080
             initialDelaySeconds: 5
-            periodSeconds: 5
+            periodSeconds: 5
diff --git a/test/integration/manifests/goldpinger/deployment.yaml b/test/integration/manifests/goldpinger/deployment.yaml
@@ -57,7 +57,7 @@ spec:
                   fieldPath: status.podIP
             - name: HOSTS_TO_RESOLVE
               value: "1.1.1.1 8.8.8.8 www.bing.com"
-          image: "docker.io/bloomberg/goldpinger:v3.7.0"
+          image: "mcr.microsoft.com/aks/e2e/bloomberg-goldpinger:v3.7.0"
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true

diff --git a/test/kubemark/aks-e/hollow-node.yaml b/test/kubemark/aks-e/hollow-node.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       initContainers:
       - name: init-inotify-limit
-        image: busybox:1.32
+        image: mcr.microsoft.com/cbl-mariner/busybox:2.0
         command: ['sysctl', '-w', 'fs.inotify.max_user_instances=1000']
         securityContext:
           privileged: true