From ffb85e35dd0e7beaf493134da679dcb01f00e90b Mon Sep 17 00:00:00 2001 From: Zhecheng Li Date: Fri, 5 Jan 2024 06:40:24 +0000 Subject: [PATCH] Use MCR images for ones in kubemark Signed-off-by: Zhecheng Li --- tests/kubemark/configs/density/deployment.yaml | 2 +- tests/kubemark/configs/density/legacy/rc.yaml | 2 +- .../volume-types/configmap/deployment_with_configmap.yaml | 2 +- .../volume-types/downwardapi/deployment_with_downwardapi.yaml | 2 +- .../volume-types/emptydir/deployment_with_emptydir.yaml | 2 +- .../volume-types/persistentvolume/deployment_with_pvc.yaml | 2 +- .../volume-types/secret/deployment_with_secret.yaml | 2 +- tests/kubemark/configs/l4ilb/dep.yaml | 2 +- tests/kubemark/configs/load/config.yaml | 4 ++-- tests/kubemark/configs/load/daemonset.yaml | 2 +- tests/kubemark/configs/load/deployment.yaml | 2 +- tests/kubemark/configs/load/experimental-config.yaml | 4 ++-- tests/kubemark/configs/load/job.yaml | 2 +- tests/kubemark/configs/load/legacy/rc.yaml | 2 +- tests/kubemark/configs/load/simple-deployment.yaml | 2 +- tests/kubemark/configs/load/statefulset.yaml | 2 +- tests/kubemark/configs/node-throughput/config.yaml | 2 +- tests/kubemark/configs/node-throughput/windows_override.yaml | 2 +- tests/kubemark/templates/hollow-node.yaml | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/kubemark/configs/density/deployment.yaml b/tests/kubemark/configs/density/deployment.yaml index bb47b41fc4..613dada0a4 100644 --- a/tests/kubemark/configs/density/deployment.yaml +++ b/tests/kubemark/configs/density/deployment.yaml @@ -16,7 +16,7 @@ spec: group: {{.Group}} spec: containers: - - image: registry.k8s.io/pause:3.1 + - image: mcr.microsoft.com/oss/kubernetes/pause:3.1 imagePullPolicy: IfNotPresent name: {{.Name}} ports: diff --git a/tests/kubemark/configs/density/legacy/rc.yaml b/tests/kubemark/configs/density/legacy/rc.yaml index 0fd6a231b7..8693872e34 100644 --- a/tests/kubemark/configs/density/legacy/rc.yaml +++ b/tests/kubemark/configs/density/legacy/rc.yaml @@ -15,7 +15,7 @@ spec: group: {{.Group}} spec: containers: - - image: registry.k8s.io/pause:3.1 + - image: mcr.microsoft.com/oss/kubernetes/pause:3.1 imagePullPolicy: IfNotPresent name: {{.Name}} ports: diff --git a/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/configmap/deployment_with_configmap.yaml b/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/configmap/deployment_with_configmap.yaml index adae1fccbf..315fac1156 100644 --- a/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/configmap/deployment_with_configmap.yaml +++ b/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/configmap/deployment_with_configmap.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: {{.Name}} - image: registry.k8s.io/pause:3.1 + image: mcr.microsoft.com/oss/kubernetes/pause:3.1 imagePullPolicy: IfNotPresent volumeMounts: {{ range $volumeIndex, $vol := Seq .VolumesPerPod }} diff --git a/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/downwardapi/deployment_with_downwardapi.yaml b/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/downwardapi/deployment_with_downwardapi.yaml index ae2111647d..4b11034c26 100644 --- a/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/downwardapi/deployment_with_downwardapi.yaml +++ b/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/downwardapi/deployment_with_downwardapi.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: {{.Name}} - image: registry.k8s.io/pause:3.1 + image: mcr.microsoft.com/oss/kubernetes/pause:3.1 imagePullPolicy: IfNotPresent volumeMounts: {{ range $volumeIndex, $vol := Seq .VolumesPerPod }} diff --git a/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/emptydir/deployment_with_emptydir.yaml b/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/emptydir/deployment_with_emptydir.yaml index 132cb9d773..274bc66d8f 100644 --- a/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/emptydir/deployment_with_emptydir.yaml +++ b/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/emptydir/deployment_with_emptydir.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: {{.Name}} - image: registry.k8s.io/pause:3.1 + image: mcr.microsoft.com/oss/kubernetes/pause:3.1 imagePullPolicy: IfNotPresent volumeMounts: {{ range $volumeIndex, $vol := Seq .VolumesPerPod }} diff --git a/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/persistentvolume/deployment_with_pvc.yaml b/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/persistentvolume/deployment_with_pvc.yaml index f34bc60273..3a804d2583 100644 --- a/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/persistentvolume/deployment_with_pvc.yaml +++ b/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/persistentvolume/deployment_with_pvc.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: {{.Name}} - image: registry.k8s.io/pause:3.1 + image: mcr.microsoft.com/oss/kubernetes/pause:3.1 imagePullPolicy: IfNotPresent volumeMounts: {{ range $volumeIndex, $vol := Seq .VolumesPerPod }} diff --git a/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/secret/deployment_with_secret.yaml b/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/secret/deployment_with_secret.yaml index b63703b7dc..c2efee09f3 100644 --- a/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/secret/deployment_with_secret.yaml +++ b/tests/kubemark/configs/experimental/storage/pod-startup/volume-types/secret/deployment_with_secret.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: {{.Name}} - image: registry.k8s.io/pause:3.1 + image: mcr.microsoft.com/oss/kubernetes/pause:3.1 imagePullPolicy: IfNotPresent volumeMounts: {{ range $volumeIndex, $vol := Seq .VolumesPerPod }} diff --git a/tests/kubemark/configs/l4ilb/dep.yaml b/tests/kubemark/configs/l4ilb/dep.yaml index 8a2f505b28..2582de5213 100644 --- a/tests/kubemark/configs/l4ilb/dep.yaml +++ b/tests/kubemark/configs/l4ilb/dep.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: {{.Name}} - image: nginx + image: mcr.microsoft.com/mirror/docker/library/nginx:1.25 ports: - containerPort: 8080 diff --git a/tests/kubemark/configs/load/config.yaml b/tests/kubemark/configs/load/config.yaml index 9845ad5685..9e52576246 100644 --- a/tests/kubemark/configs/load/config.yaml +++ b/tests/kubemark/configs/load/config.yaml @@ -203,7 +203,7 @@ steps: - basename: daemonset objectTemplatePath: daemonset.yaml templateFillMap: - Image: registry.k8s.io/pause:3.0 + Image: mcr.microsoft.com/oss/kubernetes/pause:3.1 {{end}} - namespaceRange: min: 1 @@ -438,7 +438,7 @@ steps: - basename: daemonset objectTemplatePath: daemonset.yaml templateFillMap: - Image: registry.k8s.io/pause:3.1 + Image: mcr.microsoft.com/oss/kubernetes/pause:3.1 {{end}} {{if $ENABLE_JOBS}} - namespaceRange: diff --git a/tests/kubemark/configs/load/daemonset.yaml b/tests/kubemark/configs/load/daemonset.yaml index 34c2079f5e..a29c5874fd 100644 --- a/tests/kubemark/configs/load/daemonset.yaml +++ b/tests/kubemark/configs/load/daemonset.yaml @@ -1,4 +1,4 @@ -{{$Image := DefaultParam .Image "registry.k8s.io/pause:3.1"}} +{{$Image := DefaultParam .Image "mcr.microsoft.com/oss/kubernetes/pause:3.1"}} apiVersion: apps/v1 kind: DaemonSet diff --git a/tests/kubemark/configs/load/deployment.yaml b/tests/kubemark/configs/load/deployment.yaml index 9c41c5587a..35d45ae629 100644 --- a/tests/kubemark/configs/load/deployment.yaml +++ b/tests/kubemark/configs/load/deployment.yaml @@ -23,7 +23,7 @@ spec: svc: {{.SvcName}}-{{.Index}} spec: containers: - - image: registry.k8s.io/pause:3.1 + - image: mcr.microsoft.com/oss/kubernetes/pause:3.1 name: {{.Name}} resources: requests: diff --git a/tests/kubemark/configs/load/experimental-config.yaml b/tests/kubemark/configs/load/experimental-config.yaml index 4dba64b552..f62db270ff 100644 --- a/tests/kubemark/configs/load/experimental-config.yaml +++ b/tests/kubemark/configs/load/experimental-config.yaml @@ -234,7 +234,7 @@ steps: - basename: daemonset objectTemplatePath: daemonset.yaml templateFillMap: - Image: registry.k8s.io/pause:3.0 + Image: mcr.microsoft.com/oss/kubernetes/pause:3.1 {{end}} - namespaceRange: min: 1 @@ -616,7 +616,7 @@ steps: - basename: daemonset objectTemplatePath: daemonset.yaml templateFillMap: - Image: registry.k8s.io/pause:3.1 + Image: mcr.microsoft.com/oss/kubernetes/pause:3.1 {{end}} {{if $ENABLE_JOBS}} - namespaceRange: diff --git a/tests/kubemark/configs/load/job.yaml b/tests/kubemark/configs/load/job.yaml index 15957d5a3f..4102b32f82 100644 --- a/tests/kubemark/configs/load/job.yaml +++ b/tests/kubemark/configs/load/job.yaml @@ -19,7 +19,7 @@ spec: containers: - name: {{.Name}} # TODO(#799): We should test the "run-to-completion" workflow and hence don't use pause pods. - image: registry.k8s.io/pause:3.1 + image: mcr.microsoft.com/oss/kubernetes/pause:3.1 resources: requests: cpu: 10m diff --git a/tests/kubemark/configs/load/legacy/rc.yaml b/tests/kubemark/configs/load/legacy/rc.yaml index 2f9274c7ef..707939d7eb 100644 --- a/tests/kubemark/configs/load/legacy/rc.yaml +++ b/tests/kubemark/configs/load/legacy/rc.yaml @@ -16,7 +16,7 @@ spec: svc: {{.SvcName}}-{{.Index}} spec: containers: - - image: registry.k8s.io/pause:3.1 + - image: mcr.microsoft.com/oss/kubernetes/pause:3.1 name: {{.Name}} resources: requests: diff --git a/tests/kubemark/configs/load/simple-deployment.yaml b/tests/kubemark/configs/load/simple-deployment.yaml index bb47b41fc4..613dada0a4 100644 --- a/tests/kubemark/configs/load/simple-deployment.yaml +++ b/tests/kubemark/configs/load/simple-deployment.yaml @@ -16,7 +16,7 @@ spec: group: {{.Group}} spec: containers: - - image: registry.k8s.io/pause:3.1 + - image: mcr.microsoft.com/oss/kubernetes/pause:3.1 imagePullPolicy: IfNotPresent name: {{.Name}} ports: diff --git a/tests/kubemark/configs/load/statefulset.yaml b/tests/kubemark/configs/load/statefulset.yaml index 42924eb5eb..7efffa9509 100644 --- a/tests/kubemark/configs/load/statefulset.yaml +++ b/tests/kubemark/configs/load/statefulset.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: {{.Name}} - image: registry.k8s.io/pause:3.1 + image: mcr.microsoft.com/oss/kubernetes/pause:3.1 ports: - containerPort: 80 name: web diff --git a/tests/kubemark/configs/node-throughput/config.yaml b/tests/kubemark/configs/node-throughput/config.yaml index b2a63a08f8..9f420cc4d0 100644 --- a/tests/kubemark/configs/node-throughput/config.yaml +++ b/tests/kubemark/configs/node-throughput/config.yaml @@ -4,7 +4,7 @@ #Constants {{$POD_COUNT := DefaultParam .POD_COUNT 100}} {{$POD_THROUGHPUT := DefaultParam .POD_THROUGHPUT 5}} -{{$CONTAINER_IMAGE := DefaultParam .CONTAINER_IMAGE "registry.k8s.io/pause:3.1"}} +{{$CONTAINER_IMAGE := DefaultParam .CONTAINER_IMAGE "mcr.microsoft.com/oss/kubernetes/pause:3.1"}} {{$POD_STARTUP_LATENCY_THRESHOLD := DefaultParam .POD_STARTUP_LATENCY_THRESHOLD "5s"}} {{$OPERATION_TIMEOUT := DefaultParam .OPERATION_TIMEOUT "15m"}} diff --git a/tests/kubemark/configs/node-throughput/windows_override.yaml b/tests/kubemark/configs/node-throughput/windows_override.yaml index 3c4a0d3e67..74365df327 100644 --- a/tests/kubemark/configs/node-throughput/windows_override.yaml +++ b/tests/kubemark/configs/node-throughput/windows_override.yaml @@ -1,5 +1,5 @@ POD_COUNT: 80 POD_THROUGHPUT: 0.03 -CONTAINER_IMAGE: registry.k8s.io/pause:3.4.1 +CONTAINER_IMAGE: mcr.microsoft.com/oss/kubernetes/pause:3.4.1 OPERATION_TIMEOUT: 90m POD_STARTUP_LATENCY_THRESHOLD: 60m diff --git a/tests/kubemark/templates/hollow-node.yaml b/tests/kubemark/templates/hollow-node.yaml index 2166cc10c2..25c8e81e3a 100644 --- a/tests/kubemark/templates/hollow-node.yaml +++ b/tests/kubemark/templates/hollow-node.yaml @@ -14,7 +14,7 @@ spec: spec: initContainers: - name: init-inotify-limit - image: docker.io/busybox:latest + image: mcr.microsoft.com/mirror/docker/library/busybox:1.35 command: ["sysctl", "-w", "fs.inotify.max_user_instances=200"] securityContext: privileged: true