Skip to content
Snippets Groups Projects
Commit 57e1831f authored by Antoine Legrand's avatar Antoine Legrand
Browse files

Update calico to 0.11.0

parent 3f411bff
No related branches found
No related tags found
No related merge requests found
......@@ -3,3 +3,11 @@ etcd_download_url: https://github.com/coreos/etcd/releases/download
flannel_download_url: https://github.com/coreos/flannel/releases/download
kube_download_url: https://github.com/GoogleCloudPlatform/kubernetes/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
---
etcd_version: v2.2.1
flannel_version: 0.5.3
kube_version: v1.1.1
kube_sha1: 0eac7460fcf7d175592466603f6b9c2a076fb7b2
calico_version: v0.10.0
......@@ -30,6 +30,7 @@ kube_cert_group: kube-cert
dns_domain: "{{ cluster_name }}"
kube_proxy_mode: iptables
# IP address of the DNS server.
# 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
......
......@@ -4,4 +4,4 @@
# default config should be adequate
# 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}}"
......@@ -3,4 +3,4 @@
# default config should be adequate
[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}}"
......@@ -11,7 +11,7 @@ ExecStartPre={{ bin_dir }}/calicoctl checksystem --fix
{% if peer_with_router|default(false) %}
ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --as={{ local_as }} --kubernetes
{% 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 %}
{% else %}
ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment