Move addons to common section
Change-Id: I39af764601fb84704ba3876f957da10f9ad9e932
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
index bb836a9..1ca4508 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
@@ -22,17 +22,7 @@
key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
kubernetes:
- master:
- etcd:
- ssl:
- enabled: true
- network:
- etcd:
- ssl:
- enabled: true
- namespace:
- netchecker:
- enabled: ${_param:kubernetes_netchecker_enabled}
+ common:
addons:
helm:
enabled: ${_param:kubernetes_helm_enabled}
@@ -44,3 +34,15 @@
agent_image: ${_param:kubernetes_netchecker_agent_image}
server_image: ${_param:kubernetes_netchecker_server_image}
agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
+ master:
+ etcd:
+ ssl:
+ enabled: true
+ network:
+ etcd:
+ ssl:
+ enabled: true
+ namespace:
+ netchecker:
+ enabled: ${_param:kubernetes_netchecker_enabled}
+