Skip to content

Commit cedc775

Browse files
authored
Merge pull request #35485 from yanrongshi/zh-cn]zh-cn]sync-that-translate-compose-kubernetes.md
[zh-cn]Sync translate-compose-kubernetes.md
2 parents d4825f2 + 2d6288b commit cedc775

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

content/zh-cn/docs/tasks/configure-pod-container/translate-compose-kubernetes.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ Kompose 通过 GitHub 发布,发布周期为三星期。
5151

5252
```shell
5353
# Linux
54-
curl -L https://github.com/kubernetes/kompose/releases/download/v1.24.0/kompose-linux-amd64 -o kompose
54+
curl -L https://github.com/kubernetes/kompose/releases/download/v1.26.0/kompose-linux-amd64 -o kompose
5555

5656
# macOS
57-
curl -L https://github.com/kubernetes/kompose/releases/download/v1.24.0/kompose-darwin-amd64 -o kompose
57+
curl -L https://github.com/kubernetes/kompose/releases/download/v1.26.0/kompose-darwin-amd64 -o kompose
5858

5959
# Windows
60-
curl -L https://github.com/kubernetes/kompose/releases/download/v1.24.0/kompose-windows-amd64.exe -o kompose.exe
60+
curl -L https://github.com/kubernetes/kompose/releases/download/v1.26.0/kompose-windows-amd64.exe -o kompose.exe
6161

6262
chmod +x kompose
6363
sudo mv ./kompose /usr/local/bin/kompose
@@ -183,6 +183,11 @@ you need is an existing `docker-compose.yml` file.
183183
kompose convert
184184
```
185185

186+
<!--
187+
The output is similar to:
188+
-->
189+
输出类似于:
190+
186191
```none
187192
INFO Kubernetes file "frontend-service.yaml" created
188193
INFO Kubernetes file "frontend-service.yaml" created
@@ -205,7 +210,7 @@ you need is an existing `docker-compose.yml` file.
205210
```
206211

207212
```bash
208-
kubectl apply -f frontend-service.yaml,redis-master-service.yaml,redis-slave-service.yaml,frontend-deployment.yaml,
213+
kubectl apply -f frontend-service.yaml,redis-master-service.yaml,redis-slave-service.yaml,frontend-deployment.yaml,redis-master-deployment.yaml,redis-slave-deployment.yaml
209214
```
210215

211216
<!--
@@ -434,11 +439,11 @@ INFO OpenShift file "foo-buildconfig.yaml" created
434439
```
435440

436441
<!--
437-
If you are manually pushing the Openshift artifacts using ``oc create -f``, you need to ensure that you push the imagestream artifact before the buildconfig artifact, to workaround this Openshift issue: https://github.com/openshift/origin/issues/4518 .
442+
If you are manually pushing the Openshift artifacts using ``oc create -f``, you need to ensure that you push the imagestream artifact before the buildconfig artifact, to workaround this OpenShift issue: https://github.com/openshift/origin/issues/4518 .
438443
-->
439444
{{< note >}}
440-
如果使用 ``oc create -f`` 手动推送 Openshift 工件,则需要确保在构建配置工件之前推送
441-
imagestream 工件,以解决 Openshift 的这个问题: https://github.com/openshift/origin/issues/4518
445+
如果使用 ``oc create -f`` 手动推送 OpenShift 工件,则需要确保在构建配置工件之前推送
446+
imagestream 工件,以解决 OpenShift 的这个问题: https://github.com/openshift/origin/issues/4518
442447
{{< /note >}}
443448

444449
<!--
@@ -484,7 +489,7 @@ INFO Kubernetes file "web-replicationcontroller.yaml" created
484489
```
485490

486491
<!--
487-
The `*-replicationcontroller.yaml` files contain the Replication Controller objects. If you want to specify replicas (default is 1), use `--replicas` flag: `$ kompose convert --replication-controller --replicas 3`
492+
The `*-replicationcontroller.yaml` files contain the Replication Controller objects. If you want to specify replicas (default is 1), use `--replicas` flag: `kompose convert --replication-controller --replicas 3`
488493
-->
489494
`*-replicationcontroller.yaml` 文件包含 Replication Controller 对象。
490495
如果你想指定副本数(默认为 1),可以使用 `--replicas` 参数:
@@ -503,7 +508,7 @@ INFO Kubernetes file "web-daemonset.yaml" created
503508

504509
<!--
505510
The `*-daemonset.yaml` files contain the DaemonSet objects
506-
If you want to generate a Chart to be used with [Helm](https://github.com/kubernetes/helm) simply do:
511+
If you want to generate a Chart to be used with [Helm](https://github.com/kubernetes/helm) run:
507512
-->
508513
`*-daemonset.yaml` 文件包含 DaemonSet 对象。
509514

0 commit comments

Comments
 (0)