Merge pull request #6854 from cimomo/docs-tasks-fixes

Fix references to ConfigMap for documents in the "Tasks" section
pull/6857/head
Qiming 2018-01-05 10:16:48 +08:00 committed by GitHub
commit e915ab79ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 9 deletions

View File

@ -149,7 +149,7 @@ service "frontend" created
**Note**: The nginx configuration is baked into the **Note**: The nginx configuration is baked into the
[container image](/docs/tasks/access-application-cluster/frontend/Dockerfile). [container image](/docs/tasks/access-application-cluster/frontend/Dockerfile).
A better way to do this would be to use a A better way to do this would be to use a
[ConfigMap](/docs/tasks/configure-pod-container/configmap/), so [ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/), so
that you can change the configuration more easily. that you can change the configuration more easily.
### Interact with the frontend Service ### Interact with the frontend Service
@ -197,7 +197,7 @@ The output shows the message generated by the backend:
{% capture whatsnext %} {% capture whatsnext %}
* Learn more about [Services](/docs/concepts/services-networking/service/) * Learn more about [Services](/docs/concepts/services-networking/service/)
* Learn more about [ConfigMaps](/docs/tasks/configure-pod-container/configmap/) * Learn more about [ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-configmap/)
{% endcapture %} {% endcapture %}

View File

@ -71,7 +71,7 @@ kubectl label nodes my-node beta.kubernetes.io/masq-agent-ds-ready=true
More information can be found in the ip-masq-agent documentation [here](https://github.com/kubernetes-incubator/ip-masq-agent) More information can be found in the ip-masq-agent documentation [here](https://github.com/kubernetes-incubator/ip-masq-agent)
In most cases, the default set of rules should be sufficient; however, if this is not the case for your cluster, you can create and apply a [ConfigMap](/docs/tasks/configure-pod-container/configmap/) to customize the IP ranges that are affected. For example, to allow only 10.0.0.0/8 to be considered by the ip-masq-agent, you can create the following [ConfigMap](/docs/tasks/configure-pod-container/configmap/) in a file called "config". In most cases, the default set of rules should be sufficient; however, if this is not the case for your cluster, you can create and apply a [ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/) to customize the IP ranges that are affected. For example, to allow only 10.0.0.0/8 to be considered by the ip-masq-agent, you can create the following [ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/) in a file called "config".
**Note:** It is important that the file is called config since, by default, that will be used as the key for lookup by the ip-masq-agent: **Note:** It is important that the file is called config since, by default, that will be used as the key for lookup by the ip-masq-agent:
``` ```

View File

@ -7,7 +7,7 @@ title: Federated ConfigMap
This guide explains how to use ConfigMaps in a Federation control plane. This guide explains how to use ConfigMaps in a Federation control plane.
Federated ConfigMaps are very similar to the traditional [Kubernetes Federated ConfigMaps are very similar to the traditional [Kubernetes
ConfigMaps](/docs/tasks/configure-pod-container/configmap/) and provide the same functionality. ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-configmap/) and provide the same functionality.
Creating them in the federation control plane ensures that they are synchronized Creating them in the federation control plane ensures that they are synchronized
across all the clusters in federation. across all the clusters in federation.
@ -18,7 +18,7 @@ across all the clusters in federation.
* {% include federated-task-tutorial-prereqs.md %} * {% include federated-task-tutorial-prereqs.md %}
* You should also have a basic * You should also have a basic
[working knowledge of Kubernetes](/docs/setup/pick-right-solution/) in [working knowledge of Kubernetes](/docs/setup/pick-right-solution/) in
general and [ConfigMaps](/docs/tasks/configure-pod-container/configmap/) in particular. general and [ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-configmap/) in particular.
{% endcapture %} {% endcapture %}

View File

@ -383,7 +383,7 @@ very charm
## Add ConfigMap data to a Volume ## Add ConfigMap data to a Volume
As explained in [Configure Containers Using a ConfigMap](/docs/tasks/configure-pod-container/configmap/), when you create a ConfigMap using ``--from-file``, the filename becomes a key stored in the `data` section of the ConfigMap. The file contents become the key's value. As explained in [Create ConfigMaps from files](#create-configmaps-from-files), when you create a ConfigMap using ``--from-file``, the filename becomes a key stored in the `data` section of the ConfigMap. The file contents become the key's value.
The examples in this section refer to a ConfigMap named special-config, shown below. The examples in this section refer to a ConfigMap named special-config, shown below.

View File

@ -120,7 +120,7 @@ Just create `node-problem-detector.yaml`, and put it under the addon pods direct
The [default configuration](https://github.com/kubernetes/node-problem-detector/tree/v0.1/config) The [default configuration](https://github.com/kubernetes/node-problem-detector/tree/v0.1/config)
is embedded when building the docker image of node problem detector. is embedded when building the docker image of node problem detector.
However, you can use [ConfigMap](/docs/tasks/configure-pod-container/configmap/) to overwrite it However, you can use [ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/) to overwrite it
following the steps: following the steps:
* **Step 1:** Change the config files in `config/`. * **Step 1:** Change the config files in `config/`.

View File

@ -73,7 +73,7 @@ you can define arguments by using environment variables:
This means you can define an argument for a Pod using any of This means you can define an argument for a Pod using any of
the techniques available for defining environment variables, including the techniques available for defining environment variables, including
[ConfigMaps](/docs/tasks/configure-pod-container/configmap/) [ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-configmap/)
and and
[Secrets](/docs/concepts/configuration/secret/). [Secrets](/docs/concepts/configuration/secret/).

View File

@ -31,7 +31,7 @@ on general patterns for running stateful applications in Kubernetes.
and [StatefulSets](/docs/concepts/workloads/controllers/statefulset/), and [StatefulSets](/docs/concepts/workloads/controllers/statefulset/),
as well as other core concepts like [Pods](/docs/concepts/workloads/pods/pod/), as well as other core concepts like [Pods](/docs/concepts/workloads/pods/pod/),
[Services](/docs/concepts/services-networking/service/), and [Services](/docs/concepts/services-networking/service/), and
[ConfigMaps](/docs/tasks/configure-pod-container/configmap/). [ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-configmap/).
* Some familiarity with MySQL helps, but this tutorial aims to present * Some familiarity with MySQL helps, but this tutorial aims to present
general patterns that should be useful for other systems. general patterns that should be useful for other systems.