Update virtual-mcp11-k8s-calico
Related-PROD: PROD-19474
Change-Id: Ibba09c31e42d2f1beb6eeba1a204662f01080344
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 352aa0e..95462f1 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -11,10 +11,13 @@
- cluster.virtual-mcp11-k8s-calico
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: ${_param:primary_interface}
keepalived_vip_virtual_router_id: 60
+ cluster_local_address: ${_param:deploy_address}
etcd:
server:
+ bind:
+ host: ${_param:deploy_address}
source:
engine: docker_hybrid
ssl:
@@ -26,6 +29,9 @@
kubernetes:
common:
addons:
+ dashboard:
+ enabled: ${_param:kubernetes_dashboard}
+ image: ${_param:kubernetes_dashboard_image}
helm:
enabled: ${_param:kubernetes_helm_enabled}
calico_policy:
@@ -35,6 +41,14 @@
enabled: ${_param:kubernetes_netchecker_enabled}
agent_image: ${_param:kubernetes_netchecker_agent_image}
server_image: ${_param:kubernetes_netchecker_server_image}
+ agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
+ dns:
+ enabled: ${_param:kubernetes_dns}
+ kubedns_image: ${_param:kubernetes_kubedns_image}
+ dnsmasq_image: ${_param:kubernetes_dnsmasq_image}
+ sidecar_image: ${_param:kubernetes_sidecar_image}
+ autoscaler:
+ image: ${_param:kubernetes_dns_autoscaler_image}
coredns:
enabled: ${_param:kubernetes_coredns_enabled}
externaldns:
@@ -43,6 +57,7 @@
provider: ${_param:kubernetes_externaldns_provider}
master:
kubelet:
+ address: ${_param:single_address}
fail_on_swap: ${_param:kubelet_fail_on_swap}
etcd:
ssl:
@@ -56,4 +71,5 @@
namespace:
netchecker:
enabled: ${_param:kubernetes_netchecker_enabled}
-
+ auth:
+ mode: Node,RBAC