From 97de82bbcc95b565f8bffe9d074325ec6530febe Mon Sep 17 00:00:00 2001 From: Smana Date: Wed, 20 Apr 2016 17:09:09 +0200 Subject: [PATCH 1/2] upgrade weave to v1.5.0 with cni --- roles/download/defaults/main.yml | 4 ++-- roles/kubernetes/node/templates/kubelet.j2 | 2 +- roles/kubernetes/preinstall/tasks/main.yml | 2 +- roles/uploads/defaults/main.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index cd89917d5..a6e11a759 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -6,7 +6,7 @@ kube_version: v1.2.2 etcd_version: v2.2.5 calico_version: v0.19.0 calico_cni_version: v1.2.1 -weave_version: v1.4.4 +weave_version: v1.5.0 # Download URL's kubelet_download_url: "https://storage.googleapis.com/kargo/{{kube_version}}_kubernetes-kubelet" @@ -23,7 +23,7 @@ weave_download_url: "https://storage.googleapis.com/kargo/{{weave_version}}_weav calico_checksum: "6db00c94619e82d878d348c4e1791f8d2f0db59075f6c8e430fefae297c54d96" calico_cni_checksum: "b2eeb45fdfce58394e3a0019dd4b74bebe4bb35ed6d7c399213297594f25e89e" calico_cni_ipam_checksum: "fd122bee97af3ed86fc18fa4d797da29be3a5857a526aa154b433e50d7b36845" -weave_checksum: "152942c330f87ab475d87d9311b91674b90f25ea685bd4e04e0495d5fe09a957" +weave_checksum: "28d2c4e2b1ad8600da69882501eba697679aea10a5e61c769aa3a9ee72b0d89a" etcd_checksum: "aa6037406257d2a1bc48ffa769afe7a4f8a04cc1ffcd36ef84f9ee8bc4eca756" kubectl_checksum: "473e6924569fba30d4a50cecdc2cae5f31d97d1f662463e85b74a472105dcff4" kubelet_checksum: "f16827dc7e7c82f0e215f0fc73eb01e2dfe91a2ec83f9cbcaf8d37c91b64fd3b" diff --git a/roles/kubernetes/node/templates/kubelet.j2 b/roles/kubernetes/node/templates/kubelet.j2 index fe22c7688..c7bc6fcf0 100644 --- a/roles/kubernetes/node/templates/kubelet.j2 +++ b/roles/kubernetes/node/templates/kubelet.j2 @@ -25,7 +25,7 @@ KUBELET_ARGS="--cluster_dns={{ dns_server }} --cluster_domain={{ dns_domain }} - {% else %} KUBELET_ARGS="--kubeconfig={{ kube_config_dir}}/kubelet.kubeconfig --config={{ kube_manifest_dir }}" {% endif %} -{% if kube_network_plugin is defined and kube_network_plugin == "calico" %} +{% if kube_network_plugin is defined and kube_network_plugin in ["calico", "weave"] %} KUBELET_NETWORK_PLUGIN="--network_plugin=cni --network-plugin-dir=/etc/cni/net.d" {% elif kube_network_plugin is defined and kube_network_plugin == "weave" %} DOCKER_SOCKET="--docker-endpoint=unix:/var/run/weave/weave.sock" diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml index 952319c27..95cd134ce 100644 --- a/roles/kubernetes/preinstall/tasks/main.yml +++ b/roles/kubernetes/preinstall/tasks/main.yml @@ -62,7 +62,7 @@ with_items: - "/etc/cni/net.d" - "/opt/cni/bin" - when: kube_network_plugin == "calico" + when: kube_network_plugin in ["calico", "weave"] - name: Update package management cache (YUM) yum: update_cache=yes name='*' diff --git a/roles/uploads/defaults/main.yml b/roles/uploads/defaults/main.yml index 4d7a39bc7..177cd1329 100644 --- a/roles/uploads/defaults/main.yml +++ b/roles/uploads/defaults/main.yml @@ -6,7 +6,7 @@ kube_version: v1.2.2 etcd_version: v2.2.5 calico_version: v0.19.0 calico_cni_version: v1.2.1 -weave_version: v1.4.4 +weave_version: v1.5.0 # Download URL's kube_download_url: "https://storage.googleapis.com/kubernetes-release/release/{{ kube_version }}/bin/linux/amd64" @@ -20,7 +20,7 @@ weave_download_url: "https://github.com/weaveworks/weave/releases/download/{{wea calico_checksum: "6db00c94619e82d878d348c4e1791f8d2f0db59075f6c8e430fefae297c54d96" calico_cni_checksum: "b2eeb45fdfce58394e3a0019dd4b74bebe4bb35ed6d7c399213297594f25e89e" calico_cni_ipam_checksum: "fd122bee97af3ed86fc18fa4d797da29be3a5857a526aa154b433e50d7b36845" -weave_checksum: "152942c330f87ab475d87d9311b91674b90f25ea685bd4e04e0495d5fe09a957" +weave_checksum: "28d2c4e2b1ad8600da69882501eba697679aea10a5e61c769aa3a9ee72b0d89a" etcd_checksum: "aa6037406257d2a1bc48ffa769afe7a4f8a04cc1ffcd36ef84f9ee8bc4eca756" kubectl_checksum: "473e6924569fba30d4a50cecdc2cae5f31d97d1f662463e85b74a472105dcff4" kubelet_checksum: "f16827dc7e7c82f0e215f0fc73eb01e2dfe91a2ec83f9cbcaf8d37c91b64fd3b" From 7803ae6acbcad5ad7f4a2be52a04a49af9a44767 Mon Sep 17 00:00:00 2001 From: Smana Date: Wed, 20 Apr 2016 17:23:11 +0200 Subject: [PATCH 2/2] enabling travis tests for weave --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b3978b86..00e27304e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,11 +91,6 @@ matrix: allow_failures: - env: KUBE_NETWORK_PLUGIN=weave CLOUD_IMAGE=ubuntu-1404-trusty CLOUD_REGION=asia-east1-c - env: KUBE_NETWORK_PLUGIN=calico CLOUD_IMAGE=ubuntu-1404-trusty CLOUD_REGION=us-east1-d - # Issue with Weave #177 to be fixed - - env: KUBE_NETWORK_PLUGIN=weave CLOUD_IMAGE=debian-8-kubespray CLOUD_REGION=us-east1-d - - env: KUBE_NETWORK_PLUGIN=weave CLOUD_IMAGE=centos-7-sudo CLOUD_REGION=us-central1-c - - env: KUBE_NETWORK_PLUGIN=weave CLOUD_IMAGE=rhel-7-sudo CLOUD_REGION=europe-west1-b - - env: KUBE_NETWORK_PLUGIN=weave CLOUD_IMAGE=ubuntu-1510-wily CLOUD_REGION=us-east1-d before_install: # Install Ansible.