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

Move calico to daemonset (#1605)

Browse Source 
* Drop legacy calico logic

* add calico as a daemonset
This commit is contained in:
Matthew Mosesohn
2017-09-04 11:29:51 +03:00
committed by GitHub
parent a3e6896a43
commit 77602dbb93
17 changed files with 262 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roles/kubernetes/node/templates/kubelet.docker.service.j2
View File

@@ -1,13 +1,8 @@
[Unit]
Description=Kubernetes Kubelet Server
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
{% if kube_network_plugin is defined and kube_network_plugin == "calico" %}
After=docker.service docker.socket calico-node.service
Wants=docker.socket calico-node.service
{% else %}
After=docker.service
Wants=docker.socket
{% endif %}
[Service]
EnvironmentFile={{kube_config_dir}}/kubelet.env

5
roles/kubernetes/node/templates/kubelet.host.service.j2
View File

@@ -1,13 +1,8 @@
[Unit]
Description=Kubernetes Kubelet Server
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
{% if kube_network_plugin is defined and kube_network_plugin == "calico" %}
After=docker.service docker.socket calico-node.service
Wants=docker.socket calico-node.service
{% else %}
After=docker.service
Wants=docker.socket
{% endif %}
[Service]
EnvironmentFile={{kube_config_dir}}/kubelet.env

5
roles/kubernetes/node/templates/kubelet.rkt.service.j2
View File

@@ -1,12 +1,7 @@
[Unit]
Description=Kubernetes Kubelet Server
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
{% if kube_network_plugin is defined and kube_network_plugin == "calico" %}
After=calico-node.service
Wants=network.target calico-node.service
{% else %}
Wants=network.target
{% endif %}
[Service]
Restart=on-failure