C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3198 from riverzhang/fix-kubeadm-v1alpha1

Browse source 
Fix kubeadm v1alpha1 configure
This commit is contained in:
k8s-ci-robot 2018-08-30 04:11:37 -07:00 committed by GitHub
commit a96a0ee307
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
View file

@ -1,4 +1,4 @@
apiVersion: kubeadm.k8s.io/v1alpha2
apiVersion: kubeadm.k8s.io/v1alpha1
kind: MasterConfiguration
api:
{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %}
@ -8,14 +8,13 @@ api:
bindPort: {{ kube_apiserver_port }}
{% endif %}
etcd:
external:
endpoints:
endpoints:
{% for endpoint in etcd_access_addresses.split(',') %}
- {{ endpoint }}
- {{ endpoint }}
{% endfor %}
caFile: {{ kube_config_dir }}/ssl/etcd/ca.pem
certFile: {{ kube_config_dir }}/ssl/etcd/node-{{ inventory_hostname }}.pem
keyFile: {{ kube_config_dir }}/ssl/etcd/node-{{ inventory_hostname }}-key.pem
caFile: {{ kube_config_dir }}/ssl/etcd/ca.pem
certFile: {{ kube_config_dir }}/ssl/etcd/node-{{ inventory_hostname }}.pem
keyFile: {{ kube_config_dir }}/ssl/etcd/node-{{ inventory_hostname }}-key.pem
networking:
dnsDomain: {{ dns_domain }}
serviceSubnet: {{ kube_service_addresses }}
@ -29,12 +28,6 @@ kubeProxy:
{% if kube_proxy_mode == 'ipvs' and kube_version | version_compare('v1.10', '<') %}
featureGates: SupportIPVSProxyMode=true
mode: ipvs
{% elif kube_proxy_mode == 'ipvs' %}
kubeProxy:
config:
featureGates:
SupportIPVSProxyMode: true
mode: ipvs
{% endif %}
{% if kube_proxy_nodeport_addresses %}
nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}]