Add pod subnet to non masquerade

Signed-off-by: Sylvain Rabot <[email protected]>
Azure · Aug 21, 2017 · 3f20ea2 · 3f20ea2
1 parent e79f87f
commit 3f20ea2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/parts/kubernetesagentcustomdata.yml b/parts/kubernetesagentcustomdata.yml
@@ -113,6 +113,7 @@ write_files:
     KUBE_CTRL_MGR_NODE_MONITOR_GRACE_PERIOD={{WrapAsVariable "kubernetesCtrlMgrNodeMonitorGracePeriod"}}
     KUBE_CTRL_MGR_POD_EVICTION_TIMEOUT={{WrapAsVariable "kubernetesCtrlMgrPodEvictionTimeout"}}
     KUBE_CTRL_MGR_ROUTE_RECONCILIATION_PERIOD={{WrapAsVariable "kubernetesCtrlMgrRouteReconciliationPeriod"}}
+    KUBELET_POD_SUBNET={{WrapAsVariable "kubeClusterCidr"}}
 {{if IsKubernetesVersionGe "1.6.0"}}
     KUBELET_FEATURE_GATES=--feature-gates=Accelerators=true
 {{end}}

diff --git a/parts/kuberneteskubelet.service b/parts/kuberneteskubelet.service
@@ -36,6 +36,7 @@ ExecStart=/usr/bin/docker run \
         --require-kubeconfig \
         --pod-infra-container-image="${KUBELET_POD_INFRA_CONTAINER_IMAGE}" \
         --address=0.0.0.0 \
+        --non-masquerade-cidr=${KUBELET_POD_SUBNET} \
         --allow-privileged=true \
         --enable-server \
         --enable-debugging-handlers \

diff --git a/parts/kubernetesmastercustomdata.yml b/parts/kubernetesmastercustomdata.yml
@@ -195,6 +195,7 @@ write_files:
     KUBE_CTRL_MGR_NODE_MONITOR_GRACE_PERIOD={{WrapAsVariable "kubernetesCtrlMgrNodeMonitorGracePeriod"}}
     KUBE_CTRL_MGR_POD_EVICTION_TIMEOUT={{WrapAsVariable "kubernetesCtrlMgrPodEvictionTimeout"}}
     KUBE_CTRL_MGR_ROUTE_RECONCILIATION_PERIOD={{WrapAsVariable "kubernetesCtrlMgrRouteReconciliationPeriod"}}
+    KUBELET_POD_SUBNET={{WrapAsVariable "kubeClusterCidr"}}
 {{if IsKubernetesVersionGe "1.6.0"}}
   {{if HasLinuxAgents}}
     KUBELET_REGISTER_NODE=--register-node=true