From ca31adc78c2d2958f9f80eeba90259f9924991f9 Mon Sep 17 00:00:00 2001 From: Daniel Nardo Date: Wed, 5 Jul 2017 13:02:30 -0700 Subject: [PATCH] Update ip-masq-agent docs: - adds the node label requirements to the steps for running ip-masq-agent - change the wording on when this is the default. --- docs/tasks/administer-cluster/ip-masq-agent.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/tasks/administer-cluster/ip-masq-agent.md b/docs/tasks/administer-cluster/ip-masq-agent.md index 9ed4987e48..325a8c6a1a 100644 --- a/docs/tasks/administer-cluster/ip-masq-agent.md +++ b/docs/tasks/administer-cluster/ip-masq-agent.md @@ -50,7 +50,7 @@ MASQUERADE all -- anywhere anywhere /* ip-masq-agent: ``` -By default, in GCE/GKE starting with Kubernetes version 1.7.0, the ip-masq-agent will run in your cluster. If you are running in another environment, you can add the ip-masq-agent [DaemonSet](/docs/concepts/workloads/controllers/daemonset/) to your cluster: +By default, in GCE/GKE starting with Kubernetes version 1.7.0, if network policy is enabled or you are using a cluster CIDR not in the 10.0.0.0/8 range, the ip-masq-agent will run in your cluster. If you are running in another environment, you can add the ip-masq-agent [DaemonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) to your cluster: {% endcapture %} @@ -63,6 +63,12 @@ To create an ip-masq-agent, run the following kubectl command: kubectl create -f https://raw.githubusercontent.com/kubernetes-incubator/ip-masq-agent/master/ip-masq-agent.yaml ` +You must also apply the appropriate node label to any nodes in your cluster that you want the agent to run on. + +` +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) 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".