Merge pull request #207 from kubespray/upgrade_calico_v0.19.0

upgrade calico v0.19.0, calico-cni v1.2.1

requirements.yml

@@ -1,48 +1,48 @@
 ---
-- src: https://gitlab.com/kubespray-ansibl8s/k8s-dashboard.git
-  path: roles/apps
-  scm: git
-
 - src: https://gitlab.com/kubespray-ansibl8s/k8s-common.git
   path: roles/apps
   scm: git
 
-- src: https://gitlab.com/kubespray-ansibl8s/k8s-kubedns.git
-  path: roles/apps
-  scm: git
-
-- src: https://gitlab.com/kubespray-ansibl8s/k8s-elasticsearch.git
-  path: roles/apps
-  scm: git
-
-- src: https://gitlab.com/kubespray-ansibl8s/k8s-redis.git
-  path: roles/apps
-  scm: git
-
-- src: https://gitlab.com/kubespray-ansibl8s/k8s-memcached.git
-  path: roles/apps
-  scm: git
-
-- src: https://gitlab.com/kubespray-ansibl8s/k8s-postgres.git
-  path: roles/apps
-  scm: git
-
-- src: https://gitlab.com/kubespray-ansibl8s/k8s-pgbouncer.git
-  path: roles/apps
-  scm: git
-
-- src: https://gitlab.com/kubespray-ansibl8s/k8s-heapster.git
-  path: roles/apps
-  scm: git
-
-- src: https://gitlab.com/kubespray-ansibl8s/k8s-influxdb.git
-  path: roles/apps
-  scm: git
-
-- src: https://gitlab.com/kubespray-ansibl8s/k8s-kubedash.git
-  path: roles/apps
-  scm: git
-
-- src: https://gitlab.com/kubespray-ansibl8s/k8s-kube-logstash.git
-  path: roles/apps
-  scm: git
+#- src: https://gitlab.com/kubespray-ansibl8s/k8s-dashboard.git
+#  path: roles/apps
+#  scm: git
+#
+#- src: https://gitlab.com/kubespray-ansibl8s/k8s-kubedns.git
+#  path: roles/apps
+#  scm: git
+#
+#- src: https://gitlab.com/kubespray-ansibl8s/k8s-elasticsearch.git
+#  path: roles/apps
+#  scm: git
+#
+#- src: https://gitlab.com/kubespray-ansibl8s/k8s-redis.git
+#  path: roles/apps
+#  scm: git
+#
+#- src: https://gitlab.com/kubespray-ansibl8s/k8s-memcached.git
+#  path: roles/apps
+#  scm: git
+#
+#- src: https://gitlab.com/kubespray-ansibl8s/k8s-postgres.git
+#  path: roles/apps
+#  scm: git
+#
+#- src: https://gitlab.com/kubespray-ansibl8s/k8s-pgbouncer.git
+#  path: roles/apps
+#  scm: git
+#
+#- src: https://gitlab.com/kubespray-ansibl8s/k8s-heapster.git
+#  path: roles/apps
+#  scm: git
+#
+#- src: https://gitlab.com/kubespray-ansibl8s/k8s-influxdb.git
+#  path: roles/apps
+#  scm: git
+#
+#- src: https://gitlab.com/kubespray-ansibl8s/k8s-kubedash.git
+#  path: roles/apps
+#  scm: git
+#
+#- src: https://gitlab.com/kubespray-ansibl8s/k8s-kube-logstash.git
+#  path: roles/apps
+#  scm: git

roles/download/defaults/main.yml

@@ -4,25 +4,25 @@ local_release_dir: /tmp
 # Versions
 kube_version: v1.2.2
 etcd_version: v2.2.5
-calico_version: v0.17.0
-calico_cni_version: v1.0.0
+calico_version: v0.19.0
+calico_cni_version: v1.2.1
 weave_version: v1.4.4
 
 # Download URL's
-kubelet_download_url: "https://storage.googleapis.com/kubespray/{{kube_version}}_kubernetes-kubelet"
-apiserver_download_url: "https://storage.googleapis.com/kubespray/{{kube_version}}_kubernetes-apiserver"
-kubectl_download_url: "https://storage.googleapis.com/kubespray/{{kube_version}}_kubernetes-kubectl"
+kubelet_download_url: "https://storage.googleapis.com/kargo/{{kube_version}}_kubernetes-kubelet"
+apiserver_download_url: "https://storage.googleapis.com/kargo/{{kube_version}}_kubernetes-apiserver"
+kubectl_download_url: "https://storage.googleapis.com/kargo/{{kube_version}}_kubernetes-kubectl"
 
