Browse Source

Fix kubeadm-config: add kube_network_node_prefix (#3761)

pull/3770/head
Egor 6 years ago
committed by k8s-ci-robot
parent
commit
9a5438ce2f
3 changed files with 3 additions and 0 deletions
  1. 1
      roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
  2. 1
      roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
  3. 1
      roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2

1
roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2

@ -20,6 +20,7 @@ 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 not in ["gce", "oci"] %}
cloudProvider: {{ cloud_provider }}

1
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2

@ -21,6 +21,7 @@ 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 != "gce" %}
cloudProvider: {{ cloud_provider }}

1
roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2

@ -36,6 +36,7 @@ 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) }}

Loading…
Cancel
Save