commit c1bdb8832836a912f483dce50e8397f423df26da
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Jul 11 14:44:40 2018 +0000
committer Gerrit Code Review <gerrit2@853267bf53e2> Wed Jul 11 14:44:40 2018 +0000
tree 7eff508b8dd06009b7bb22d451cdfe165e3ce015
parent 82a2ad347197ae306b7f1f9253493ccc26090120
parent 16f855e8387f1c8c419ea61c5368baad81de7025

Merge "Update Calico to v2.6.10"

kubernetes/common.yml

diff --git a/kubernetes/common.yml b/kubernetes/common.yml
index f977997..574614b 100644
--- a/kubernetes/common.yml
+++ b/kubernetes/common.yml
@@ -20,8 +20,8 @@
     # component docker images
     kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
     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_calico_image: ${_param:kubernetes_calico_repo}/node:v2.6.10
+    kubernetes_calico_cni_image: ${_param:kubernetes_calico_cni_repo}/cni:v1.11.6
     kubernetes_hyperkube_image: ${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.10.4-4
     kubernetes_pause_image: ${_param:kubernetes_hyperkube_repo}/pause-amd64:v1.10.4-4
     kubernetes_contrail_cni_image: ${_param:kubernetes_contrail_cni_repo}/contrail-cni:v1.2.0