-etcd_download_url: "https://storage.googleapis.com/kubespray/{{etcd_version}}_etcd"
-calico_download_url: "https://storage.googleapis.com/kubespray/{{calico_version}}_calico"
-calico_cni_download_url: "https://storage.googleapis.com/kubespray/{{calico_cni_version}}_calico-cni-plugin"
-calico_cni_ipam_download_url: "https://storage.googleapis.com/kubespray/{{calico_cni_version}}_calico-cni-plugin-ipam"
-weave_download_url: "https://storage.googleapis.com/kubespray/{{weave_version}}_weave"
+etcd_download_url: "https://storage.googleapis.com/kargo/{{etcd_version}}_etcd"
+calico_download_url: "https://storage.googleapis.com/kargo/{{calico_version}}_calico"
+calico_cni_download_url: "https://storage.googleapis.com/kargo/{{calico_cni_version}}_calico-cni-plugin"
+calico_cni_ipam_download_url: "https://storage.googleapis.com/kargo/{{calico_cni_version}}_calico-cni-plugin-ipam"
+weave_download_url: "https://storage.googleapis.com/kargo/{{weave_version}}_weave"
 
 # Checksums
-calico_checksum: "1fa22c0ee0cc661f56aa09169a3661fb46e552b53fae5fae9aac010e0666b281"
-calico_cni_checksum: "cfbb95d4416cb65845a188f3bd991fff232bd5ce3463b2919d586ab77967aecd"
-calico_cni_ipam_checksum: "93ebf8756b26314e1e3f612f1e824418cbb0a8df2942664422e697bcb109fbb2"
+calico_checksum: "6db00c94619e82d878d348c4e1791f8d2f0db59075f6c8e430fefae297c54d96"
+calico_cni_checksum: "b2eeb45fdfce58394e3a0019dd4b74bebe4bb35ed6d7c399213297594f25e89e"
+calico_cni_ipam_checksum: "fd122bee97af3ed86fc18fa4d797da29be3a5857a526aa154b433e50d7b36845"
 weave_checksum: "152942c330f87ab475d87d9311b91674b90f25ea685bd4e04e0495d5fe09a957"
 etcd_checksum: "aa6037406257d2a1bc48ffa769afe7a4f8a04cc1ffcd36ef84f9ee8bc4eca756"
 kubectl_checksum: "473e6924569fba30d4a50cecdc2cae5f31d97d1f662463e85b74a472105dcff4"

roles/uploads/defaults/main.yml

@@ -4,8 +4,8 @@ local_release_dir: /tmp
 # Versions
 kube_version: v1.2.2
 etcd_version: v2.2.5
-calico_version: v0.17.0
-calico_cni_version: v1.0.0
+calico_version: v0.19.0
+calico_cni_version: v1.2.1
 weave_version: v1.4.4
 
 # Download URL's
@@ -17,9 +17,9 @@ calico_cni_ipam_download_url: "https://github.com/projectcalico/calico-cni/relea
 weave_download_url: "https://github.com/weaveworks/weave/releases/download/{{weave_version}}/weave"
 
 # Checksums
-calico_checksum: "1fa22c0ee0cc661f56aa09169a3661fb46e552b53fae5fae9aac010e0666b281"
-calico_cni_checksum: "cfbb95d4416cb65845a188f3bd991fff232bd5ce3463b2919d586ab77967aecd"
-calico_cni_ipam_checksum: "93ebf8756b26314e1e3f612f1e824418cbb0a8df2942664422e697bcb109fbb2"
+calico_checksum: "6db00c94619e82d878d348c4e1791f8d2f0db59075f6c8e430fefae297c54d96"
+calico_cni_checksum: "b2eeb45fdfce58394e3a0019dd4b74bebe4bb35ed6d7c399213297594f25e89e"
+calico_cni_ipam_checksum: "fd122bee97af3ed86fc18fa4d797da29be3a5857a526aa154b433e50d7b36845"
 weave_checksum: "152942c330f87ab475d87d9311b91674b90f25ea685bd4e04e0495d5fe09a957"
 etcd_checksum: "aa6037406257d2a1bc48ffa769afe7a4f8a04cc1ffcd36ef84f9ee8bc4eca756"
 kubectl_checksum: "473e6924569fba30d4a50cecdc2cae5f31d97d1f662463e85b74a472105dcff4"

roles/uploads/tasks/main.yml

@@ -14,7 +14,7 @@
 
 - name: uploads items
   gc_storage:
-    bucket: kubespray
+    bucket: kargo
     object: "{{item.version}}_{{item.name}}"
     src: "{{ local_release_dir }}/{{item.dest}}"
     mode: put