Skip to content

Commit c7a0cb0

Browse files
authored
Merge pull request #39247 from sftim/20230303_new_reg_ja
[ja] Replace k8s.gcr.io with registry.k8s.io
2 parents ebea533 + f4ac392 commit c7a0cb0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+150
-95
lines changed

content/ja/docs/concepts/configuration/manage-resources-containers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ Conditions:
601601
Events:
602602
FirstSeen LastSeen Count From SubobjectPath Reason Message
603603
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
604-
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
604+
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
605605
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
606606
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
607607
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

content/ja/docs/concepts/configuration/secret.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ metadata:
779779
spec:
780780
containers:
781781
- name: test-container
782-
image: k8s.gcr.io/busybox
782+
image: registry.k8s.io/busybox
783783
command: [ "/bin/sh", "-c", "env" ]
784784
envFrom:
785785
- secretRef:
@@ -994,7 +994,7 @@ spec:
994994
secretName: dotfile-secret
995995
containers:
996996
- name: dotfile-test-container
997-
image: k8s.gcr.io/busybox
997+
image: registry.k8s.io/busybox
998998
command:
999999
- ls
10001000
- "-l"

content/ja/docs/concepts/overview/working-with-objects/labels.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ metadata:
130130
spec:
131131
containers:
132132
- name: cuda-test
133-
image: "k8s.gcr.io/cuda-vector-add:v0.1"
133+
image: "registry.k8s.io/cuda-vector-add:v0.1"
134134
resources:
135135
limits:
136136
nvidia.com/gpu: 1

content/ja/docs/concepts/storage/persistent-volumes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ spec:
154154
path: /any/path/it/will/be/replaced
155155
containers:
156156
- name: pv-recycler
157-
image: "k8s.gcr.io/busybox"
157+
image: "registry.k8s.io/busybox"
158158
command: ["/bin/sh", "-c", "test -e /scrub && rm -rf /scrub/..?* /scrub/.[!.]* /scrub/* && test -z \"$(ls -A /scrub)\" || exit 1"]
159159
volumeMounts:
160160
- name: vol

content/ja/docs/concepts/storage/volumes.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ metadata:
7676
name: test-ebs
7777
spec:
7878
containers:
79-
- image: k8s.gcr.io/test-webserver
79+
- image: registry.k8s.io/test-webserver
8080
name: test-container
8181
volumeMounts:
8282
- mountPath: /test-ebs
@@ -163,7 +163,7 @@ metadata:
163163
name: test-cinder
164164
spec:
165165
containers:
166-
- image: k8s.gcr.io/test-webserver
166+
- image: registry.k8s.io/test-webserver
167167
name: test-cinder-container
168168
volumeMounts:
169169
- mountPath: /test-cinder
@@ -274,7 +274,7 @@ metadata:
274274
name: test-pd
275275
spec:
276276
containers:
277-
- image: k8s.gcr.io/test-webserver
277+
- image: registry.k8s.io/test-webserver
278278
name: test-container
279279
volumeMounts:
280280
- mountPath: /cache
@@ -349,7 +349,7 @@ metadata:
349349
name: test-pd
350350
spec:
351351
containers:
352-
- image: k8s.gcr.io/test-webserver
352+
- image: registry.k8s.io/test-webserver
353353
name: test-container
354354
volumeMounts:
355355
- mountPath: /test-pd
@@ -507,7 +507,7 @@ metadata:
507507
name: test-pd
508508
spec:
509509
containers:
510-
- image: k8s.gcr.io/test-webserver
510+
- image: registry.k8s.io/test-webserver
511511
name: test-container
512512
volumeMounts:
513513
- mountPath: /test-pd
@@ -536,7 +536,7 @@ metadata:
536536
spec:
537537
containers:
538538
- name: test-webserver
539-
image: k8s.gcr.io/test-webserver:latest
539+
image: registry.k8s.io/test-webserver:latest
540540
volumeMounts:
541541
- mountPath: /var/local/aaa
542542
name: mydir
@@ -666,7 +666,7 @@ metadata:
666666
name: test-portworx-volume-pod
667667
spec:
668668
containers:
669-
- image: k8s.gcr.io/test-webserver
669+
- image: registry.k8s.io/test-webserver
670670
name: test-container
671671
volumeMounts:
672672
- mountPath: /mnt
@@ -848,7 +848,7 @@ metadata:
848848
name: test-vmdk
849849
spec:
850850
containers:
851-
- image: k8s.gcr.io/test-webserver
851+
- image: registry.k8s.io/test-webserver
852852
name: test-container
853853
volumeMounts:
854854
- mountPath: /test-vmdk

content/ja/docs/concepts/workloads/controllers/statefulset.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ spec:
7272
terminationGracePeriodSeconds: 10
7373
containers:
7474
- name: nginx
75-
image: k8s.gcr.io/nginx-slim:0.8
75+
image: registry.k8s.io/nginx-slim:0.8
7676
ports:
7777
- containerPort: 80
7878
name: web

content/ja/docs/reference/kubectl/cheatsheet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,8 @@ kubectl api-resources --api-group=extensions # "extensions" APIグループの
359359
# クラスター内で実行中のすべてのイメージ名を表示する
360360
kubectl get pods -A -o=custom-columns='DATA:spec.containers[*].image'
361361

