Merge "Remove docker-related definitions from k8s models."
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 df26498..6644937 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -58,6 +58,8 @@
- ${_param:kubernetes_metallb_addresses_pool}
ingress-nginx:
enabled: ${_param:kubernetes_ingressnginx_enabled}
+ metrics-server:
+ enabled: ${_param:kubernetes_metrics_server_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 17a1b6e..41c03a8 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
@@ -81,6 +81,7 @@
kubernetes_externaldns_enabled: false
kubernetes_metallb_enabled: false
kubernetes_ingressnginx_enabled: false
+ kubernetes_metrics_server_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 3786be8..2efade9 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -57,6 +57,8 @@
- ${_param:kubernetes_metallb_addresses_pool}
ingress-nginx:
enabled: ${_param:kubernetes_ingressnginx_enabled}
+ metrics-server:
+ enabled: ${_param:kubernetes_metrics_server_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 08b2dc3..62ae9a1 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -79,6 +79,7 @@
kubernetes_externaldns_enabled: false
kubernetes_metallb_enabled: false
kubernetes_ingressnginx_enabled: false
+ kubernetes_metrics_server_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 29b9565..5ccc75b 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -78,6 +78,8 @@
provider: ${_param:kubernetes_externaldns_provider}
ingress-nginx:
enabled: ${_param:kubernetes_ingressnginx_enabled}
+ metrics-server:
+ enabled: ${_param:kubernetes_metrics_server_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 cb74376..5886066 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_coredns_enabled: true
kubernetes_externaldns_enabled: false
kubernetes_ingressnginx_enabled: false
+ kubernetes_metrics_server_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 ea86427..9583727 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
@@ -59,6 +59,8 @@
- ${_param:kubernetes_metallb_addresses_pool}
ingress-nginx:
enabled: ${_param:kubernetes_ingressnginx_enabled}
+ metrics-server:
+ enabled: ${_param:kubernetes_metrics_server_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 fdcb029..225e3a9 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
@@ -43,6 +43,7 @@
kubernetes_externaldns_enabled: false
kubernetes_metallb_enabled: false
kubernetes_ingressnginx_enabled: false
+ kubernetes_metrics_server_enabled: false
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/control.yml
index 5c131c7..9cafe3e 100644
--- a/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/control.yml
@@ -54,6 +54,8 @@
provider: ${_param:kubernetes_externaldns_provider}
ingress-nginx:
enabled: ${_param:kubernetes_ingressnginx_enabled}
+ metrics-server:
+ enabled: ${_param:kubernetes_metrics_server_enabled}
master:
kubelet:
address: ${_param:single_address}
diff --git a/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/init.yml
index cc1253b..800b18a 100644
--- a/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/init.yml
@@ -52,6 +52,7 @@
kubernetes_coredns_enabled: true
kubernetes_externaldns_enabled: false
kubernetes_ingressnginx_enabled: false
+ kubernetes_metrics_server_enabled: false
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/control.yml b/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/control.yml
index 7de9af4..cf233b2 100644
--- a/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/control.yml
@@ -38,6 +38,8 @@
provider: ${_param:kubernetes_externaldns_provider}
ingress-nginx:
enabled: ${_param:kubernetes_ingressnginx_enabled}
+ metrics-server:
+ enabled: ${_param:kubernetes_metrics_server_enabled}
master:
etcd:
ssl:
diff --git a/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/init.yml b/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/init.yml
index ba2f148..38e2135 100644
--- a/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/init.yml
@@ -28,6 +28,7 @@
kubernetes_externaldns_enabled: false
kubernetes_ingressnginx_enabled: false
kubernetes_virtlet_enabled: true
+ kubernetes_metrics_server_enabled: false
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 1c201ee..8114764 100644
--- a/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -62,6 +62,8 @@
- ${_param:kubernetes_metallb_addresses_pool}
ingress-nginx:
enabled: ${_param:kubernetes_ingressnginx_enabled}
+ metrics-server:
+ enabled: ${_param:kubernetes_metrics_server_enabled}
master:
kubelet:
address: ${_param:single_address}
diff --git a/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/init.yml
index f5b45d0..2bd1cd5 100644
--- a/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -92,6 +92,7 @@
kubernetes_externaldns_enabled: false
kubernetes_metallb_enabled: false
kubernetes_ingressnginx_enabled: false
+ kubernetes_metrics_server_enabled: false
linux:
network:
diff --git a/classes/system b/classes/system
index ce4124b..2649741 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit ce4124bc7d543448e153342f22a54a31b0e293ea
+Subproject commit 264974184ac6d055cb34043c0750d9a283d08c2d