From 7da9880ff7be12e5f6703ca689a40f3ad884d6b9 Mon Sep 17 00:00:00 2001 From: Egor Date: Fri, 7 Dec 2018 15:23:17 +0300 Subject: [PATCH] Move node-cidr-mask-size to ControllerManagerextraArgs (#3845) --- .../kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 | 2 +- .../kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 | 2 +- .../kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 | 2 +- .../kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 index 71c504532..9b6e78dd6 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 @@ -20,7 +20,6 @@ networking: dnsDomain: {{ dns_domain }} serviceSubnet: {{ kube_service_addresses }} podSubnet: {{ kube_pods_subnet }} - podNetworkCidr: "{{ kube_network_node_prefix }}" kubernetesVersion: {{ kube_version }} {% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere", "aws"] %} cloudProvider: {{cloud_provider}} @@ -122,6 +121,7 @@ controllerManagerExtraArgs: node-monitor-grace-period: {{ kube_controller_node_monitor_grace_period }} node-monitor-period: {{ kube_controller_node_monitor_period }} pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }} + node-cidr-mask-size: "{{ kube_network_node_prefix }}" profiling: "{{ kube_profiling }}" terminated-pod-gc-threshold: "{{ kube_controller_terminated_pod_gc_threshold }}" {% if kube_feature_gates %} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 index fb43775d2..8e7f372e8 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 @@ -21,7 +21,6 @@ networking: dnsDomain: {{ dns_domain }} serviceSubnet: {{ kube_service_addresses }} podSubnet: {{ kube_pods_subnet }} - podNetworkCidr: "{{ kube_network_node_prefix }}" kubernetesVersion: {{ kube_version }} kubeProxy: config: @@ -120,6 +119,7 @@ controllerManagerExtraArgs: node-monitor-grace-period: {{ kube_controller_node_monitor_grace_period }} node-monitor-period: {{ kube_controller_node_monitor_period }} pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }} + node-cidr-mask-size: "{{ kube_network_node_prefix }}" profiling: "{{ kube_profiling }}" terminated-pod-gc-threshold: "{{ kube_controller_terminated_pod_gc_threshold }}" {% if kube_feature_gates %} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 index 58250724d..a31ec16a2 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 @@ -36,7 +36,6 @@ networking: dnsDomain: {{ dns_domain }} serviceSubnet: {{ kube_service_addresses }} podSubnet: {{ kube_pods_subnet }} - podNetworkCidr: "{{ kube_network_node_prefix }}" kubernetesVersion: {{ kube_version }} {% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %} controlPlaneEndpoint: {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }} @@ -127,6 +126,7 @@ controllerManagerExtraArgs: node-monitor-grace-period: {{ kube_controller_node_monitor_grace_period }} node-monitor-period: {{ kube_controller_node_monitor_period }} pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }} + node-cidr-mask-size: "{{ kube_network_node_prefix }}" {% if kube_feature_gates %} feature-gates: {{ kube_feature_gates|join(',') }} {% endif %} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 index 01338230e..298e726e7 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 @@ -37,7 +37,6 @@ networking: dnsDomain: {{ dns_domain }} serviceSubnet: {{ kube_service_addresses }} podSubnet: {{ kube_pods_subnet }} - podNetworkCidr: "{{ kube_network_node_prefix }}" kubernetesVersion: {{ kube_version }} {% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %} controlPlaneEndpoint: {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }} @@ -166,6 +165,7 @@ controllerManager: node-monitor-grace-period: {{ kube_controller_node_monitor_grace_period }} node-monitor-period: {{ kube_controller_node_monitor_period }} pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }} + node-cidr-mask-size: "{{ kube_network_node_prefix }}" {% if kube_feature_gates %} feature-gates: {{ kube_feature_gates|join(',') }} {% endif %}