Skip to content
Snippets Groups Projects
Commit 35e5adaf authored by rongzhang's avatar rongzhang
Browse files

Fix kubeadm v1alpha1 configure

parent a268a49e
No related branches found
No related tags found
No related merge requests found
apiVersion: kubeadm.k8s.io/v1alpha2 apiVersion: kubeadm.k8s.io/v1alpha1
kind: MasterConfiguration kind: MasterConfiguration
api: api:
{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %} {% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %}
...@@ -8,14 +8,13 @@ api: ...@@ -8,14 +8,13 @@ api:
bindPort: {{ kube_apiserver_port }} bindPort: {{ kube_apiserver_port }}
{% endif %} {% endif %}
etcd: etcd:
external: endpoints:
endpoints:
{% for endpoint in etcd_access_addresses.split(',') %} {% for endpoint in etcd_access_addresses.split(',') %}
- {{ endpoint }} - {{ endpoint }}
{% endfor %} {% endfor %}
caFile: {{ kube_config_dir }}/ssl/etcd/ca.pem caFile: {{ kube_config_dir }}/ssl/etcd/ca.pem
certFile: {{ kube_config_dir }}/ssl/etcd/node-{{ inventory_hostname }}.pem certFile: {{ kube_config_dir }}/ssl/etcd/node-{{ inventory_hostname }}.pem
keyFile: {{ kube_config_dir }}/ssl/etcd/node-{{ inventory_hostname }}-key.pem keyFile: {{ kube_config_dir }}/ssl/etcd/node-{{ inventory_hostname }}-key.pem
networking: networking:
dnsDomain: {{ dns_domain }} dnsDomain: {{ dns_domain }}
serviceSubnet: {{ kube_service_addresses }} serviceSubnet: {{ kube_service_addresses }}
...@@ -29,12 +28,6 @@ kubeProxy: ...@@ -29,12 +28,6 @@ kubeProxy:
{% if kube_proxy_mode == 'ipvs' and kube_version | version_compare('v1.10', '<') %} {% if kube_proxy_mode == 'ipvs' and kube_version | version_compare('v1.10', '<') %}
featureGates: SupportIPVSProxyMode=true featureGates: SupportIPVSProxyMode=true
mode: ipvs mode: ipvs
{% elif kube_proxy_mode == 'ipvs' %}
kubeProxy:
config:
featureGates:
SupportIPVSProxyMode: true
mode: ipvs
{% endif %} {% endif %}
{% if kube_proxy_nodeport_addresses %} {% if kube_proxy_nodeport_addresses %}
nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}] nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment