commit 6d99f1824a4edcb03a68763e71d4620901465fe0
author Aleksei Kasatkin <akasatkin@mirantis.com> Mon May 14 15:22:49 2018 +0200
committer Aleksei Kasatkin <akasatkin@mirantis.com> Mon May 14 15:23:43 2018 +0200
tree c6597fc33744295111cbdacbbb818e8524ff0ce1
parent f1054194f7c8966b9ecbbffa0157be216c18d1cc

Update versions of Calico components

Now Calico component versions correspond to Calico v2.6.9 release

PROD-19883

Change-Id: I9081d8c09a030f949ca8fc13389f955f80cc760b

kubernetes/pool/cluster.yml

diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index 0b92262..17e9006 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -11,9 +11,9 @@
     kubernetes_contrail_network_controller_repo: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration
 
     # component docker images
-    kubernetes_calico_calicoctl_image: ${_param:kubernetes_calico_calicoctl_repo}/ctl:v1.6.1-38-20171010022253
-    kubernetes_calico_image: ${_param:kubernetes_calico_repo}/node:v2.6.1
-    kubernetes_calico_cni_image: ${_param:kubernetes_calico_cni_repo}/cni:v1.11.0-31-20171010012204
+    kubernetes_calico_calicoctl_image: ${_param:kubernetes_calico_calicoctl_repo}/ctl:v1.6.4
+    kubernetes_calico_image: ${_param:kubernetes_calico_repo}/node:v2.6.9
+    kubernetes_calico_cni_image: ${_param:kubernetes_calico_cni_repo}/cni:v1.11.5
     kubernetes_hyperkube_image: ${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.8.11-9
     kubernetes_contrail_cni_image: ${_param:kubernetes_contrail_cni_repo}/contrail-cni:v1.2.0
     kubernetes_contrail_network_controller_image: ${_param:kubernetes_contrail_network_controller_repo}/contrail-network-controller:v1.2.0