External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-16 00:17:31 -02:30
Code Issues Packages Projects Releases Wiki Activity

Enable nodes to run calicoctl for calico kdd mode (#4956)

Browse Source 
* Enable nodes to run calicoctl

per-node tasks require waiting for calico-node to be applied

Change-Id: Ibe1076b7334a2da0332f2dd766fde0c3f172d1f2

* cleanup tasks that should run on master

Change-Id: I43a837879ef41596f14657ecd7f813899b6865ae

* Switch run_once calico logic to just run on first master

Change-Id: I6893711e354f63c5e1eaf6ac2e23d9a6347a555d
This commit is contained in:
Matthew Mosesohn
2019-07-15 11:59:06 +03:00
committed by Kubernetes Prow Robot
parent e0410661fa
commit fd9bbcb157
4 changed files with 109 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/network_plugin/calico/templates/calicoctl.kdd.sh.j2
View File

@@ -1,6 +1,8 @@
#!/bin/bash
DATASTORE_TYPE=kubernetes \
{% if inventory_hostname in groups['kube-master'] %}
KUBECONFIG={{ kube_config_dir }}/admin.conf \
KUBECONFIG=/etc/kubernetes/admin.conf \
{% else %}
KUBECONFIG=/etc/cni/net.d/calico-kubeconfig \
{% endif %}
{{ bin_dir }}/calicoctl "$@"