commit 1113cacb0dcdae5ec5131880d7d88e3caef51a5e
author Andrey Shestakov <ashestakov@mirantis.com> Mon Jan 22 21:57:06 2018 +0200
committer Andrey Shestakov <ashestakov@mirantis.com> Mon Jan 22 21:57:06 2018 +0200
tree 328b67a521f8b567f4170fc16485bbccd6dd60cb
parent c53beed7b39ca37788d1529bf96522bc9d230f41

Set default criproxy version to v0.9.4

Added default parameters for criproxy version.

Change-Id: Idfad33ecace56e914903858dc16f6a4130ec3eab

classes/cluster/k8s-ha-calico/kubernetes/compute.yml

diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index ea131dd..81d740b 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -34,6 +34,8 @@
           enabled: ${_param:kubernetes_virtlet_enabled}
           namespace: ${_param:kubernetes_addon_namespace}
           image: ${_param:kubernetes_virtlet_image}
+          criproxy_version: ${_param:kubernetes_criproxy_version}
+          criproxy_source: ${_param:kubernetes_criproxy_checksum}
           hosts:
           - ${_param:kubernetes_compute01_hostname}
       hyperkube:
@@ -58,4 +60,4 @@
             kubernetes_services:
               address: 10.254.0.0
               netmask: 255.255.0.0
-              gateway: ${_param:deploy_address}
\ No newline at end of file
+              gateway: ${_param:deploy_address}

classes/cluster/k8s-ha-calico/kubernetes/init.yml

diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index 8398678..cf92da5 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -28,6 +28,8 @@
 
     kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
     kubernetes_virtlet_image: mirantis/virtlet:latest
+    kubernetes_criproxy_version: v0.9.4
+    kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
     kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
     kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
     kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5