From 71bfd89b929d03b73dea753ae782a0aca1b16af7 Mon Sep 17 00:00:00 2001 From: Tim Bannister Date: Fri, 3 Feb 2023 15:55:02 +0000 Subject: [PATCH 1/2] Replace k8s.gcr.io with registry.k8s.io --- .../manage-resources-containers.md | 2 +- .../ja/docs/concepts/configuration/secret.md | 4 ++-- .../overview/working-with-objects/labels.md | 2 +- .../concepts/storage/persistent-volumes.md | 2 +- content/ja/docs/concepts/storage/volumes.md | 16 +++++++-------- .../workloads/controllers/statefulset.md | 2 +- .../ja/docs/reference/kubectl/cheatsheet.md | 4 ++-- .../setup/learning-environment/minikube.md | 2 +- .../kubeadm/setup-ha-etcd-with-kubeadm.md | 4 ++-- ...igure-liveness-readiness-startup-probes.md | 12 +++++------ .../debug/debug-application/debug-service.md | 4 ++-- .../docs/tasks/manage-gpus/scheduling-gpus.md | 4 ++-- content/ja/docs/tutorials/hello-minikube.md | 2 +- .../ja/docs/tutorials/services/source-ip.md | 2 +- .../basic-stateful-set.md | 20 +++++++++---------- .../ja/examples/admin/cloud/ccm-example.yaml | 4 ++-- .../admin/dns/dns-horizontal-autoscaler.yaml | 2 +- .../two-files-counter-pod-agent-sidecar.yaml | 2 +- content/ja/examples/admin/sched/pod1.yaml | 2 +- content/ja/examples/admin/sched/pod2.yaml | 2 +- content/ja/examples/admin/sched/pod3.yaml | 2 +- .../guestbook/redis-master-deployment.yaml | 2 +- .../ja/examples/application/php-apache.yaml | 2 +- .../application/web/web-parallel.yaml | 2 +- content/ja/examples/application/web/web.yaml | 2 +- .../application/zookeeper/zookeeper.yaml | 2 +- content/ja/examples/debug/event-exporter.yaml | 2 +- content/ja/examples/debug/fluentd-gcp-ds.yaml | 2 +- .../node-problem-detector-configmap.yaml | 2 +- .../examples/debug/node-problem-detector.yaml | 2 +- .../pods/inject/dapi-envars-container.yaml | 2 +- .../examples/pods/inject/dapi-envars-pod.yaml | 2 +- .../pods/inject/dapi-volume-resources.yaml | 2 +- .../ja/examples/pods/inject/dapi-volume.yaml | 2 +- .../pods/pod-configmap-env-var-valueFrom.yaml | 2 +- .../examples/pods/pod-configmap-envFrom.yaml | 2 +- .../pod-configmap-volume-specific-key.yaml | 2 +- .../examples/pods/pod-configmap-volume.yaml | 2 +- .../pod-multiple-configmap-env-variable.yaml | 2 +- .../pod-single-configmap-env-variable.yaml | 2 +- .../examples/pods/pod-with-node-affinity.yaml | 2 +- .../examples/pods/pod-with-pod-affinity.yaml | 2 +- .../ja/examples/pods/probe/exec-liveness.yaml | 2 +- .../ja/examples/pods/probe/http-liveness.yaml | 2 +- .../pods/probe/tcp-liveness-readiness.yaml | 2 +- 45 files changed, 72 insertions(+), 72 deletions(-) diff --git a/content/ja/docs/concepts/configuration/manage-resources-containers.md b/content/ja/docs/concepts/configuration/manage-resources-containers.md index 499e2a7214976..62b01aa0dfe88 100644 --- a/content/ja/docs/concepts/configuration/manage-resources-containers.md +++ b/content/ja/docs/concepts/configuration/manage-resources-containers.md @@ -601,7 +601,7 @@ Conditions: Events: FirstSeen LastSeen Count From SubobjectPath Reason Message Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {scheduler } scheduled Successfully assigned simmemleak-hra99 to kubernetes-node-tf0f - Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD pulled Pod container image "k8s.gcr.io/pause:0.8.0" already present on machine + Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD pulled Pod container image "registry.k8s.io/pause:0.8.0" already present on machine Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD created Created with docker id 6a41280f516d Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD started Started with docker id 6a41280f516d Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} spec.containers{simmemleak} created Created with docker id 87348f12526a diff --git a/content/ja/docs/concepts/configuration/secret.md b/content/ja/docs/concepts/configuration/secret.md index 978dd1591f50c..0514eaa40c96d 100644 --- a/content/ja/docs/concepts/configuration/secret.md +++ b/content/ja/docs/concepts/configuration/secret.md @@ -779,7 +779,7 @@ metadata: spec: containers: - name: test-container - image: k8s.gcr.io/busybox + image: registry.k8s.io/busybox command: [ "/bin/sh", "-c", "env" ] envFrom: - secretRef: @@ -994,7 +994,7 @@ spec: secretName: dotfile-secret containers: - name: dotfile-test-container - image: k8s.gcr.io/busybox + image: registry.k8s.io/busybox command: - ls - "-l" diff --git a/content/ja/docs/concepts/overview/working-with-objects/labels.md b/content/ja/docs/concepts/overview/working-with-objects/labels.md index 3c4ed0397a555..35f69e676bb49 100644 --- a/content/ja/docs/concepts/overview/working-with-objects/labels.md +++ b/content/ja/docs/concepts/overview/working-with-objects/labels.md @@ -130,7 +130,7 @@ metadata: spec: containers: - name: cuda-test - image: "k8s.gcr.io/cuda-vector-add:v0.1" + image: "registry.k8s.io/cuda-vector-add:v0.1" resources: limits: nvidia.com/gpu: 1 diff --git a/content/ja/docs/concepts/storage/persistent-volumes.md b/content/ja/docs/concepts/storage/persistent-volumes.md index 292d21ea68148..0a82b6a3cb268 100644 --- a/content/ja/docs/concepts/storage/persistent-volumes.md +++ b/content/ja/docs/concepts/storage/persistent-volumes.md @@ -154,7 +154,7 @@ spec: path: /any/path/it/will/be/replaced containers: - name: pv-recycler - image: "k8s.gcr.io/busybox" + image: "registry.k8s.io/busybox" command: ["/bin/sh", "-c", "test -e /scrub && rm -rf /scrub/..?* /scrub/.[!.]* /scrub/* && test -z \"$(ls -A /scrub)\" || exit 1"] volumeMounts: - name: vol diff --git a/content/ja/docs/concepts/storage/volumes.md b/content/ja/docs/concepts/storage/volumes.md index 65ab1fd67b035..c4445d49c49f7 100644 --- a/content/ja/docs/concepts/storage/volumes.md +++ b/content/ja/docs/concepts/storage/volumes.md @@ -76,7 +76,7 @@ metadata: name: test-ebs spec: containers: - - image: k8s.gcr.io/test-webserver + - image: registry.k8s.io/test-webserver name: test-container volumeMounts: - mountPath: /test-ebs @@ -163,7 +163,7 @@ metadata: name: test-cinder spec: containers: - - image: k8s.gcr.io/test-webserver + - image: registry.k8s.io/test-webserver name: test-cinder-container volumeMounts: - mountPath: /test-cinder @@ -274,7 +274,7 @@ metadata: name: test-pd spec: containers: - - image: k8s.gcr.io/test-webserver + - image: registry.k8s.io/test-webserver name: test-container volumeMounts: - mountPath: /cache @@ -349,7 +349,7 @@ metadata: name: test-pd spec: containers: - - image: k8s.gcr.io/test-webserver + - image: registry.k8s.io/test-webserver name: test-container volumeMounts: - mountPath: /test-pd @@ -507,7 +507,7 @@ metadata: name: test-pd spec: containers: - - image: k8s.gcr.io/test-webserver + - image: registry.k8s.io/test-webserver name: test-container volumeMounts: - mountPath: /test-pd @@ -536,7 +536,7 @@ metadata: spec: containers: - name: test-webserver - image: k8s.gcr.io/test-webserver:latest + image: registry.k8s.io/test-webserver:latest volumeMounts: - mountPath: /var/local/aaa name: mydir @@ -666,7 +666,7 @@ metadata: name: test-portworx-volume-pod spec: containers: - - image: k8s.gcr.io/test-webserver + - image: registry.k8s.io/test-webserver name: test-container volumeMounts: - mountPath: /mnt @@ -848,7 +848,7 @@ metadata: name: test-vmdk spec: containers: - - image: k8s.gcr.io/test-webserver + - image: registry.k8s.io/test-webserver name: test-container volumeMounts: - mountPath: /test-vmdk diff --git a/content/ja/docs/concepts/workloads/controllers/statefulset.md b/content/ja/docs/concepts/workloads/controllers/statefulset.md index b69e46af52a3d..a952c3bee85c4 100644 --- a/content/ja/docs/concepts/workloads/controllers/statefulset.md +++ b/content/ja/docs/concepts/workloads/controllers/statefulset.md @@ -72,7 +72,7 @@ spec: terminationGracePeriodSeconds: 10 containers: - name: nginx - image: k8s.gcr.io/nginx-slim:0.8 + image: registry.k8s.io/nginx-slim:0.8 ports: - containerPort: 80 name: web diff --git a/content/ja/docs/reference/kubectl/cheatsheet.md b/content/ja/docs/reference/kubectl/cheatsheet.md index 681eecf96a267..7b2d782882cfd 100644 --- a/content/ja/docs/reference/kubectl/cheatsheet.md +++ b/content/ja/docs/reference/kubectl/cheatsheet.md @@ -359,8 +359,8 @@ kubectl api-resources --api-group=extensions # "extensions" APIグループの # クラスター内で実行中のすべてのイメージ名を表示する kubectl get pods -A -o=custom-columns='DATA:spec.containers[*].image' -# "k8s.gcr.io/coredns:1.6.2"を除いたすべてのイメージ名を表示する -kubectl get pods -A -o=custom-columns='DATA:spec.containers[?(@.image!="k8s.gcr.io/coredns:1.6.2")].image' +# "registry.k8s.io/coredns:1.6.2"を除いたすべてのイメージ名を表示する +kubectl get pods -A -o=custom-columns='DATA:spec.containers[?(@.image!="registry.k8s.io/coredns:1.6.2")].image' # 名前に関係なくmetadata以下のすべてのフィールドを表示する kubectl get pods -A -o=custom-columns='DATA:metadata.*' diff --git a/content/ja/docs/setup/learning-environment/minikube.md b/content/ja/docs/setup/learning-environment/minikube.md index 58fce33a34a37..f394897fcfdde 100644 --- a/content/ja/docs/setup/learning-environment/minikube.md +++ b/content/ja/docs/setup/learning-environment/minikube.md @@ -54,7 +54,7 @@ MinikubeのサポートするKubernetesの機能: 単純なHTTPサーバーである`echoserver`という既存のイメージを使用して、Kubernetes Deploymentを作りましょう。そして`--port`を使用して8080番ポートで公開しましょう。 ```shell - kubectl create deployment hello-minikube --image=k8s.gcr.io/echoserver:1.10 + kubectl create deployment hello-minikube --image=registry.k8s.io/echoserver:1.10 ``` 出力はこのようになります: diff --git a/content/ja/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md b/content/ja/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md index 6c3dbecf3879a..7e76d71375116 100644 --- a/content/ja/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md +++ b/content/ja/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md @@ -30,7 +30,7 @@ when using kubeadm to set up a kubernetes cluster. document assumes these default ports. However, they are configurable through the kubeadm config file. * Each host must [have docker, kubelet, and kubeadm installed](/ja/docs/setup/production-environment/tools/kubeadm/install-kubeadm/). -* Each host should have access to the Kubernetes container image registry (`k8s.gcr.io`) or list/pull the required etcd image using `kubeadm config images list/pull`. This guide will setup etcd instances as [static pods](/docs/tasks/configure-pod-container/static-pod/) managed by a kubelet. +* Each host should have access to the Kubernetes container image registry (`registry.k8s.io`) or list/pull the required etcd image using `kubeadm config images list/pull`. This guide will setup etcd instances as [static pods](/docs/tasks/configure-pod-container/static-pod/) managed by a kubelet. * Some infrastructure to copy files between hosts. For example `ssh` and `scp` can satisfy this requirement. @@ -251,7 +251,7 @@ this example. ```sh docker run --rm -it \ --net host \ - -v /etc/kubernetes:/etc/kubernetes k8s.gcr.io/etcd:${ETCD_TAG} etcdctl \ + -v /etc/kubernetes:/etc/kubernetes registry.k8s.io/etcd:${ETCD_TAG} etcdctl \ --cert /etc/kubernetes/pki/etcd/peer.crt \ --key /etc/kubernetes/pki/etcd/peer.key \ --cacert /etc/kubernetes/pki/etcd/ca.crt \ diff --git a/content/ja/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes.md b/content/ja/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes.md index 0fe0ffe410a28..0c14c79bb6b4a 100644 --- a/content/ja/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes.md +++ b/content/ja/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes.md @@ -36,7 +36,7 @@ Readiness Probeによるチェックを無効にし、これらがアプリケ 長期間実行されているアプリケーションの多くは、再起動されるまで回復できないような異常な状態になることがあります。 Kubernetesはこのような状況を検知し、回復するためのLiveness Probeを提供します。 -この演習では、`k8s.gcr.io/busybox`イメージのコンテナを起動するPodを作成します。 +この演習では、`registry.k8s.io/busybox`イメージのコンテナを起動するPodを作成します。 Podの構成ファイルは次の通りです。 {{< codenew file="pods/probe/exec-liveness.yaml" >}} @@ -76,8 +76,8 @@ kubectl describe pod liveness-exec FirstSeen LastSeen Count From SubobjectPath Type Reason Message --------- -------- ----- ---- ------------- -------- ------ ------- 24s 24s 1 {default-scheduler } Normal Scheduled Successfully assigned liveness-exec to worker0 -23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Pulling pulling image "k8s.gcr.io/busybox" -23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Pulled Successfully pulled image "k8s.gcr.io/busybox" +23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Pulling pulling image "registry.k8s.io/busybox" +23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Pulled Successfully pulled image "registry.k8s.io/busybox" 23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Created Created container with docker id 86849c15382e; Security:[seccomp=unconfined] 23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Started Started container with docker id 86849c15382e ``` @@ -94,8 +94,8 @@ kubectl describe pod liveness-exec FirstSeen LastSeen Count From SubobjectPath Type Reason Message --------- -------- ----- ---- ------------- -------- ------ ------- 37s 37s 1 {default-scheduler } Normal Scheduled Successfully assigned liveness-exec to worker0 -36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Pulling pulling image "k8s.gcr.io/busybox" -36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Pulled Successfully pulled image "k8s.gcr.io/busybox" +36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Pulling pulling image "registry.k8s.io/busybox" +36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Pulled Successfully pulled image "registry.k8s.io/busybox" 36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Created Created container with docker id 86849c15382e; Security:[seccomp=unconfined] 36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Started Started container with docker id 86849c15382e 2s 2s 1 {kubelet worker0} spec.containers{liveness} Warning Unhealthy Liveness probe failed: cat: can't open '/tmp/healthy': No such file or directory @@ -117,7 +117,7 @@ liveness-exec 1/1 Running 1 1m ## HTTPリクエストによるLiveness Probeを定義する {#define-a-liveness-http-request} 別の種類のLiveness Probeでは、HTTP GETリクエストを使用します。 -次の構成ファイルは、`k8s.gcr.io/liveness`イメージを使用したコンテナを起動するPodを作成します。 +次の構成ファイルは、`registry.k8s.io/liveness`イメージを使用したコンテナを起動するPodを作成します。 {{< codenew file="pods/probe/http-liveness.yaml" >}} diff --git a/content/ja/docs/tasks/debug/debug-application/debug-service.md b/content/ja/docs/tasks/debug/debug-application/debug-service.md index 1cbe54b9cb490..24c98eee1684f 100644 --- a/content/ja/docs/tasks/debug/debug-application/debug-service.md +++ b/content/ja/docs/tasks/debug/debug-application/debug-service.md @@ -37,7 +37,7 @@ kubectl exec -c -- ```shell -kubectl create deployment hostnames --image=k8s.gcr.io/serve_hostname +kubectl create deployment hostnames --image=registry.k8s.io/serve_hostname ``` ```none deployment.apps/hostnames created @@ -76,7 +76,7 @@ spec: spec: containers: - name: hostnames - image: k8s.gcr.io/serve_hostname + image: registry.k8s.io/serve_hostname ``` "app"ラベルは`kubectl create deployment`によって、Deploymentの名前に自動的にセットされます。 diff --git a/content/ja/docs/tasks/manage-gpus/scheduling-gpus.md b/content/ja/docs/tasks/manage-gpus/scheduling-gpus.md index 5c51771cd7e19..1bfbc65645e01 100644 --- a/content/ja/docs/tasks/manage-gpus/scheduling-gpus.md +++ b/content/ja/docs/tasks/manage-gpus/scheduling-gpus.md @@ -46,7 +46,7 @@ spec: containers: - name: cuda-vector-add # https://github.com/kubernetes/kubernetes/blob/v1.7.11/test/images/nvidia-cuda/Dockerfile - image: "k8s.gcr.io/cuda-vector-add:v0.1" + image: "registry.k8s.io/cuda-vector-add:v0.1" resources: limits: nvidia.com/gpu: 1 # 1 GPUをリクエストしています @@ -173,7 +173,7 @@ spec: containers: - name: cuda-vector-add # https://github.com/kubernetes/kubernetes/blob/v1.7.11/test/images/nvidia-cuda/Dockerfile - image: "k8s.gcr.io/cuda-vector-add:v0.1" + image: "registry.k8s.io/cuda-vector-add:v0.1" resources: limits: nvidia.com/gpu: 1 diff --git a/content/ja/docs/tutorials/hello-minikube.md b/content/ja/docs/tutorials/hello-minikube.md index 35192a8ca9748..b2c2ba0e4c9d2 100644 --- a/content/ja/docs/tutorials/hello-minikube.md +++ b/content/ja/docs/tutorials/hello-minikube.md @@ -70,7 +70,7 @@ Kubernetesの[*Pod*](/ja/docs/concepts/workloads/pods/) は、コンテナの管 1. `kubectl create` コマンドを使用してPodを管理するDeploymentを作成してください。Podは提供されたDockerイメージを元にコンテナを実行します。 ```shell - kubectl create deployment hello-node --image=k8s.gcr.io/echoserver:1.4 + kubectl create deployment hello-node --image=registry.k8s.io/echoserver:1.4 ``` 2. Deploymentを確認します: diff --git a/content/ja/docs/tutorials/services/source-ip.md b/content/ja/docs/tutorials/services/source-ip.md index 6e52a1c9b3082..9a52cb9e6bea9 100644 --- a/content/ja/docs/tutorials/services/source-ip.md +++ b/content/ja/docs/tutorials/services/source-ip.md @@ -41,7 +41,7 @@ the target localization. 以下の例では、HTTPヘッダー経由で受け取ったリクエストの送信元IPをエコーバックする、小さなnginxウェブサーバーを使用します。次のコマンドでウェブサーバーを作成できます。 ```shell -kubectl create deployment source-ip-app --image=k8s.gcr.io/echoserver:1.4 +kubectl create deployment source-ip-app --image=registry.k8s.io/echoserver:1.4 ``` 出力は次のようになります。 diff --git a/content/ja/docs/tutorials/stateful-application/basic-stateful-set.md b/content/ja/docs/tutorials/stateful-application/basic-stateful-set.md index 81e67375c722b..2afef728f1950 100644 --- a/content/ja/docs/tutorials/stateful-application/basic-stateful-set.md +++ b/content/ja/docs/tutorials/stateful-application/basic-stateful-set.md @@ -500,9 +500,9 @@ Podを取得して、コンテナイメージを確認してみましょう。 for p in 0 1 2; do kubectl get pod "web-$p" --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}'; echo; done ``` ``` -k8s.gcr.io/nginx-slim:0.8 -k8s.gcr.io/nginx-slim:0.8 -k8s.gcr.io/nginx-slim:0.8 +registry.k8s.io/nginx-slim:0.8 +registry.k8s.io/nginx-slim:0.8 +registry.k8s.io/nginx-slim:0.8 ``` @@ -528,7 +528,7 @@ statefulset.apps/web patched StatefulSetに再度patchを当てて、コンテナイメージを変更します。 ```shell -kubectl patch statefulset web --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"k8s.gcr.io/nginx-slim:0.7"}]' +kubectl patch statefulset web --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"registry.k8s.io/nginx-slim:0.7"}]' ``` ``` statefulset.apps/web patched @@ -562,7 +562,7 @@ Podのコンテナイメージを取得します。 kubectl get pod web-2 --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}' ``` ``` -k8s.gcr.io/nginx-slim:0.8 +registry.k8s.io/nginx-slim:0.8 ``` アップデート戦略が`RollingUpdate`であっても、StatefulSetが元のコンテナを持つPodをリストアしたことがわかります。これは、Podの順序インデックスが`updateStrategy`で指定した`partition`より小さいためです。 @@ -599,7 +599,7 @@ Podのコンテナを取得します。 kubectl get pod web-2 --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}' ``` ``` -k8s.gcr.io/nginx-slim:0.7 +registry.k8s.io/nginx-slim:0.7 ``` @@ -640,7 +640,7 @@ web-1 1/1 Running 0 18s kubectl get pod web-1 --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}' ``` ``` -k8s.gcr.io/nginx-slim:0.8 +registry.k8s.io/nginx-slim:0.8 ``` Podの順序インデックスがpartitionよりも小さいため、`web-1`は元の設定のコンテナイメージにリストアされました。partitionを指定すると、StatefulSetの`.spec.template`が更新されたときに、順序インデックスがそれ以上の値を持つすべてのPodがアップデートされます。partitionよりも小さな順序インデックスを持つPodが削除されたり終了されたりすると、元の設定のPodにリストアされます。 @@ -688,9 +688,9 @@ StatefulSet内のPodのコンテナイメージの詳細を取得します。 for p in 0 1 2; do kubectl get pod "web-$p" --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}'; echo; done ``` ``` -k8s.gcr.io/nginx-slim:0.7 -k8s.gcr.io/nginx-slim:0.7 -k8s.gcr.io/nginx-slim:0.7 +registry.k8s.io/nginx-slim:0.7 +registry.k8s.io/nginx-slim:0.7 +registry.k8s.io/nginx-slim:0.7 ``` `partition`を`0`に移動することで、StatefulSetがアップデート処理を続けられるようにできます。 diff --git a/content/ja/examples/admin/cloud/ccm-example.yaml b/content/ja/examples/admin/cloud/ccm-example.yaml index 96b78331744c1..6f3d115993c90 100644 --- a/content/ja/examples/admin/cloud/ccm-example.yaml +++ b/content/ja/examples/admin/cloud/ccm-example.yaml @@ -42,9 +42,9 @@ spec: serviceAccountName: cloud-controller-manager containers: - name: cloud-controller-manager - # for in-tree providers we use k8s.gcr.io/cloud-controller-manager + # for in-tree providers we use registry.k8s.io/cloud-controller-manager # this can be replaced with any other image for out-of-tree providers - image: k8s.gcr.io/cloud-controller-manager:v1.8.0 + image: registry.k8s.io/cloud-controller-manager:v1.8.0 command: - /usr/local/bin/cloud-controller-manager - --cloud-provider= # Add your own cloud provider here! diff --git a/content/ja/examples/admin/dns/dns-horizontal-autoscaler.yaml b/content/ja/examples/admin/dns/dns-horizontal-autoscaler.yaml index 5e6d55a6b280a..fe50976460dbb 100644 --- a/content/ja/examples/admin/dns/dns-horizontal-autoscaler.yaml +++ b/content/ja/examples/admin/dns/dns-horizontal-autoscaler.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: autoscaler - image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.1.1 + image: registry.k8s.io/cluster-proportional-autoscaler-amd64:1.1.1 resources: requests: cpu: "20m" diff --git a/content/ja/examples/admin/logging/two-files-counter-pod-agent-sidecar.yaml b/content/ja/examples/admin/logging/two-files-counter-pod-agent-sidecar.yaml index b37b616e6f7c7..1053cac577292 100644 --- a/content/ja/examples/admin/logging/two-files-counter-pod-agent-sidecar.yaml +++ b/content/ja/examples/admin/logging/two-files-counter-pod-agent-sidecar.yaml @@ -22,7 +22,7 @@ spec: - name: varlog mountPath: /var/log - name: count-agent - image: k8s.gcr.io/fluentd-gcp:1.30 + image: registry.k8s.io/fluentd-gcp:1.30 env: - name: FLUENTD_ARGS value: -c /etc/fluentd-config/fluentd.conf diff --git a/content/ja/examples/admin/sched/pod1.yaml b/content/ja/examples/admin/sched/pod1.yaml index 560b6aa0fb34a..7183dd62c0f12 100644 --- a/content/ja/examples/admin/sched/pod1.yaml +++ b/content/ja/examples/admin/sched/pod1.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: pod-with-no-annotation-container - image: k8s.gcr.io/pause:2.0 \ No newline at end of file + image: registry.k8s.io/pause:2.0 \ No newline at end of file diff --git a/content/ja/examples/admin/sched/pod2.yaml b/content/ja/examples/admin/sched/pod2.yaml index 2f065efe65fee..b78ab64a4bc4a 100644 --- a/content/ja/examples/admin/sched/pod2.yaml +++ b/content/ja/examples/admin/sched/pod2.yaml @@ -8,4 +8,4 @@ spec: schedulerName: default-scheduler containers: - name: pod-with-default-annotation-container - image: k8s.gcr.io/pause:2.0 + image: registry.k8s.io/pause:2.0 diff --git a/content/ja/examples/admin/sched/pod3.yaml b/content/ja/examples/admin/sched/pod3.yaml index a1b8db32008c6..661414382913f 100644 --- a/content/ja/examples/admin/sched/pod3.yaml +++ b/content/ja/examples/admin/sched/pod3.yaml @@ -8,4 +8,4 @@ spec: schedulerName: my-scheduler containers: - name: pod-with-second-annotation-container - image: k8s.gcr.io/pause:2.0 + image: registry.k8s.io/pause:2.0 diff --git a/content/ja/examples/application/guestbook/redis-master-deployment.yaml b/content/ja/examples/application/guestbook/redis-master-deployment.yaml index fc6f418c39ed1..c7b12f8ed5474 100644 --- a/content/ja/examples/application/guestbook/redis-master-deployment.yaml +++ b/content/ja/examples/application/guestbook/redis-master-deployment.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e # or just image: redis + image: registry.k8s.io/redis:e2e # or just image: redis resources: requests: cpu: 100m diff --git a/content/ja/examples/application/php-apache.yaml b/content/ja/examples/application/php-apache.yaml index e8e1b5aeb43e2..d29d2b91593f3 100644 --- a/content/ja/examples/application/php-apache.yaml +++ b/content/ja/examples/application/php-apache.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: php-apache - image: k8s.gcr.io/hpa-example + image: registry.k8s.io/hpa-example ports: - containerPort: 80 resources: diff --git a/content/ja/examples/application/web/web-parallel.yaml b/content/ja/examples/application/web/web-parallel.yaml index 4eab2dc206651..a6633f476c133 100644 --- a/content/ja/examples/application/web/web-parallel.yaml +++ b/content/ja/examples/application/web/web-parallel.yaml @@ -30,7 +30,7 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx-slim:0.8 + image: registry.k8s.io/nginx-slim:0.8 ports: - containerPort: 80 name: web diff --git a/content/ja/examples/application/web/web.yaml b/content/ja/examples/application/web/web.yaml index 37c1fabf9c502..95244cd72b8ab 100644 --- a/content/ja/examples/application/web/web.yaml +++ b/content/ja/examples/application/web/web.yaml @@ -29,7 +29,7 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx-slim:0.8 + image: registry.k8s.io/nginx-slim:0.8 ports: - containerPort: 80 name: web diff --git a/content/ja/examples/application/zookeeper/zookeeper.yaml b/content/ja/examples/application/zookeeper/zookeeper.yaml index 4afa806a5412b..4037f83dc86d7 100644 --- a/content/ja/examples/application/zookeeper/zookeeper.yaml +++ b/content/ja/examples/application/zookeeper/zookeeper.yaml @@ -68,7 +68,7 @@ spec: containers: - name: kubernetes-zookeeper imagePullPolicy: Always - image: "k8s.gcr.io/kubernetes-zookeeper:1.0-3.4.10" + image: "registry.k8s.io/kubernetes-zookeeper:1.0-3.4.10" resources: requests: memory: "1Gi" diff --git a/content/ja/examples/debug/event-exporter.yaml b/content/ja/examples/debug/event-exporter.yaml index 64a585b9a5376..7d2fe2791ac9a 100644 --- a/content/ja/examples/debug/event-exporter.yaml +++ b/content/ja/examples/debug/event-exporter.yaml @@ -41,7 +41,7 @@ spec: serviceAccountName: event-exporter-sa containers: - name: event-exporter - image: k8s.gcr.io/event-exporter:v0.2.3 + image: registry.k8s.io/event-exporter:v0.2.3 command: - '/event-exporter' terminationGracePeriodSeconds: 30 diff --git a/content/ja/examples/debug/fluentd-gcp-ds.yaml b/content/ja/examples/debug/fluentd-gcp-ds.yaml index 4ffd5c0093130..3e4f87f55e096 100644 --- a/content/ja/examples/debug/fluentd-gcp-ds.yaml +++ b/content/ja/examples/debug/fluentd-gcp-ds.yaml @@ -30,7 +30,7 @@ spec: dnsPolicy: Default containers: - name: fluentd-gcp - image: k8s.gcr.io/fluentd-gcp:2.0.2 + image: registry.k8s.io/fluentd-gcp:2.0.2 # If fluentd consumes its own logs, the following situation may happen: # fluentd fails to send a chunk to the server => writes it to the log => # tries to send this message to the server => fails to send a chunk and so on. diff --git a/content/ja/examples/debug/node-problem-detector-configmap.yaml b/content/ja/examples/debug/node-problem-detector-configmap.yaml index 654d35106a9e3..46bf1ea668a4c 100644 --- a/content/ja/examples/debug/node-problem-detector-configmap.yaml +++ b/content/ja/examples/debug/node-problem-detector-configmap.yaml @@ -23,7 +23,7 @@ spec: hostNetwork: true containers: - name: node-problem-detector - image: k8s.gcr.io/node-problem-detector:v0.1 + image: registry.k8s.io/node-problem-detector:v0.1 securityContext: privileged: true resources: diff --git a/content/ja/examples/debug/node-problem-detector.yaml b/content/ja/examples/debug/node-problem-detector.yaml index 6ffa19bcc3a0f..f106c327efc8b 100644 --- a/content/ja/examples/debug/node-problem-detector.yaml +++ b/content/ja/examples/debug/node-problem-detector.yaml @@ -23,7 +23,7 @@ spec: hostNetwork: true containers: - name: node-problem-detector - image: k8s.gcr.io/node-problem-detector:v0.1 + image: registry.k8s.io/node-problem-detector:v0.1 securityContext: privileged: true resources: diff --git a/content/ja/examples/pods/inject/dapi-envars-container.yaml b/content/ja/examples/pods/inject/dapi-envars-container.yaml index 55bd4dd263a00..4267053a069a0 100644 --- a/content/ja/examples/pods/inject/dapi-envars-container.yaml +++ b/content/ja/examples/pods/inject/dapi-envars-container.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: k8s.gcr.io/busybox:1.24 + image: registry.k8s.io/busybox:1.24 command: [ "sh", "-c"] args: - while true; do diff --git a/content/ja/examples/pods/inject/dapi-envars-pod.yaml b/content/ja/examples/pods/inject/dapi-envars-pod.yaml index 071fa82bb3b26..d5a646e087798 100644 --- a/content/ja/examples/pods/inject/dapi-envars-pod.yaml +++ b/content/ja/examples/pods/inject/dapi-envars-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: k8s.gcr.io/busybox + image: registry.k8s.io/busybox command: [ "sh", "-c"] args: - while true; do diff --git a/content/ja/examples/pods/inject/dapi-volume-resources.yaml b/content/ja/examples/pods/inject/dapi-volume-resources.yaml index ee9677bec4307..9162b602f87a3 100644 --- a/content/ja/examples/pods/inject/dapi-volume-resources.yaml +++ b/content/ja/examples/pods/inject/dapi-volume-resources.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: client-container - image: k8s.gcr.io/busybox:1.24 + image: registry.k8s.io/busybox:1.24 command: ["sh", "-c"] args: - while true; do diff --git a/content/ja/examples/pods/inject/dapi-volume.yaml b/content/ja/examples/pods/inject/dapi-volume.yaml index e7515afba5829..78bad5e001a25 100644 --- a/content/ja/examples/pods/inject/dapi-volume.yaml +++ b/content/ja/examples/pods/inject/dapi-volume.yaml @@ -12,7 +12,7 @@ metadata: spec: containers: - name: client-container - image: k8s.gcr.io/busybox + image: registry.k8s.io/busybox command: ["sh", "-c"] args: - while true; do diff --git a/content/ja/examples/pods/pod-configmap-env-var-valueFrom.yaml b/content/ja/examples/pods/pod-configmap-env-var-valueFrom.yaml index a72b4335ce3b0..c5c66daea1d8f 100644 --- a/content/ja/examples/pods/pod-configmap-env-var-valueFrom.yaml +++ b/content/ja/examples/pods/pod-configmap-env-var-valueFrom.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: k8s.gcr.io/busybox + image: registry.k8s.io/busybox command: [ "/bin/sh", "-c", "echo $(SPECIAL_LEVEL_KEY) $(SPECIAL_TYPE_KEY)" ] env: - name: SPECIAL_LEVEL_KEY diff --git a/content/ja/examples/pods/pod-configmap-envFrom.yaml b/content/ja/examples/pods/pod-configmap-envFrom.yaml index 70ae7e5bcfaf9..e7b5b60841edc 100644 --- a/content/ja/examples/pods/pod-configmap-envFrom.yaml +++ b/content/ja/examples/pods/pod-configmap-envFrom.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: k8s.gcr.io/busybox + image: registry.k8s.io/busybox command: [ "/bin/sh", "-c", "env" ] envFrom: - configMapRef: diff --git a/content/ja/examples/pods/pod-configmap-volume-specific-key.yaml b/content/ja/examples/pods/pod-configmap-volume-specific-key.yaml index 72e38fd83635c..ec7a8fb541cf0 100644 --- a/content/ja/examples/pods/pod-configmap-volume-specific-key.yaml +++ b/content/ja/examples/pods/pod-configmap-volume-specific-key.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: k8s.gcr.io/busybox + image: registry.k8s.io/busybox command: [ "/bin/sh","-c","cat /etc/config/keys" ] volumeMounts: - name: config-volume diff --git a/content/ja/examples/pods/pod-configmap-volume.yaml b/content/ja/examples/pods/pod-configmap-volume.yaml index 10bc581ce6c66..aa4829aebaccd 100644 --- a/content/ja/examples/pods/pod-configmap-volume.yaml +++ b/content/ja/examples/pods/pod-configmap-volume.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: k8s.gcr.io/busybox + image: registry.k8s.io/busybox command: [ "/bin/sh", "-c", "ls /etc/config/" ] volumeMounts: - name: config-volume diff --git a/content/ja/examples/pods/pod-multiple-configmap-env-variable.yaml b/content/ja/examples/pods/pod-multiple-configmap-env-variable.yaml index 4790a9c661c84..c7b2b7abb8217 100644 --- a/content/ja/examples/pods/pod-multiple-configmap-env-variable.yaml +++ b/content/ja/examples/pods/pod-multiple-configmap-env-variable.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: k8s.gcr.io/busybox + image: registry.k8s.io/busybox command: [ "/bin/sh", "-c", "env" ] env: - name: SPECIAL_LEVEL_KEY diff --git a/content/ja/examples/pods/pod-single-configmap-env-variable.yaml b/content/ja/examples/pods/pod-single-configmap-env-variable.yaml index 83f6a02b88fce..db121fdc20959 100644 --- a/content/ja/examples/pods/pod-single-configmap-env-variable.yaml +++ b/content/ja/examples/pods/pod-single-configmap-env-variable.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: k8s.gcr.io/busybox + image: registry.k8s.io/busybox command: [ "/bin/sh", "-c", "env" ] env: # 環境変数を定義します diff --git a/content/ja/examples/pods/pod-with-node-affinity.yaml b/content/ja/examples/pods/pod-with-node-affinity.yaml index 253d2b21ea917..549546dbf396d 100644 --- a/content/ja/examples/pods/pod-with-node-affinity.yaml +++ b/content/ja/examples/pods/pod-with-node-affinity.yaml @@ -23,4 +23,4 @@ spec: - another-node-label-value containers: - name: with-node-affinity - image: k8s.gcr.io/pause:2.0 \ No newline at end of file + image: registry.k8s.io/pause:2.0 \ No newline at end of file diff --git a/content/ja/examples/pods/pod-with-pod-affinity.yaml b/content/ja/examples/pods/pod-with-pod-affinity.yaml index e3f38f1dd546c..f5297b2656381 100644 --- a/content/ja/examples/pods/pod-with-pod-affinity.yaml +++ b/content/ja/examples/pods/pod-with-pod-affinity.yaml @@ -26,4 +26,4 @@ spec: topologyKey: kubernetes.io/hostname containers: - name: with-pod-affinity - image: k8s.gcr.io/pause:2.0 + image: registry.k8s.io/pause:2.0 diff --git a/content/ja/examples/pods/probe/exec-liveness.yaml b/content/ja/examples/pods/probe/exec-liveness.yaml index 6a9c9b3213718..7d6ca96b3d611 100644 --- a/content/ja/examples/pods/probe/exec-liveness.yaml +++ b/content/ja/examples/pods/probe/exec-liveness.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: liveness - image: k8s.gcr.io/busybox + image: registry.k8s.io/busybox args: - /bin/sh - -c diff --git a/content/ja/examples/pods/probe/http-liveness.yaml b/content/ja/examples/pods/probe/http-liveness.yaml index 23d37b480a06e..92e2fc5d967b7 100644 --- a/content/ja/examples/pods/probe/http-liveness.yaml +++ b/content/ja/examples/pods/probe/http-liveness.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: liveness - image: k8s.gcr.io/liveness + image: registry.k8s.io/liveness args: - /server livenessProbe: diff --git a/content/ja/examples/pods/probe/tcp-liveness-readiness.yaml b/content/ja/examples/pods/probe/tcp-liveness-readiness.yaml index 08fb77ff0f58c..ef8a2f9500b00 100644 --- a/content/ja/examples/pods/probe/tcp-liveness-readiness.yaml +++ b/content/ja/examples/pods/probe/tcp-liveness-readiness.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: goproxy - image: k8s.gcr.io/goproxy:0.1 + image: registry.k8s.io/goproxy:0.1 ports: - containerPort: 8080 readinessProbe: From f4ac392cc09ba87bb56ff1e3151f02ce3686412f Mon Sep 17 00:00:00 2001 From: Tim Bannister Date: Fri, 3 Feb 2023 15:57:57 +0000 Subject: [PATCH 2/2] Update example manifests for Japanese Related to registry change, but also adopting any other changes from English upstream. --- .../ja/examples/admin/cloud/ccm-example.yaml | 14 ++-- .../admin/dns/dns-horizontal-autoscaler.yaml | 68 +++++++++++++++++-- .../two-files-counter-pod-agent-sidecar.yaml | 2 +- .../ja/examples/application/php-apache.yaml | 1 - .../application/zookeeper/zookeeper.yaml | 4 +- .../pods/inject/dapi-volume-resources.yaml | 1 - .../ja/examples/pods/inject/dapi-volume.yaml | 1 - .../pods/pod-configmap-env-var-valueFrom.yaml | 2 +- .../examples/pods/pod-with-node-affinity.yaml | 6 +- .../examples/pods/pod-with-pod-affinity.yaml | 2 +- .../ja/examples/pods/probe/http-liveness.yaml | 2 +- 11 files changed, 79 insertions(+), 24 deletions(-) diff --git a/content/ja/examples/admin/cloud/ccm-example.yaml b/content/ja/examples/admin/cloud/ccm-example.yaml index 6f3d115993c90..91b7ef2b8944f 100644 --- a/content/ja/examples/admin/cloud/ccm-example.yaml +++ b/content/ja/examples/admin/cloud/ccm-example.yaml @@ -1,4 +1,4 @@ -# This is an example of how to setup cloud-controller-manager as a Daemonset in your cluster. +# This is an example of how to set up cloud-controller-manager as a Daemonset in your cluster. # It assumes that your masters can run pods and has the role node-role.kubernetes.io/master # Note that this Daemonset will not work straight out of the box for your cloud, this is # meant to be a guideline. @@ -10,8 +10,8 @@ metadata: name: cloud-controller-manager namespace: kube-system --- -kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding metadata: name: system:cloud-controller-manager roleRef: @@ -47,7 +47,7 @@ spec: image: registry.k8s.io/cloud-controller-manager:v1.8.0 command: - /usr/local/bin/cloud-controller-manager - - --cloud-provider= # Add your own cloud provider here! + - --cloud-provider=[YOUR_CLOUD_PROVIDER] # Add your own cloud provider here! - --leader-elect=true - --use-service-account-credentials # these flags will vary for every cloud provider @@ -59,9 +59,13 @@ spec: - key: node.cloudprovider.kubernetes.io/uninitialized value: "true" effect: NoSchedule - # this is to have the daemonset runnable on master nodes - # the taint may vary depending on your cluster setup + # these tolerations are to have the daemonset runnable on control plane nodes + # remove them if your control plane nodes should not run pods + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule - key: node-role.kubernetes.io/master + operator: Exists effect: NoSchedule # this is to restrict CCM to only run on master nodes # the node selector may vary depending on your cluster setup diff --git a/content/ja/examples/admin/dns/dns-horizontal-autoscaler.yaml b/content/ja/examples/admin/dns/dns-horizontal-autoscaler.yaml index fe50976460dbb..3182fed3c8052 100644 --- a/content/ja/examples/admin/dns/dns-horizontal-autoscaler.yaml +++ b/content/ja/examples/admin/dns/dns-horizontal-autoscaler.yaml @@ -1,22 +1,71 @@ +kind: ServiceAccount +apiVersion: v1 +metadata: + name: kube-dns-autoscaler + namespace: kube-system +--- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: system:kube-dns-autoscaler +rules: + - apiGroups: [""] + resources: ["nodes"] + verbs: ["list", "watch"] + - apiGroups: [""] + resources: ["replicationcontrollers/scale"] + verbs: ["get", "update"] + - apiGroups: ["apps"] + resources: ["deployments/scale", "replicasets/scale"] + verbs: ["get", "update"] +# Remove the configmaps rule once below issue is fixed: +# kubernetes-incubator/cluster-proportional-autoscaler#16 + - apiGroups: [""] + resources: ["configmaps"] + verbs: ["get", "create"] +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: system:kube-dns-autoscaler +subjects: + - kind: ServiceAccount + name: kube-dns-autoscaler + namespace: kube-system +roleRef: + kind: ClusterRole + name: system:kube-dns-autoscaler + apiGroup: rbac.authorization.k8s.io + +--- apiVersion: apps/v1 kind: Deployment metadata: - name: dns-autoscaler + name: kube-dns-autoscaler namespace: kube-system labels: - k8s-app: dns-autoscaler + k8s-app: kube-dns-autoscaler + kubernetes.io/cluster-service: "true" spec: selector: matchLabels: - k8s-app: dns-autoscaler + k8s-app: kube-dns-autoscaler template: metadata: labels: - k8s-app: dns-autoscaler + k8s-app: kube-dns-autoscaler spec: + priorityClassName: system-cluster-critical + securityContext: + seccompProfile: + type: RuntimeDefault + supplementalGroups: [ 65534 ] + fsGroup: 65534 + nodeSelector: + kubernetes.io/os: linux containers: - name: autoscaler - image: registry.k8s.io/cluster-proportional-autoscaler-amd64:1.1.1 + image: registry.k8s.io/cpa/cluster-proportional-autoscaler:1.8.4 resources: requests: cpu: "20m" @@ -24,10 +73,15 @@ spec: command: - /cluster-proportional-autoscaler - --namespace=kube-system - - --configmap=dns-autoscaler + - --configmap=kube-dns-autoscaler + # Should keep target in sync with cluster/addons/dns/kube-dns.yaml.base - --target= # When cluster is using large nodes(with more cores), "coresPerReplica" should dominate. # If using small nodes, "nodesPerReplica" should dominate. - - --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"min":1}} + - --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true,"includeUnschedulableNodes":true}} - --logtostderr=true - --v=2 + tolerations: + - key: "CriticalAddonsOnly" + operator: "Exists" + serviceAccountName: kube-dns-autoscaler diff --git a/content/ja/examples/admin/logging/two-files-counter-pod-agent-sidecar.yaml b/content/ja/examples/admin/logging/two-files-counter-pod-agent-sidecar.yaml index 1053cac577292..a621a9fb2acce 100644 --- a/content/ja/examples/admin/logging/two-files-counter-pod-agent-sidecar.yaml +++ b/content/ja/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/ja/examples/application/php-apache.yaml b/content/ja/examples/application/php-apache.yaml index d29d2b91593f3..a194dce6f958a 100644 --- a/content/ja/examples/application/php-apache.yaml +++ b/content/ja/examples/application/php-apache.yaml @@ -6,7 +6,6 @@ spec: selector: matchLabels: run: php-apache - replicas: 1 template: metadata: labels: diff --git a/content/ja/examples/application/zookeeper/zookeeper.yaml b/content/ja/examples/application/zookeeper/zookeeper.yaml index 4037f83dc86d7..0f3f6cf9d1858 100644 --- a/content/ja/examples/application/zookeeper/zookeeper.yaml +++ b/content/ja/examples/application/zookeeper/zookeeper.yaml @@ -27,7 +27,7 @@ spec: selector: app: zk --- -apiVersion: policy/v1beta1 +apiVersion: policy/v1 kind: PodDisruptionBudget metadata: name: zk-pdb @@ -49,7 +49,7 @@ spec: replicas: 3 updateStrategy: type: RollingUpdate - podManagementPolicy: Parallel + podManagementPolicy: OrderedReady template: metadata: labels: diff --git a/content/ja/examples/pods/inject/dapi-volume-resources.yaml b/content/ja/examples/pods/inject/dapi-volume-resources.yaml index 9162b602f87a3..5b52bf8448f3c 100644 --- a/content/ja/examples/pods/inject/dapi-volume-resources.yaml +++ b/content/ja/examples/pods/inject/dapi-volume-resources.yaml @@ -30,7 +30,6 @@ spec: volumeMounts: - name: podinfo mountPath: /etc/podinfo - readOnly: false volumes: - name: podinfo downwardAPI: diff --git a/content/ja/examples/pods/inject/dapi-volume.yaml b/content/ja/examples/pods/inject/dapi-volume.yaml index 78bad5e001a25..682098d27f392 100644 --- a/content/ja/examples/pods/inject/dapi-volume.yaml +++ b/content/ja/examples/pods/inject/dapi-volume.yaml @@ -25,7 +25,6 @@ spec: volumeMounts: - name: podinfo mountPath: /etc/podinfo - readOnly: false volumes: - name: podinfo downwardAPI: diff --git a/content/ja/examples/pods/pod-configmap-env-var-valueFrom.yaml b/content/ja/examples/pods/pod-configmap-env-var-valueFrom.yaml index c5c66daea1d8f..fa172abd37135 100644 --- a/content/ja/examples/pods/pod-configmap-env-var-valueFrom.yaml +++ b/content/ja/examples/pods/pod-configmap-env-var-valueFrom.yaml @@ -6,7 +6,7 @@ spec: containers: - name: test-container image: registry.k8s.io/busybox - command: [ "/bin/sh", "-c", "echo $(SPECIAL_LEVEL_KEY) $(SPECIAL_TYPE_KEY)" ] + command: [ "/bin/echo", "$(SPECIAL_LEVEL_KEY) $(SPECIAL_TYPE_KEY)" ] env: - name: SPECIAL_LEVEL_KEY valueFrom: diff --git a/content/ja/examples/pods/pod-with-node-affinity.yaml b/content/ja/examples/pods/pod-with-node-affinity.yaml index 549546dbf396d..5fedc554bfdd4 100644 --- a/content/ja/examples/pods/pod-with-node-affinity.yaml +++ b/content/ja/examples/pods/pod-with-node-affinity.yaml @@ -8,11 +8,11 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: kubernetes.io/e2e-az-name + - key: topology.kubernetes.io/zone operator: In values: - - e2e-az1 - - e2e-az2 + - antarctica-east1 + - antarctica-west1 preferredDuringSchedulingIgnoredDuringExecution: - weight: 1 preference: diff --git a/content/ja/examples/pods/pod-with-pod-affinity.yaml b/content/ja/examples/pods/pod-with-pod-affinity.yaml index f5297b2656381..1a4fd74fd7aa9 100644 --- a/content/ja/examples/pods/pod-with-pod-affinity.yaml +++ b/content/ja/examples/pods/pod-with-pod-affinity.yaml @@ -23,7 +23,7 @@ spec: operator: In values: - S2 - topologyKey: kubernetes.io/hostname + topologyKey: topology.kubernetes.io/zone containers: - name: with-pod-affinity image: registry.k8s.io/pause:2.0 diff --git a/content/ja/examples/pods/probe/http-liveness.yaml b/content/ja/examples/pods/probe/http-liveness.yaml index 92e2fc5d967b7..48ca861c14271 100644 --- a/content/ja/examples/pods/probe/http-liveness.yaml +++ b/content/ja/examples/pods/probe/http-liveness.yaml @@ -15,7 +15,7 @@ spec: path: /healthz port: 8080 httpHeaders: - - name: X-Custom-Header + - name: Custom-Header value: Awesome initialDelaySeconds: 3 periodSeconds: 3