Skip to content

Commit a669fd8

Browse files
authored
Merge pull request #32928 from mengjiao-liu/sync_configure-pod-configmap_zh
[zh]Reflect the changed behaviour for multiple use of --from-env-file in ConfigMap creation
2 parents 5c57cce + 32975b8 commit a669fd8

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

content/zh/docs/tasks/configure-pod-container/configure-pod-configmap.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ Use the option `--from-env-file` to create a ConfigMap from an env-file, for exa
327327
328328
# Download the sample files into `configure-pod-container/configmap/` directory
329329
wget https://kubernetes.io/examples/configmap/game-env-file.properties -O configure-pod-container/configmap/game-env-file.properties
330+
wget https://kubernetes.io/examples/configmap/ui-env-file.properties -O configure-pod-container/configmap/ui-env-file.properties
330331

331332
# The env-file `game-env-file.properties` looks like below
332333
cat configure-pod-container/configmap/game-env-file.properties
@@ -345,6 +346,7 @@ Env 文件包含环境变量列表。其中适用以下语法规则:
345346

346347
```shell
347348
wget https://kubernetes.io/examples/configmap/game-env-file.properties -O configure-pod-container/configmap/game-env-file.properties
349+
wget https://kubernetes.io/examples/configmap/ui-env-file.properties -O configure-pod-container/configmap/ui-env-file.properties
348350
```
349351

350352
Env 文件 `game-env-file.properties` 如下所示:
@@ -395,11 +397,10 @@ data:
395397
```
396398
397399
<!--
398-
When passing `--from-env-file` multiple times to create a ConfigMap from multiple data sources, only the last env-file is used:
400+
Starting with Kubernetes v1.23, `kubectl` supports the `--from-env-file` argument to be
401+
specified multiple times to create a ConfigMap from multiple data sources.
399402
-->
400-
{{< caution >}}
401-
当多次使用 `--from-env-file` 来从多个数据源创建 ConfigMap 时,仅仅最后一个 env 文件有效。
402-
{{< /caution >}}
403+
从 Kubernetes 1.23 版本开始,`kubectl` 支持多次指定 `--from-env-file` 参数来从多个数据源创建 ConfigMap。
403404

404405
<!--
405406
The behavior of passing `--from-env-file` multiple times is demonstrated by:
@@ -408,20 +409,12 @@ The behavior of passing `--from-env-file` multiple times is demonstrated by:
408409

409410
<!--
410411
```shell
411-
# Download the sample files into `configure-pod-container/configmap/` directory
412-
wget https://k8s.io/examples/configmap/ui-env-file.properties -O configure-pod-container/configmap/ui-env-file.properties
413-
414-
# Create the configmap
415412
kubectl create configmap config-multi-env-files \
416413
--from-env-file=configure-pod-container/configmap/game-env-file.properties \
417414
--from-env-file=configure-pod-container/configmap/ui-env-file.properties
418415
```
419416
-->
420417
```shell
421-
# 将示例文件下载到 `configure-pod-container/configmap/` 目录
422-
wget https://k8s.io/examples/configmap/ui-env-file.properties -O configure-pod-container/configmap/ui-env-file.properties
423-
424-
# 创建 ConfigMap
425418
kubectl create configmap config-multi-env-files \
426419
--from-env-file=configure-pod-container/configmap/game-env-file.properties \
427420
--from-env-file=configure-pod-container/configmap/ui-env-file.properties
@@ -452,8 +445,11 @@ metadata:
452445
selfLink: /api/v1/namespaces/default/configmaps/config-multi-env-files
453446
uid: 252c4572-eb35-11e7-887b-42010a8002b8
454447
data:
448+
allowed: '"true"'
455449
color: purple
450+
enemies: aliens
456451
how: fairlyNice
452+
lives: "3"
457453
textmode: "true"
458454
```
459455

0 commit comments

Comments
 (0)