Revert "Update sl_k8s_calico models"
This reverts commit e048a839e5d62dab349a5cf20fc9c2886add175f.
Change-Id: Ic03d0e11deabca745a2601ef191acb56e77841b7
diff --git a/classes/cluster/sl_k8s_calico/kubernetes/control.yml b/classes/cluster/sl_k8s_calico/kubernetes/control.yml
index a0c051a..d743dea 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/control.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/control.yml
@@ -5,11 +5,10 @@
- system.salt.minion.cert.etcd_server
- system.kubernetes.master.cluster
- cluster.sl_k8s_calico.kubernetes.compute
-- cluster.sl_k8s_calico.infra
-- cluster.overrides
+- cluster.sl_k8s_calico
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: ${_param:primary_interface}
keepalived_vip_virtual_router_id: 60
etcd:
server:
@@ -24,15 +23,10 @@
kubernetes:
common:
addons:
- helm:
- enabled: ${_param:kubernetes_helm_enabled}
- calico_policy:
- enabled: ${_param:kubernetes_calico_policy_enabled}
- image: ${_param:kubernetes_calico_policy_image}
netchecker:
- enabled: ${_param:kubernetes_netchecker_enabled}
- agent_image: ${_param:kubernetes_netchecker_agent_image}
- server_image: ${_param:kubernetes_netchecker_server_image}
+ enabled: true
+ helm:
+ enabled: true
master:
etcd:
ssl:
@@ -43,5 +37,4 @@
enabled: true
namespace:
netchecker:
- enabled: ${_param:kubernetes_netchecker_enabled}
-
+ enabled: true