epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-09 19:58:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use K8s 1.14 and add kubeadm experimental control plane mode (#4317)" (#4510)

Browse Source 
This reverts commit 316508626d.
This commit is contained in:
Matthew Mosesohn
2019-04-11 22:52:43 +03:00
committed by Kubernetes Prow Robot
parent 316508626d
commit d39c273d96
37 changed files with 398 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
View File

@@ -14,9 +14,9 @@ etcd:
{% for endpoint in etcd_access_addresses.split(',') %}
- {{ endpoint }}
{% endfor %}
caFile: {{ etcd_cert_dir }}/{{ kube_etcd_cacert_file }}
certFile: {{ etcd_cert_dir }}/{{ kube_etcd_cert_file }}
keyFile: {{ etcd_cert_dir }}/{{ kube_etcd_key_file }}
caFile: {{ etcd_cert_dir }}/ca.pem
certFile: {{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem
keyFile: {{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem
networking:
dnsDomain: {{ dns_domain }}
serviceSubnet: {{ kube_service_addresses }}
@@ -221,12 +221,10 @@ nodeRegistration:
{% if kube_override_hostname|default('') %}
name: {{ kube_override_hostname }}
{% endif %}
{% if inventory_hostname not in groups['kube-node'] %}
{% if inventory_hostname in groups['kube-master'] and inventory_hostname not in groups['kube-node'] %}
taints:
- effect: NoSchedule
key: node.kubernetes.io/master
{% else %}
taints: {}
{% endif %}
{% if container_manager == 'crio' %}
criSocket: /var/run/crio/crio.sock