From ed2ded76e3aafa3d383e71615024c0f528b79c0e Mon Sep 17 00:00:00 2001 From: "xin.li" Date: Sun, 27 Mar 2022 15:19:12 +0800 Subject: [PATCH] [zh] modify busybox to busybox:1.28 in dir examples Signed-off-by: xin.li --- .../logging/two-files-counter-pod-agent-sidecar.yaml | 2 +- .../logging/two-files-counter-pod-streaming-sidecar.yaml | 6 +++--- .../zh/examples/admin/logging/two-files-counter-pod.yaml | 2 +- content/zh/examples/admin/resource/limit-range-pod-1.yaml | 8 ++++---- content/zh/examples/admin/resource/limit-range-pod-2.yaml | 8 ++++---- content/zh/examples/admin/resource/limit-range-pod-3.yaml | 2 +- content/zh/examples/application/job/cronjob.yaml | 2 +- content/zh/examples/application/job/job-tmpl.yaml | 2 +- content/zh/examples/debug/counter-pod.yaml | 2 +- content/zh/examples/pods/init-containers.yaml | 2 +- content/zh/examples/pods/inject/dependent-envars.yaml | 2 +- content/zh/examples/pods/security/hello-apparmor.yaml | 2 +- content/zh/examples/pods/security/security-context.yaml | 2 +- content/zh/examples/pods/share-process-namespace.yaml | 2 +- .../storage/projected-secret-downwardapi-configmap.yaml | 2 +- .../projected-secrets-nondefault-permission-mode.yaml | 2 +- .../pods/storage/projected-service-account-token.yaml | 2 +- content/zh/examples/pods/storage/projected.yaml | 2 +- .../zh/examples/service/networking/hostaliases-pod.yaml | 2 +- 19 files changed, 27 insertions(+), 27 deletions(-) diff --git a/content/zh/examples/admin/logging/two-files-counter-pod-agent-sidecar.yaml b/content/zh/examples/admin/logging/two-files-counter-pod-agent-sidecar.yaml index b37b616e6f..ddfb8104cb 100644 --- a/content/zh/examples/admin/logging/two-files-counter-pod-agent-sidecar.yaml +++ b/content/zh/examples/admin/logging/two-files-counter-pod-agent-sidecar.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: count - image: busybox + image: busybox:1.28 args: - /bin/sh - -c diff --git a/content/zh/examples/admin/logging/two-files-counter-pod-streaming-sidecar.yaml b/content/zh/examples/admin/logging/two-files-counter-pod-streaming-sidecar.yaml index 87bd198cfd..6b7d1f1201 100644 --- a/content/zh/examples/admin/logging/two-files-counter-pod-streaming-sidecar.yaml +++ b/content/zh/examples/admin/logging/two-files-counter-pod-streaming-sidecar.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: count - image: busybox + image: busybox:1.28 args: - /bin/sh - -c @@ -22,13 +22,13 @@ spec: - name: varlog mountPath: /var/log - name: count-log-1 - image: busybox + image: busybox:1.28 args: [/bin/sh, -c, 'tail -n+1 -f /var/log/1.log'] volumeMounts: - name: varlog mountPath: /var/log - name: count-log-2 - image: busybox + image: busybox:1.28 args: [/bin/sh, -c, 'tail -n+1 -f /var/log/2.log'] volumeMounts: - name: varlog diff --git a/content/zh/examples/admin/logging/two-files-counter-pod.yaml b/content/zh/examples/admin/logging/two-files-counter-pod.yaml index 6ebeb717a1..31bbed3cf8 100644 --- a/content/zh/examples/admin/logging/two-files-counter-pod.yaml +++ b/content/zh/examples/admin/logging/two-files-counter-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: count - image: busybox + image: busybox:1.28 args: - /bin/sh - -c diff --git a/content/zh/examples/admin/resource/limit-range-pod-1.yaml b/content/zh/examples/admin/resource/limit-range-pod-1.yaml index 0457792af9..b9bd20d06a 100644 --- a/content/zh/examples/admin/resource/limit-range-pod-1.yaml +++ b/content/zh/examples/admin/resource/limit-range-pod-1.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: busybox-cnt01 - image: busybox + image: busybox:1.28 command: ["/bin/sh"] args: ["-c", "while true; do echo hello from cnt01; sleep 10;done"] resources: @@ -16,7 +16,7 @@ spec: memory: "200Mi" cpu: "500m" - name: busybox-cnt02 - image: busybox + image: busybox:1.28 command: ["/bin/sh"] args: ["-c", "while true; do echo hello from cnt02; sleep 10;done"] resources: @@ -24,7 +24,7 @@ spec: memory: "100Mi" cpu: "100m" - name: busybox-cnt03 - image: busybox + image: busybox:1.28 command: ["/bin/sh"] args: ["-c", "while true; do echo hello from cnt03; sleep 10;done"] resources: @@ -32,6 +32,6 @@ spec: memory: "200Mi" cpu: "500m" - name: busybox-cnt04 - image: busybox + image: busybox:1.28 command: ["/bin/sh"] args: ["-c", "while true; do echo hello from cnt04; sleep 10;done"] diff --git a/content/zh/examples/admin/resource/limit-range-pod-2.yaml b/content/zh/examples/admin/resource/limit-range-pod-2.yaml index efac440269..40da19c1ae 100644 --- a/content/zh/examples/admin/resource/limit-range-pod-2.yaml +++ b/content/zh/examples/admin/resource/limit-range-pod-2.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: busybox-cnt01 - image: busybox + image: busybox:1.28 command: ["/bin/sh"] args: ["-c", "while true; do echo hello from cnt01; sleep 10;done"] resources: @@ -16,7 +16,7 @@ spec: memory: "200Mi" cpu: "500m" - name: busybox-cnt02 - image: busybox + image: busybox:1.28 command: ["/bin/sh"] args: ["-c", "while true; do echo hello from cnt02; sleep 10;done"] resources: @@ -24,7 +24,7 @@ spec: memory: "100Mi" cpu: "100m" - name: busybox-cnt03 - image: busybox + image: busybox:1.28 command: ["/bin/sh"] args: ["-c", "while true; do echo hello from cnt03; sleep 10;done"] resources: @@ -32,6 +32,6 @@ spec: memory: "200Mi" cpu: "500m" - name: busybox-cnt04 - image: busybox + image: busybox:1.28 command: ["/bin/sh"] args: ["-c", "while true; do echo hello from cnt04; sleep 10;done"] diff --git a/content/zh/examples/admin/resource/limit-range-pod-3.yaml b/content/zh/examples/admin/resource/limit-range-pod-3.yaml index 8afdb6379c..503200a966 100644 --- a/content/zh/examples/admin/resource/limit-range-pod-3.yaml +++ b/content/zh/examples/admin/resource/limit-range-pod-3.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: busybox-cnt01 - image: busybox + image: busybox:1.28 resources: limits: memory: "300Mi" diff --git a/content/zh/examples/application/job/cronjob.yaml b/content/zh/examples/application/job/cronjob.yaml index 9f06ca7bd6..78d0e2d314 100644 --- a/content/zh/examples/application/job/cronjob.yaml +++ b/content/zh/examples/application/job/cronjob.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: hello - image: busybox + image: busybox:1.28 imagePullPolicy: IfNotPresent command: - /bin/sh diff --git a/content/zh/examples/application/job/job-tmpl.yaml b/content/zh/examples/application/job/job-tmpl.yaml index 790025b38b..d7dbbafd62 100644 --- a/content/zh/examples/application/job/job-tmpl.yaml +++ b/content/zh/examples/application/job/job-tmpl.yaml @@ -13,6 +13,6 @@ spec: spec: containers: - name: c - image: busybox + image: busybox:1.28 command: ["sh", "-c", "echo Processing item $ITEM && sleep 5"] restartPolicy: Never diff --git a/content/zh/examples/debug/counter-pod.yaml b/content/zh/examples/debug/counter-pod.yaml index f997886386..a91b2f8915 100644 --- a/content/zh/examples/debug/counter-pod.yaml +++ b/content/zh/examples/debug/counter-pod.yaml @@ -5,6 +5,6 @@ metadata: spec: containers: - name: count - image: busybox + image: busybox:1.28 args: [/bin/sh, -c, 'i=0; while true; do echo "$i: $(date)"; i=$((i+1)); sleep 1; done'] diff --git a/content/zh/examples/pods/init-containers.yaml b/content/zh/examples/pods/init-containers.yaml index 667b03eccd..e55895d673 100644 --- a/content/zh/examples/pods/init-containers.yaml +++ b/content/zh/examples/pods/init-containers.yaml @@ -14,7 +14,7 @@ spec: # These containers are run during pod initialization initContainers: - name: install - image: busybox + image: busybox:1.28 command: - wget - "-O" diff --git a/content/zh/examples/pods/inject/dependent-envars.yaml b/content/zh/examples/pods/inject/dependent-envars.yaml index 2509c6f47b..67d07098ba 100644 --- a/content/zh/examples/pods/inject/dependent-envars.yaml +++ b/content/zh/examples/pods/inject/dependent-envars.yaml @@ -10,7 +10,7 @@ spec: command: - sh - -c - image: busybox + image: busybox:1.28 env: - name: SERVICE_PORT value: "80" diff --git a/content/zh/examples/pods/security/hello-apparmor.yaml b/content/zh/examples/pods/security/hello-apparmor.yaml index 3e9b3b2a9c..000645f1c7 100644 --- a/content/zh/examples/pods/security/hello-apparmor.yaml +++ b/content/zh/examples/pods/security/hello-apparmor.yaml @@ -9,5 +9,5 @@ metadata: spec: containers: - name: hello - image: busybox + image: busybox:1.28 command: [ "sh", "-c", "echo 'Hello AppArmor!' && sleep 1h" ] diff --git a/content/zh/examples/pods/security/security-context.yaml b/content/zh/examples/pods/security/security-context.yaml index 35cb1eeebe..7903c39c64 100644 --- a/content/zh/examples/pods/security/security-context.yaml +++ b/content/zh/examples/pods/security/security-context.yaml @@ -12,7 +12,7 @@ spec: emptyDir: {} containers: - name: sec-ctx-demo - image: busybox + image: busybox:1.28 command: [ "sh", "-c", "sleep 1h" ] volumeMounts: - name: sec-ctx-vol diff --git a/content/zh/examples/pods/share-process-namespace.yaml b/content/zh/examples/pods/share-process-namespace.yaml index af812732a2..bd48bf0ff6 100644 --- a/content/zh/examples/pods/share-process-namespace.yaml +++ b/content/zh/examples/pods/share-process-namespace.yaml @@ -8,7 +8,7 @@ spec: - name: nginx image: nginx - name: shell - image: busybox + image: busybox:1.28 securityContext: capabilities: add: diff --git a/content/zh/examples/pods/storage/projected-secret-downwardapi-configmap.yaml b/content/zh/examples/pods/storage/projected-secret-downwardapi-configmap.yaml index 270db99dcd..453dc08c0c 100644 --- a/content/zh/examples/pods/storage/projected-secret-downwardapi-configmap.yaml +++ b/content/zh/examples/pods/storage/projected-secret-downwardapi-configmap.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: container-test - image: busybox + image: busybox:1.28 volumeMounts: - name: all-in-one mountPath: "/projected-volume" diff --git a/content/zh/examples/pods/storage/projected-secrets-nondefault-permission-mode.yaml b/content/zh/examples/pods/storage/projected-secrets-nondefault-permission-mode.yaml index f69b43161e..b921fd93c5 100644 --- a/content/zh/examples/pods/storage/projected-secrets-nondefault-permission-mode.yaml +++ b/content/zh/examples/pods/storage/projected-secrets-nondefault-permission-mode.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: container-test - image: busybox + image: busybox:1.28 volumeMounts: - name: all-in-one mountPath: "/projected-volume" diff --git a/content/zh/examples/pods/storage/projected-service-account-token.yaml b/content/zh/examples/pods/storage/projected-service-account-token.yaml index 3ad06b5dc7..cc307659a7 100644 --- a/content/zh/examples/pods/storage/projected-service-account-token.yaml +++ b/content/zh/examples/pods/storage/projected-service-account-token.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: container-test - image: busybox + image: busybox:1.28 volumeMounts: - name: token-vol mountPath: "/service-account" diff --git a/content/zh/examples/pods/storage/projected.yaml b/content/zh/examples/pods/storage/projected.yaml index 172ca0dee5..4244048eb7 100644 --- a/content/zh/examples/pods/storage/projected.yaml +++ b/content/zh/examples/pods/storage/projected.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-projected-volume - image: busybox + image: busybox:1.28 args: - sleep - "86400" diff --git a/content/zh/examples/service/networking/hostaliases-pod.yaml b/content/zh/examples/service/networking/hostaliases-pod.yaml index 643813b34a..268bffbbf5 100644 --- a/content/zh/examples/service/networking/hostaliases-pod.yaml +++ b/content/zh/examples/service/networking/hostaliases-pod.yaml @@ -15,7 +15,7 @@ spec: - "bar.remote" containers: - name: cat-hosts - image: busybox + image: busybox:1.28 command: - cat args: