Set default criproxy version to v0.9.4
Added default parameters for criproxy version.
Change-Id: Idfad33ecace56e914903858dc16f6a4130ec3eab
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
index 7f9da05..9da4945 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
@@ -33,6 +33,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:
- ${linux:system:name}
hyperkube:
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/init.yml b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
index d90145d..9c4bcb7 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
@@ -25,6 +25,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_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
diff --git a/classes/cluster/k8s-compact/kubernetes/compute.yml b/classes/cluster/k8s-compact/kubernetes/compute.yml
index f520941..198c172 100644
--- a/classes/cluster/k8s-compact/kubernetes/compute.yml
+++ b/classes/cluster/k8s-compact/kubernetes/compute.yml
@@ -27,6 +27,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:
- kube01
hyperkube:
diff --git a/classes/cluster/k8s-compact/kubernetes/init.yml b/classes/cluster/k8s-compact/kubernetes/init.yml
index 70b2cf9..533eef1 100644
--- a/classes/cluster/k8s-compact/kubernetes/init.yml
+++ b/classes/cluster/k8s-compact/kubernetes/init.yml
@@ -33,6 +33,8 @@
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
kubernetes_hyperkube_image: docker-prod-local.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_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
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}
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
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index 1b51aa8..db900d2 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -58,6 +58,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:
- ${linux:system:name}
hyperkube:
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index 801eeed..b6b8f62 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -29,6 +29,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
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index 2c58c3d..de242e8 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -30,6 +30,8 @@
enabled: ${_param:kubernetes_virtlet_enabled}
namespace: kube-system
image: ${_param:kubernetes_virtlet_image}
+ criproxy_version: ${_param:kubernetes_criproxy_version}
+ criproxy_source: ${_param:kubernetes_criproxy_checksum}
hosts:
- ${_param:kubernetes_compute_node01_hostname}
- ${_param:kubernetes_compute_node02_hostname}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index 9b47c2c..09adc04 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -31,6 +31,8 @@
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
kubernetes_virtlet_image: mirantis/virtlet:v0.7.0
+ kubernetes_criproxy_version: v0.9.4
+ kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
kubernetes_externaldns_image: mirantis/external-dns:latest
kubernetes_externaldns_provider: coredns
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 84a8093..5cc9124 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -56,6 +56,8 @@
enabled: ${_param:kubernetes_virtlet_enabled}
namespace: kube-system
image: ${_param:kubernetes_virtlet_image}
+ criproxy_version: ${_param:kubernetes_criproxy_version}
+ criproxy_source: ${_param:kubernetes_criproxy_checksum}
hosts:
- ${_param:kubernetes_compute_node01_hostname}
- ${_param:kubernetes_compute_node02_hostname}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index 5d4def2..8c424b8 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -34,6 +34,8 @@
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
kubernetes_externaldns_image: mirantis/external-dns:latest
kubernetes_externaldns_provider: coredns
+ kubernetes_criproxy_version: v0.9.4
+ kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
# switches of addons
kubernetes_helm_enabled: true