mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-03-17 08:57:36 -02:30
This reverts commit 316508626d.
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
316508626d
commit
d39c273d96
@@ -13,7 +13,8 @@
|
||||
shell: "{{ bin_dir }}/calicoctl version | grep 'Cluster Version:' | awk '{ print $3}'"
|
||||
register: calico_version_on_server
|
||||
run_once: yes
|
||||
async: 20
|
||||
delegate_to: "{{ groups['kube-master'][0] }}"
|
||||
async: 10
|
||||
poll: 3
|
||||
changed_when: false
|
||||
|
||||
|
||||
@@ -4,8 +4,6 @@
|
||||
src: "cni-calico.conflist.j2"
|
||||
dest: "/etc/cni/net.d/{% if calico_version is version('v3.3.0', '>=') %}calico.conflist.template{% else %}10-calico.conflist{% endif %}"
|
||||
owner: kube
|
||||
register: calico_conflist
|
||||
notify: reset_calico_cni
|
||||
|
||||
- name: Calico | Create calico certs directory
|
||||
file:
|
||||
@@ -22,9 +20,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: Calico | Install calicoctl container script
|
||||
template:
|
||||
|
||||
@@ -13,4 +13,4 @@
|
||||
register: calico_kubelet_name
|
||||
delegate_to: "{{ groups['kube-master'][0] }}"
|
||||
when:
|
||||
- "cloud_provider is defined"
|
||||
- "cloud_provider is defined"
|
||||
Reference in New Issue
Block a user