362-
# "k8s.gcr.io/coredns:1.6.2"を除いたすべてのイメージ名を表示する
363-
kubectl get pods -A -o=custom-columns='DATA:spec.containers[?(@.image!="k8s.gcr.io/coredns:1.6.2")].image'
362+
# "registry.k8s.io/coredns:1.6.2"を除いたすべてのイメージ名を表示する
363+
kubectl get pods -A -o=custom-columns='DATA:spec.containers[?(@.image!="registry.k8s.io/coredns:1.6.2")].image'
364364

365365
# 名前に関係なくmetadata以下のすべてのフィールドを表示する
366366
kubectl get pods -A -o=custom-columns='DATA:metadata.*'

content/ja/docs/setup/learning-environment/minikube.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ MinikubeのサポートするKubernetesの機能:
5454
単純なHTTPサーバーである`echoserver`という既存のイメージを使用して、Kubernetes Deploymentを作りましょう。そして`--port`を使用して8080番ポートで公開しましょう。
5555

5656
```shell
57-
kubectl create deployment hello-minikube --image=k8s.gcr.io/echoserver:1.10
57+
kubectl create deployment hello-minikube --image=registry.k8s.io/echoserver:1.10
5858
```
5959

6060
出力はこのようになります:

content/ja/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ when using kubeadm to set up a kubernetes cluster.
3030
document assumes these default ports. However, they are configurable through
3131
the kubeadm config file.
3232
* Each host must [have docker, kubelet, and kubeadm installed](/ja/docs/setup/production-environment/tools/kubeadm/install-kubeadm/).
33-
* 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.
33+
* 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.
3434
* Some infrastructure to copy files between hosts. For example `ssh` and `scp`
3535
can satisfy this requirement.
3636

@@ -251,7 +251,7 @@ this example.
251251
```sh
252252
docker run --rm -it \
253253
--net host \
254-
-v /etc/kubernetes:/etc/kubernetes k8s.gcr.io/etcd:${ETCD_TAG} etcdctl \
254+
-v /etc/kubernetes:/etc/kubernetes registry.k8s.io/etcd:${ETCD_TAG} etcdctl \
255255
--cert /etc/kubernetes/pki/etcd/peer.crt \
256256
--key /etc/kubernetes/pki/etcd/peer.key \
257257
--cacert /etc/kubernetes/pki/etcd/ca.crt \

content/ja/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Readiness Probeによるチェックを無効にし、これらがアプリケ
3636
長期間実行されているアプリケーションの多くは、再起動されるまで回復できないような異常な状態になることがあります。
3737
Kubernetesはこのような状況を検知し、回復するためのLiveness Probeを提供します。
3838

39-
この演習では、`k8s.gcr.io/busybox`イメージのコンテナを起動するPodを作成します。
39+
この演習では、`registry.k8s.io/busybox`イメージのコンテナを起動するPodを作成します。
4040
Podの構成ファイルは次の通りです。
4141

4242
{{< codenew file="pods/probe/exec-liveness.yaml" >}}
@@ -76,8 +76,8 @@ kubectl describe pod liveness-exec
7676
FirstSeen LastSeen Count From SubobjectPath Type Reason Message
7777
--------- -------- ----- ---- ------------- -------- ------ -------
7878
24s 24s 1 {default-scheduler } Normal Scheduled Successfully assigned liveness-exec to worker0
79-
23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Pulling pulling image "k8s.gcr.io/busybox"
80-
23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Pulled Successfully pulled image "k8s.gcr.io/busybox"
79+
23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Pulling pulling image "registry.k8s.io/busybox"
80+
23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Pulled Successfully pulled image "registry.k8s.io/busybox"
8181
23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Created Created container with docker id 86849c15382e; Security:[seccomp=unconfined]
8282
23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Started Started container with docker id 86849c15382e
8383
```
@@ -94,8 +94,8 @@ kubectl describe pod liveness-exec
9494
FirstSeen LastSeen Count From SubobjectPath Type Reason Message
9595
--------- -------- ----- ---- ------------- -------- ------ -------
9696
37s 37s 1 {default-scheduler } Normal Scheduled Successfully assigned liveness-exec to worker0
97-
36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Pulling pulling image "k8s.gcr.io/busybox"
98-
36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Pulled Successfully pulled image "k8s.gcr.io/busybox"
97+
36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Pulling pulling image "registry.k8s.io/busybox"
98+
36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Pulled Successfully pulled image "registry.k8s.io/busybox"
9999
36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Created Created container with docker id 86849c15382e; Security:[seccomp=unconfined]
100100
36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Started Started container with docker id 86849c15382e
101101
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
117117
## HTTPリクエストによるLiveness Probeを定義する {#define-a-liveness-http-request}
118118

119119
別の種類のLiveness Probeでは、HTTP GETリクエストを使用します。
120-
次の構成ファイルは、`k8s.gcr.io/liveness`イメージを使用したコンテナを起動するPodを作成します。
120+
次の構成ファイルは、`registry.k8s.io/liveness`イメージを使用したコンテナを起動するPodを作成します。
121121

122122
{{< codenew file="pods/probe/http-liveness.yaml" >}}
123123

0 commit comments

Comments
 (0)