C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update calico to 0.11.0

Browse source
This commit is contained in:
Antoine Legrand 2015-11-20 10:38:39 +01:00
parent 3f411bffe4
commit 57e1831f78
6 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roles/download/defaults/main.yml
View file

@ -3,3 +3,11 @@ etcd_download_url: https://github.com/coreos/etcd/releases/download
flannel_download_url: https://github.com/coreos/flannel/releases/download flannel_download_url: https://github.com/coreos/flannel/releases/download
kube_download_url: https://github.com/GoogleCloudPlatform/kubernetes/releases/download kube_download_url: https://github.com/GoogleCloudPlatform/kubernetes/releases/download
calico_download_url: https://github.com/Metaswitch/calico-docker/releases/download calico_download_url: https://github.com/Metaswitch/calico-docker/releases/download
etcd_version: v2.2.1
flannel_version: 0.5.3
kube_version: v1.1.1
kube_sha1: 0eac7460fcf7d175592466603f6b9c2a076fb7b2
calico_version: v0.11.0

8
roles/download/vars/main.yml
View file

@ -1,8 +0,0 @@
---
etcd_version: v2.2.1
flannel_version: 0.5.3
kube_version: v1.1.1
kube_sha1: 0eac7460fcf7d175592466603f6b9c2a076fb7b2
calico_version: v0.10.0

1
roles/kubernetes/common/defaults/main.yml
View file

@ -30,6 +30,7 @@ kube_cert_group: kube-cert
dns_domain: "{{ cluster_name }}" dns_domain: "{{ cluster_name }}"
kube_proxy_mode: iptables
# IP address of the DNS server. # IP address of the DNS server.
# Kubernetes will create a pod with several containers, serving as the DNS # Kubernetes will create a pod with several containers, serving as the DNS
# server and expose it under this IP address. The IP address must be from # server and expose it under this IP address. The IP address must be from

2
roles/kubernetes/master/templates/proxy.j2
View file

@ -4,4 +4,4 @@
# default config should be adequate # default config should be adequate
# Add your own! # Add your own!
KUBE_PROXY_ARGS="--kubeconfig={{ kube_config_dir }}/proxy.kubeconfig --proxy-mode=iptables" KUBE_PROXY_ARGS="--kubeconfig={{ kube_config_dir }}/proxy.kubeconfig --proxy-mode={{kube_proxy_mode}}"

2
roles/kubernetes/node/templates/proxy.j2
View file

@ -3,4 +3,4 @@
# default config should be adequate # default config should be adequate
[Service] [Service]
Environment="KUBE_PROXY_ARGS=--kubeconfig={{ kube_config_dir }}/proxy.kubeconfig --proxy-mode=iptables" Environment="KUBE_PROXY_ARGS=--kubeconfig={{ kube_config_dir }}/proxy.kubeconfig --proxy-mode={{kube_proxy_mode}}"

2
roles/network_plugin/templates/calico/calico-node.service.j2
View file

@ -11,7 +11,7 @@ ExecStartPre={{ bin_dir }}/calicoctl checksystem --fix
{% if peer_with_router|default(false) %} {% if peer_with_router|default(false) %}
ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --as={{ local_as }} --kubernetes ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --as={{ local_as }} --kubernetes
{% else %} {% else %}
ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --kubernetes --kube-plugin-version=v0.5.0 ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --kubernetes --kube-plugin-version=v0.6.0
{% endif %} {% endif %}
{% else %} {% else %}
ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4}