Merge pull request grafana#444 from grafana/jdb/remove-unnecessary-ce…

…rts-and-tokens-from-scrape-config fix: Remove unnecessary certs and tokens from scrape config
stevesg · Feb 10, 2021 · e97f97e · e97f97e
2 parents 49e8089 + 7580ce4
commit e97f97e
Showing 1 changed file with 0 additions and 28 deletions.
diff --git a/prometheus-ksonnet/lib/prometheus-config.libsonnet b/prometheus-ksonnet/lib/prometheus-config.libsonnet
@@ -20,10 +20,6 @@
                 role: 'pod',
               }],
               path_prefix: $._config.alertmanager_path,
-              tls_config: {
-                ca_file: '/var/run/secrets/kubernetes.io/serviceaccount/ca.crt',
-              },
-              bearer_token_file: '/var/run/secrets/kubernetes.io/serviceaccount/token',
               relabel_configs: [{
                 source_labels: ['__meta_kubernetes_pod_label_name'],
                 regex: 'alertmanager',
@@ -63,12 +59,6 @@
           role: 'pod',
         }],
 
-        tls_config: {
-          ca_file: '/var/run/secrets/kubernetes.io/serviceaccount/ca.crt',
-          insecure_skip_verify: $._config.prometheus_insecure_skip_verify,
-        },
-        bearer_token_file: '/var/run/secrets/kubernetes.io/serviceaccount/token',
-
         // You can specify the following annotations (on pods):
         //   prometheus.io.scrape: false - don't scrape this pod
         //   prometheus.io.scheme: https - use https for scraping
@@ -207,12 +197,6 @@
           },
         }],
 
-        tls_config: {
-          ca_file: '/var/run/secrets/kubernetes.io/serviceaccount/ca.crt',
-          insecure_skip_verify: $._config.prometheus_insecure_skip_verify,
-        },
-        bearer_token_file: '/var/run/secrets/kubernetes.io/serviceaccount/token',
-
         relabel_configs: [
 
           // Drop anything who's service is not kube-state-metrics
@@ -251,12 +235,6 @@
           },
         }],
 
-        tls_config: {
-          ca_file: '/var/run/secrets/kubernetes.io/serviceaccount/ca.crt',
-          insecure_skip_verify: $._config.prometheus_insecure_skip_verify,
-        },
-        bearer_token_file: '/var/run/secrets/kubernetes.io/serviceaccount/token',
-
         relabel_configs: [
           // Drop anything who's name is not node-exporter.
           {
@@ -292,12 +270,6 @@
           },
         }],
 
-        tls_config: {
-          ca_file: '/var/run/secrets/kubernetes.io/serviceaccount/ca.crt',
-          insecure_skip_verify: $._config.prometheus_insecure_skip_verify,
-        },
-        bearer_token_file: '/var/run/secrets/kubernetes.io/serviceaccount/token',
-
         relabel_configs: [
 
           // Scrape only kube-dns.