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

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

View File

@@ -5,9 +5,6 @@ cilium_disable_ipv4: false
# Etcd SSL dirs
cilium_cert_dir: /etc/cilium/certs
kube_etcd_cacert_file: ca.pem
kube_etcd_cert_file: node-{{ inventory_hostname }}.pem
kube_etcd_key_file: node-{{ inventory_hostname }}-key.pem
# Cilium Network Policy directory
cilium_policy_dir: /etc/kubernetes/policy

View File

@@ -11,4 +11,4 @@
- name: Kubelet | reload kubelet
service:
name: kubelet
state: restarted
state: restarted

View File

@@ -21,9 +21,9 @@
state: hard
force: yes
with_items:
- {s: "{{ kube_etcd_cacert_file }}", d: "ca_cert.crt"}
- {s: "{{ kube_etcd_cert_file }}", d: "cert.crt"}
- {s: "{{ kube_etcd_key_file }}", d: "key.pem"}
- {s: "ca.pem", d: "ca_cert.crt"}
- {s: "node-{{ inventory_hostname }}.pem", d: "cert.crt"}
- {s: "node-{{ inventory_hostname }}-key.pem", d: "key.pem"}
- name: Cilium | Create Cilium node manifests
template: