Merge pull request #3198 from riverzhang/fix-kubeadm-v1alpha1
Fix kubeadm v1alpha1 configure
This commit is contained in:
commit
a96a0ee307
1 changed files with 6 additions and 13 deletions
|
@ -1,4 +1,4 @@
|
||||||
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,7 +8,6 @@ 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 }}
|
||||||
|
@ -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 }}]
|
||||||
|
|
Loading…
Reference in a new issue