Update k8s-ha-* models
Related-PROD: PROD-25976
Change-Id: Id31e6604c71534086e90b63ae1c0cf3a319ec0b8
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
index ead41e5..1b781a2 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
@@ -1,26 +1,21 @@
classes:
-- system.linux.system.repo.mcp.apt_mirantis.docker
-- system.kubernetes.pool.cluster
- system.linux.network.hosts
-- system.salt.minion.cert.k8s_client
-- system.salt.minion.cert.etcd_client
-- cluster.k8s-ha-calico-flannel-virtlet
+- cluster.k8s-ha-calico-flannel-virtlet.kubernetes.common
+- cluster.k8s-ha-calico-flannel-virtlet.kubernetes.networking.virtual
+- cluster.k8s-ha-calico-flannel-virtlet.infra
+
parameters:
kubernetes:
pool:
- proxy:
- daemon_opts:
- cluster-cidr: ${_param:calico_private_network}/${_param:calico_private_netmask}
kubelet:
address: ${_param:single_address}
fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
genie:
- enabled: true
+ enabled: ${_param:kubernetes_genie_enabled}
default_plugin: calico
- image: ${_param:kubernetes_genie_image}
flannel:
- enabled: true
+ enabled: ${_param:kubernetes_flannel_enabled}
calico:
enabled: true
image: ${_param:kubernetes_calico_image}
@@ -32,44 +27,3 @@
enabled: true
policy:
enabled: ${_param:kubernetes_calico_policy_enabled}
- common:
- addons:
- virtlet:
- 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:
- image: ${_param:kubernetes_hyperkube_image}
- pause_image: ${_param:kubernetes_pause_image}
- linux:
- network:
- resolv:
- dns:
- - 172.18.208.44
- - 172.18.176.4
- - 10.254.0.10
- search:
- - ${_param:cluster_domain}
- interface:
- ens3:
- enabled: true
- type: eth
- proto: static
- name: ${_param:primary_interface}
- address: ${_param:deploy_address}
- netmask: 255.255.255.0
- gateway: 192.168.10.1
- post_up_cmds:
- - ip r rep 10.254.0.0/16 via ${_param:deploy_address}
- ens4:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: '255.255.255.0'
- ipflush_onchange: true
- restart_on_ipflush: true