Bump CRIproxy default version and hashes
Also fix CRIproxy arg for 0.10.0
Change-Id: I5683a50f6695273062b68a3c01f1ffa4b298393d
diff --git a/kubernetes/_common.sls b/kubernetes/_common.sls
index a4257b7..11f561e 100644
--- a/kubernetes/_common.sls
+++ b/kubernetes/_common.sls
@@ -45,12 +45,12 @@
/usr/bin/criproxy:
file.managed:
- - source: https://github.com/mirantis/criproxy/releases/download/{{ common.addons.virtlet.get('criproxy_version', 'v0.9.2') }}/criproxy
+ - source: https://github.com/mirantis/criproxy/releases/download/{{ common.addons.virtlet.get('criproxy_version', 'v0.10.0') }}/criproxy
- mode: 750
- makedirs: true
- user: root
- group: root
- - source_hash: {{ common.addons.virtlet.get('criproxy_source', 'md5=c52d3c4e457144c6523570c847a442b2') }}
+ - source_hash: {{ common.addons.virtlet.get('criproxy_source', 'md5=52717b1f70f15558ef4bdb0e4d4948da') }}
{%- if grains.get('noservices') %}
- onlyif: /bin/false
{%- endif %}
diff --git a/kubernetes/files/systemd/criproxy.service b/kubernetes/files/systemd/criproxy.service
index cc6ac41..9d89b4e 100644
--- a/kubernetes/files/systemd/criproxy.service
+++ b/kubernetes/files/systemd/criproxy.service
@@ -15,7 +15,9 @@
-listen /var/run/criproxy.sock \
-v 3 \
-alsologtostderr \
+{%- if version|float < 1.8 %}
-apiVersion {{ version }} \
+{%- endif %}
{%- if pool.get('enabled', False) %}
-streamUrl http://{{ pool.kubelet.address }}:11250
{%- else %}
diff --git a/metadata/service/common.yml b/metadata/service/common.yml
index 62669c8..4aa517c 100644
--- a/metadata/service/common.yml
+++ b/metadata/service/common.yml
@@ -58,9 +58,9 @@
virtlet:
enabled: False
namespace: kube-system
- image: mirantis/virtlet:v0.9.2
- criproxy_version: v0.9.2
- criproxy_source: md5=c52d3c4e457144c6523570c847a442b2
+ image: mirantis/virtlet:v0.9.4
+ criproxy_version: v0.10.0
+ criproxy_source: md5=52717b1f70f15558ef4bdb0e4d4948da
cloudprovider:
enabled: False
provider: openstack