commit 83a3d1d5e06dd846e35b46152ce6d512d2b53c27
author Aleksei Kasatkin <akasatkin@mirantis.com> Fri Aug 24 14:18:25 2018 +0200
committer Aleksei Kasatkin <akasatkin@mirantis.com> Tue Aug 28 18:10:21 2018 +0200
tree 592e4adea792d78e2bdac438472ebb16c18f12ec
parent 0b73180f8a82413e223d5def7f96c373a6e8626b

Update Calico to v3.1.3

Only "k8s-ha-calico" and "k8s-ha-calico-flannel-virtlet" models are updated here.

PROD-21420

Change-Id: I6780f3ddb0ee166f09d42bfab2aeb5995095b08c

classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml

diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
index 2f971f0..4f2bcce 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -36,8 +36,6 @@
           image: ${_param:kubernetes_dashboard_image}
         helm:
           enabled: ${_param:kubernetes_helm_enabled}
-        calico_policy:
-          enabled: ${_param:kubernetes_calico_policy_enabled}
         netchecker:
           enabled: ${_param:kubernetes_netchecker_enabled}
           agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
@@ -75,9 +73,15 @@
           private_ip_range: 10.20.0.0/16
         calico:
           enabled: true
+          image: ${_param:kubernetes_calico_image}
+          calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
+          cni_image: ${_param:kubernetes_calico_cni_image}
+          kube_controllers_image: ${_param:kubernetes_calico_kube_controllers_image}
           etcd:
             ssl:
               enabled: true
+          policy:
+            enabled: ${_param:kubernetes_calico_policy_enabled}
       namespace:
         netchecker:
           enabled: true