From 2352b7eab1973d85081618935e6c36ada0d7f95a Mon Sep 17 00:00:00 2001
From: Anton Petruhin <anton.petruhin@gmail.com>
Date: Mon, 1 Jul 2024 20:09:19 +0400
Subject: [PATCH] coroot v1.3.0

---
 charts/coroot/Chart.yaml                   |  6 +--
 charts/coroot/templates/cluster-agent.yaml | 44 +++++++++++++---------
 charts/coroot/values.yaml                  | 13 ++++++-
 3 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/charts/coroot/Chart.yaml b/charts/coroot/Chart.yaml
index 49875d9..fcd7b71 100644
--- a/charts/coroot/Chart.yaml
+++ b/charts/coroot/Chart.yaml
@@ -2,15 +2,15 @@ apiVersion: v2
 name: coroot
 description: A monitoring and troubleshooting tool for microservice architectures.
 type: application
-version: 0.12.4
-appVersion: "1.2.1"
+version: 0.13.0
+appVersion: "1.3.0"
 dependencies:
   - name: prometheus
     repository: https://prometheus-community.github.io/helm-charts
     version: 15.16.*
     condition: prometheus.enabled
   - name: node-agent
-    version: 0.1.78
+    version: 0.1.79
     repository: https://coroot.github.io/helm-charts
     condition: node-agent.enabled
   - name: clickhouse
diff --git a/charts/coroot/templates/cluster-agent.yaml b/charts/coroot/templates/cluster-agent.yaml
index 265948e..18f22d3 100644
--- a/charts/coroot/templates/cluster-agent.yaml
+++ b/charts/coroot/templates/cluster-agent.yaml
@@ -23,18 +23,6 @@ roleRef:
 
 ---
 
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "corootClusterAgent.name" . }}
-  labels:
-    {{- include "corootClusterAgent.labels" . | nindent 4 }}
-data:
-  config.yaml: |
-  {{- toYaml .Values.corootClusterAgent.config | nindent 4 }}
-
----
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -85,19 +73,39 @@ spec:
             {{- toYaml .Values.corootClusterAgent.securityContext | nindent 12 }}
           image: "{{ .Values.corootClusterAgent.image.repository }}:{{ .Values.corootClusterAgent.image.tag }}"
           imagePullPolicy: {{ .Values.corootClusterAgent.image.pullPolicy }}
+          env:
+            - name: LISTEN
+              value: "{{ .Values.corootClusterAgent.config.listen }}"
+            - name: COROOT_URL
+              value: "{{ .Values.corootClusterAgent.config.coroot_url }}"
+            - name: API_KEY
+              value: "{{ .Values.corootClusterAgent.config.api_key }}"
+            - name: CONFIG_UPDATE_INTERVAL
+              value: "{{ .Values.corootClusterAgent.config.config.update.interval }}"
+            - name: CONFIG_UPDATE_TIMEOUT
+              value: "{{ .Values.corootClusterAgent.config.config.update.timeout }}"
+            - name: METRICS_SCRAPE_INTERVAL
+              value: "{{ .Values.corootClusterAgent.config.metrics.scrape.interval }}"
+            - name: METRICS_SCRAPE_TIMEOUT
+              value: "{{ .Values.corootClusterAgent.config.metrics.scrape.timeout }}"
+            - name: METRICS_WAL_DIR
+              value: "{{ .Values.corootClusterAgent.config.metrics.wal_dir }}"
+            - name: PROFILES_SCRAPE_INTERVAL
+              value: "{{ .Values.corootClusterAgent.config.profiles.scrape.interval }}"
+            - name: PROFILES_SCRAPE_TIMEOUT
+              value: "{{ .Values.corootClusterAgent.config.profiles.scrape.timeout }}"
           {{- with .Values.corootClusterAgent.env }}
           {{- . | toYaml | nindent 12 }}
           {{- end }}
           resources:
             {{- toYaml .Values.corootClusterAgent.resources | nindent 12 }}
           volumeMounts:
-            - name: config
-              mountPath: /config.yaml
-              subPath: config.yaml
+            - mountPath: /tmp
+              name: tmp
+              readOnly: false
       volumes:
-        - name: config
-          configMap:
-            name: {{ include "corootClusterAgent.name" . }}
+        - emptyDir: {}
+          name: tmp
       {{- with .Values.corootClusterAgent.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/coroot/values.yaml b/charts/coroot/values.yaml
index 248ff95..44e17ba 100644
--- a/charts/coroot/values.yaml
+++ b/charts/coroot/values.yaml
@@ -105,13 +105,24 @@ corootClusterAgent:
   config:
     listen: :8080
     coroot_url: http://coroot:8080
+    api_key:
+    config:
+      update:
+        interval: 60s
+        timeout: 10s
+    metrics:
+      scrape:
+        interval: 15s
+        timeout: 10s
+      wal_dir:
     profiles:
       scrape:
         interval: 1m
+        timeout: 10s
   image:
     repository: ghcr.io/coroot/coroot-cluster-agent
     pullPolicy: IfNotPresent
-    tag: "0.2.0"
+    tag: "1.0.3"
   imagePullSecrets: []
   podAnnotations: {}
   podSecurityContext: {}