From 8e36e646bfa57a74689b795ac8f74f874340638f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20S=C3=A9guillon?= Date: Fri, 24 Apr 2020 18:15:20 +0200 Subject: [PATCH] remove dashboard_metrics_scrapper_enabled --- inventory/sample/group_vars/k8s-cluster/addons.yml | 2 -- roles/download/defaults/main.yml | 2 +- roles/kubernetes-apps/ansible/defaults/main.yml | 3 --- roles/kubespray-defaults/defaults/main.yaml | 2 -- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/inventory/sample/group_vars/k8s-cluster/addons.yml b/inventory/sample/group_vars/k8s-cluster/addons.yml index 3d89672b386..d8f554cf664 100644 --- a/inventory/sample/group_vars/k8s-cluster/addons.yml +++ b/inventory/sample/group_vars/k8s-cluster/addons.yml @@ -2,8 +2,6 @@ # Kubernetes dashboard # RBAC required. see docs/getting-started.md for access details. dashboard_enabled: true -# Dashboard scrapper for metrics-server -dashboard_metrics_scrapper_enabled: true # Helm deployment helm_enabled: false diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 0bb34473cbd..8708e87b31a 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -1140,7 +1140,7 @@ downloads: - kube-master dashboard_metrics_scrapper: - enabled: "{{ dashboard_metrics_scrapper_enabled }}" + enabled: "{{ dashboard_enabled }}" container: true repo: "{{ dashboard_metrics_scraper_repo }}" tag: "{{ dashboard_metrics_scraper_tag }}" diff --git a/roles/kubernetes-apps/ansible/defaults/main.yml b/roles/kubernetes-apps/ansible/defaults/main.yml index 74e40c1ae9b..a68ecec01d4 100644 --- a/roles/kubernetes-apps/ansible/defaults/main.yml +++ b/roles/kubernetes-apps/ansible/defaults/main.yml @@ -61,6 +61,3 @@ dashboard_master_toleration: true # Override dashboard default settings dashboard_token_ttl: 900 dashboard_skip_login: false - -# Enable metrics scrapper for dashboard -dashboard_metrics_scrapper_enabled: true diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index a2ced26dd26..859fc06dc92 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -298,8 +298,6 @@ k8s_image_pull_policy: IfNotPresent # Kubernetes dashboard # RBAC required. see docs/getting-started.md for access details. dashboard_enabled: true -# Enable metrics scrapper for dashboard -dashboard_metrics_scrapper_enabled: true # Addons which can be enabled helm_enabled: false