From 1d646db8d5d23b4c60456a3a515c1389e5d21393 Mon Sep 17 00:00:00 2001
From: Jesse Goodier <31039225+jessegoodier@users.noreply.github.com>
Date: Thu, 21 Dec 2023 13:45:21 -0500
Subject: [PATCH] clean up agent values - fix diagnostic pod logic (#2889)

---
 .../templates/diagnostics-deployment.yaml     |  4 +-
 cost-analyzer/values-agent.yaml               | 46 +++++--------------
 2 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/cost-analyzer/templates/diagnostics-deployment.yaml b/cost-analyzer/templates/diagnostics-deployment.yaml
index 5a5ae3cbf..8875f7d51 100644
--- a/cost-analyzer/templates/diagnostics-deployment.yaml
+++ b/cost-analyzer/templates/diagnostics-deployment.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.diagnostics.enabled }}
-{{- if or .Values.global.thanos.enabled (not (empty .Values.kubecostModel.federatedStorageConfigSecret )) -}}
+{{- if or ( not (empty .Values.prometheus.server.extraSecretMounts )) (not (empty .Values.kubecostModel.federatedStorageConfigSecret )) -}}
 
 {{- if eq .Values.prometheus.server.global.external_labels.cluster_id "cluster-one" }}
 {{- fail "Error: The 'cluster_id' is set to default 'cluster-one'. Please update so that the diagnostics service can uniquely identify data coming from this cluster." }}
@@ -46,7 +46,7 @@ spec:
           secret:
            defaultMode: 420
            secretName: {{ .Values.kubecostModel.federatedStorageConfigSecret }}
-        {{- else if .Values.global.thanos.enabled }}
+        {{- else }}
         - name: federated-storage-config
           secret:
             defaultMode: 420
diff --git a/cost-analyzer/values-agent.yaml b/cost-analyzer/values-agent.yaml
index 2f46281dd..9b59b1164 100644
--- a/cost-analyzer/values-agent.yaml
+++ b/cost-analyzer/values-agent.yaml
@@ -1,3 +1,4 @@
+
 # Kubecost running as an Agent is designed for external hosting. The current setup deploys a
 # kubecost-agent pod, low data retention prometheus server + thanos sidecar, and node-exporter.
 networkCosts:
@@ -7,7 +8,8 @@ networkCosts:
   #     amazon-web-services: true
   #     google-cloud-services: true
   #     azure-cloud-services: true
-
+thanos:
+  storeSecretName:  kubecost-agent-object-store
 
 global:
   thanos:
@@ -17,7 +19,7 @@ global:
     proxy: false
 # Agent enables specific features designed to enhance the metrics exporter deployment
 # with enhancements designed for external hosting.
-agent: true
+# agent: true
 # agentKeySecretName: kubecost-agent-object-store
 agentCsi:
   enabled: false
@@ -27,21 +29,15 @@ agentCsi:
     parameters: {}
     secretObjects: {}
 
-
-# No Grafana configuration is required.
-grafana:
-  sidecar:
-    dashboards:
-      enabled: false
-    datasources:
-      defaultDatasourceEnabled: false
+kubecostFrontend:
+  enabled: false
 
 # Exporter Pod
-kubecostMetrics:
-  exporter:
-    enabled: true
-    exportClusterInfo: true
-    exportClusterCache: true
+# kubecostMetrics:
+#   exporter:
+#     enabled: true
+#     exportClusterInfo: true
+#     exportClusterCache: true
 
 # Prometheus defaults to low retention (10h), disables KSM, and attaches a thanos-sidecar
 # for exporting metrics.
@@ -51,26 +47,6 @@ prometheus:
   kube-state-metrics:
     enabled: false
     disabled: true
-  extraScrapeConfigs: |
-    - job_name: kubecost-agent
-      honor_labels: true
-      scrape_interval: 1m
-      scrape_timeout: 60s
-      metrics_path: /metrics
-      scheme: http
-      dns_sd_configs:
-      - names:
-        - kubecost-agent-agent
-        type: 'A'
-        port: 9005
-    - job_name: kubecost-networking
-      kubernetes_sd_configs:
-        - role: pod
-      relabel_configs:
-      # Scrape only the the targets matching the following metadata
-        - source_labels: [__meta_kubernetes_pod_label_app]
-          action: keep
-          regex:  {{ template "cost-analyzer.networkCostsName" . }}
   server:
     retention: 50h
     # retentionSize: 1Gi