Move addons to common section
* Move addons to common section of metadata
* Add conditional logic to install criproxy when virtlet is enabled
* Adding -%} to remove empty lines produced by jinja
Doc-Impact
Change-Id: I1c91deffb51cc42da46bc2559fd01c50f9ce4e27
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index fb17497..7262174 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -35,45 +35,6 @@
name: ${_param:cluster_node02_hostname}
- host: ${_param:cluster_node03_address}
name: ${_param:cluster_node03_hostname}
- addons:
- dns:
- enabled: true
- replicas: 1
- autoscaler:
- enabled: true
- domain: ${_param:kubernetes_cluster_domain}
- server: 10.254.0.10
- dnsmasq:
- cache-size: 1000
- no-resolv:
- server: 127.0.0.1#10053
- log-facility: "-"
- dashboard:
- enabled: True
- heapster_influxdb:
- enabled: False
- helm:
- enabled: False
- tiller_image: gcr.io/kubernetes-helm/tiller:v2.3.0
- netchecker:
- enabled: False
- interval: 60
- namespace: netchecker
- port: 80
- agent_image: mirantis/k8s-netchecker-agent:v1.1.0
- server_image: mirantis/k8s-netchecker-server:v1.1.0
- calico_policy:
- enabled: False
- image: calico/kube-policy-controller:v0.5.4
- namespace: kube-system
- contrail_network_controller:
- enabled: False
- namespace: kube-system
- image: yashulyak/contrail-controller:latest
- virtlet:
- enabled: False
- namespace: kube-system
- image: mirantis/virtlet:latest
token:
admin: ${_param:kubernetes_admin_token}
kubelet: ${_param:kubernetes_kubelet_token}
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 86d5b7e..ac9e2aa 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -61,7 +61,7 @@
virtlet:
enabled: False
namespace: kube-system
- image: mirantis/virtlet:latest
+ image: mirantis/virtlet:v0.7.0
token:
admin: ${_param:kubernetes_admin_token}
kubelet: ${_param:kubernetes_kubelet_token}