Add nginx-ingress addon switcher in k8s models
Change-Id: Ic4e537b59d3c53c3b97be3f10250769da620658e
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
index 4f2bcce..57b41fd 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -56,6 +56,8 @@
enabled: ${_param:kubernetes_metallb_enabled}
addresses:
- ${_param:kubernetes_metallb_addresses_pool}
+ ingress-nginx:
+ enabled: ${_param:kubernetes_ingressnginx_enabled}
master:
kubelet:
address: ${_param:single_address}
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
index 22b959a..7640dc8 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
@@ -87,6 +87,7 @@
kubernetes_coredns_enabled: true
kubernetes_externaldns_enabled: false
kubernetes_metallb_enabled: false
+ kubernetes_ingressnginx_enabled: false
linux:
network:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index 9656362..df24448 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -55,6 +55,8 @@
enabled: ${_param:kubernetes_metallb_enabled}
addresses:
- ${_param:kubernetes_metallb_addresses_pool}
+ ingress-nginx:
+ enabled: ${_param:kubernetes_ingressnginx_enabled}
master:
kubelet:
address: ${_param:single_address}
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index 8becfef..e05ec60 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -86,6 +86,7 @@
kubernetes_coredns_enabled: true
kubernetes_externaldns_enabled: false
kubernetes_metallb_enabled: false
+ kubernetes_ingressnginx_enabled: false
linux:
network:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index f83f9a4..5eddc11 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -80,6 +80,8 @@
enabled: ${_param:kubernetes_externaldns_enabled}
image: ${_param:kubernetes_externaldns_image}
provider: ${_param:kubernetes_externaldns_provider}
+ ingress-nginx:
+ enabled: ${_param:kubernetes_ingressnginx_enabled}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
master:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
index 9248a8a..1ea0664 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
@@ -47,6 +47,7 @@
kubernetes_contrail_network_controller: true
kubernetes_coredns_enabled: true
kubernetes_externaldns_enabled: false
+ kubernetes_ingressnginx_enabled: false
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index 7c2d531..f308676 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -52,6 +52,8 @@
enabled: ${_param:kubernetes_externaldns_enabled}
image: ${_param:kubernetes_externaldns_image}
provider: ${_param:kubernetes_externaldns_provider}
+ ingress-nginx:
+ enabled: ${_param:kubernetes_ingressnginx_enabled}
master:
kubelet:
address: ${_param:single_address}
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index 8bdf4ab..cc1253b 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -51,6 +51,7 @@
kubernetes_contrail_network_controller: true
kubernetes_coredns_enabled: true
kubernetes_externaldns_enabled: false
+ kubernetes_ingressnginx_enabled: false
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/control.yml b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
index f078d3f..a55ccd8 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
@@ -57,6 +57,8 @@
enabled: ${_param:kubernetes_metallb_enabled}
addresses:
- ${_param:kubernetes_metallb_addresses_pool}
+ ingress-nginx:
+ enabled: ${_param:kubernetes_ingressnginx_enabled}
master:
kubelet:
address: ${_param:single_address}
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/init.yml b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
index 7babafd..f1123bb 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
@@ -46,6 +46,7 @@
kubernetes_coredns_enabled: true
kubernetes_externaldns_enabled: false
kubernetes_metallb_enabled: false
+ kubernetes_ingressnginx_enabled: false
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
index 6c1b492..2cf38fa 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
@@ -36,6 +36,8 @@
enabled: ${_param:kubernetes_externaldns_enabled}
image: ${_param:kubernetes_externaldns_image}
provider: ${_param:kubernetes_externaldns_provider}
+ ingress-nginx:
+ enabled: ${_param:kubernetes_ingressnginx_enabled}
master:
etcd:
ssl:
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
index fdc84c0..33b9a1a 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
@@ -26,6 +26,7 @@
# switches of addons
kubernetes_coredns_enabled: true
kubernetes_externaldns_enabled: false
+ kubernetes_ingressnginx_enabled: false
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 74b1eb1..8d4d21a 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -60,6 +60,8 @@
enabled: ${_param:kubernetes_metallb_enabled}
addresses:
- ${_param:kubernetes_metallb_addresses_pool}
+ ingress-nginx:
+ enabled: ${_param:kubernetes_ingressnginx_enabled}
master:
kubelet:
address: ${_param:single_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index cc50448..f5b45d0 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -91,6 +91,7 @@
kubernetes_coredns_enabled: true
kubernetes_externaldns_enabled: false
kubernetes_metallb_enabled: false
+ kubernetes_ingressnginx_enabled: false
linux:
network: