epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-06 18:17:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use install_cni init container for cni copy for calico/canal (#4416)

Browse Source
This commit is contained in:
Matthew Mosesohn
2019-04-02 13:32:36 +03:00
committed by Kubernetes Prow Robot
parent 5d5c9cab19
commit 4fe2aa6bf7
5 changed files with 19 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
roles/network_plugin/calico/templates/calico-node.yml.j2
View File

@@ -52,9 +52,9 @@ spec:
# Name of the CNI config file to create.
- name: CNI_CONF_NAME
value: "10-calico.conflist"
# CNI binaries are already on the host
# Install CNI binaries
- name: UPDATE_CNI_BINARIES
value: "false"
value: "true"
# The CNI network config to install on each node.
- name: CNI_NETWORK_CONFIG_FILE
value: "/host/etc/cni/net.d/calico.conflist.template"
@@ -64,6 +64,8 @@ spec:
volumeMounts:
- mountPath: /host/etc/cni/net.d
name: cni-net-dir
- mountPath: /host/opt/cni/bin
name: cni-bin-dir
{% endif %}
containers:
{% if calico_version is version('v3.3.0', '>=') and calico_version is version('v3.4.0', '<') %}
@@ -74,9 +76,9 @@ spec:
# Name of the CNI config file to create.
- name: CNI_CONF_NAME
value: "10-calico.conflist"
# CNI binaries are already on the host
# Install CNI binaries
- name: UPDATE_CNI_BINARIES
value: "false"
value: "true"
# The CNI network config to install on each node.
- name: CNI_NETWORK_CONFIG_FILE
value: "/host/etc/cni/net.d/calico.conflist.template"
@@ -86,6 +88,8 @@ spec:
volumeMounts:
- mountPath: /host/etc/cni/net.d
name: cni-net-dir
- mountPath: /host/opt/cni/bin
name: cni-bin-dir
{% endif %}
# Runs calico/node container on each Kubernetes node. This
# container programs network policy and routes on each
@@ -260,6 +264,9 @@ spec:
- name: cni-net-dir
hostPath:
path: /etc/cni/net.d
- name: cni-bin-dir
hostPath:
path: /opt/cni/bin
# Mount in the etcd TLS secrets.
- name: etcd-certs
hostPath: