From 3f20ea2b0bd21961ccf016abf7d7e3a8de2f78e9 Mon Sep 17 00:00:00 2001 From: Sylvain Rabot Date: Wed, 19 Jul 2017 18:23:48 +0200 Subject: [PATCH] Add pod subnet to non masquerade Signed-off-by: Sylvain Rabot --- parts/kubernetesagentcustomdata.yml | 1 + parts/kuberneteskubelet.service | 1 + parts/kubernetesmastercustomdata.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/parts/kubernetesagentcustomdata.yml b/parts/kubernetesagentcustomdata.yml index 5c1e9f249b..23ecc517d5 100644 --- 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 index aaf7571f06..68e41e1c59 100644 --- 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 index ef61692ec9..519e029ad0 100644 --- 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