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

Calico is not a network overlay

Browse Source
This commit is contained in:
Smaine Kahlouch
2015-10-27 15:42:46 +01:00
parent b98227e9a4
commit f216302f95
24 changed files with 86 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes/node/templates/kubelet.j2
View File

@@ -16,6 +16,6 @@ Environment="KUBELET_ARGS=--cluster_dns={{ dns_server }} --cluster_domain={{ dns
{% else %}
Environment="KUBELET_ARGS=--kubeconfig={{ kube_config_dir}}/kubelet.kubeconfig --config={{ kube_manifest_dir }}"
{% endif %}
{% if overlay_network_plugin|default('') %}
Environment="KUBELET_NETWORK_PLUGIN=--network_plugin={{ overlay_network_plugin }}"
{% if kube_network_plugin is defined and kube_network_plugin == "calico" %}
Environment="KUBELET_NETWORK_PLUGIN=--network_plugin={{ kube_network_plugin }}"
{% endif %}

2
roles/kubernetes/node/templates/systemd-init/kube-proxy.service.j2
View File

@@ -1,7 +1,7 @@
[Unit]
Description=Kubernetes Kube-Proxy Server
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
{% if overlay_network_plugin|default('') %}
{% if kube_network_plugin is defined and kube_network_plugin == "calico" %}
After=docker.service calico-node.service
{% else %}
After=docker.service

2
roles/kubernetes/node/templates/systemd-init/kubelet.service.j2
View File

@@ -1,7 +1,7 @@
[Unit]
Description=Kubernetes Kubelet Server
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
{% if overlay_network_plugin|default('') %}
{% if kube_network_plugin is defined and kube_network_plugin == "calico" %}
After=docker.service calico-node.service
{% else %}
After=docker.service