Make fail_on_swap for kubelet configurable
Affected models:
- k8s-ha-calico
- k8s-ha-contrail
- virtual-mcp11-k8s-calico
- virtual-mcp11-k8s-contrail
Change-Id: I7d3a7cd606622bcf71683ce36f7ebf7dad3cae58
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index a73a57b..ea131dd 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -18,6 +18,7 @@
pool:
kubelet:
address: ${_param:single_address}
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
etcd:
ssl:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index 1b88da8..ab43539 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -68,6 +68,7 @@
master:
kubelet:
address: ${_param:single_address}
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
etcd:
ssl:
enabled: true
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index c669373..1336dde 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -3,6 +3,9 @@
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
+ # kubelet
+ kubelet_fail_on_swap: True
+
# kubernetes settings
kubernetes_admin_user: admin
kubernetes_admin_password: sbPfel23ZigJF3Bm
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index e3b8396..1b51aa8 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -36,6 +36,7 @@
pool:
kubelet:
address: ${_param:single_address}
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
engine: opencontrail
config:
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index 08760e2..012a0d0 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -54,6 +54,7 @@
master:
kubelet:
address: ${_param:single_address}
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
etcd:
ssl:
enabled: true
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index 822401b..ec8e4de 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -4,6 +4,9 @@
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
+ # kubelet
+ kubelet_fail_on_swap: True
+
# kubernetes settings
kubernetes_admin_user: admin
kubernetes_admin_password: sbPfel23ZigJF3Bm
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index 405b75a..2c58c3d 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -12,6 +12,8 @@
- python-docker
kubernetes:
pool:
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
etcd:
ssl:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 49c80d5..96120d8 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -40,6 +40,8 @@
image: ${_param:kubernetes_externaldns_image}
provider: ${_param:kubernetes_externaldns_provider}
master:
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
etcd:
ssl:
enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index ea70dcc..d3f4430 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -3,6 +3,9 @@
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
+ # kubelet
+ kubelet_fail_on_swap: True
+
# kubernetes settings
kubernetes_admin_user: admin
kubernetes_admin_password: sbPfel23ZigJF3Bm
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index f9bad77..84a8093 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -33,6 +33,8 @@
bip: 172.31.255.1/24
kubernetes:
pool:
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
engine: opencontrail
config:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index e102844..71cbf9c 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -42,6 +42,8 @@
image: ${_param:kubernetes_externaldns_image}
provider: ${_param:kubernetes_externaldns_provider}
master:
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
etcd:
ssl:
enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index 740c4fe..59e2771 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -4,6 +4,9 @@
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
+ # kubelet
+ kubelet_fail_on_swap: True
+
# kubernetes settings
kubernetes_admin_user: admin
kubernetes_admin_password: sbPfel23ZigJF3Bm