remove dashboard_metrics_scrapper_enabled

kubernetes-sigs · Apr 24, 2020 · 8e36e64 · 8e36e64
1 parent 8e2ef3f
commit 8e36e64
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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