Merge pull request #307 from gracedo/gracedo/clusterid_cm

feat: Add option to use cm to set CLUSTER_ID envvar

Author: ameijer

charts/opencost/Chart.yaml

@@ -9,7 +9,7 @@ keywords:
 - finops
 - monitoring
 - opencost
-version: 2.3.0
+version: 2.3.1
 maintainers:
 - name: jessegoodier
 - name: toscott

charts/opencost/templates/deployment.yaml

@@ -198,8 +198,17 @@ spec:
                   name: {{ include "opencost.prometheus.secretname" . }}
                   key: CLOUD_PROVIDER_API_KEY
             {{- end }}
+            {{- if and (.Values.opencost.exporter.defaultClusterId) (not .Values.opencost.exporter.clusterIdConfigmap) }}
             - name: CLUSTER_ID
               value: {{ .Values.opencost.exporter.defaultClusterId | quote }}
+            {{- end }}
+            {{- if .Values.opencost.exporter.clusterIdConfigmap }}
+            - name: CLUSTER_ID
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ .Values.opencost.exporter.clusterIdConfigmap }}
+                  key: CLUSTER_ID
+            {{- end }}
             {{- if .Values.opencost.exporter.aws.access_key_id }}
             - name: AWS_ACCESS_KEY_ID
               valueFrom:

charts/opencost/values.yaml

@@ -136,6 +136,9 @@ opencost:
     cloudProviderApiKey: ""
     # -- Default cluster ID to use if cluster_id is not set in Prometheus metrics.
     defaultClusterId: 'default-cluster'
+    # -- If clusterIdConfigmap is defined, use user-generated ConfigMap with key CLUSTER_ID as default cluster ID.
+    # -- This overrides the above defaultClusterId. Ensure the ConfigMap exists and contains the required CLUSTER_ID key.
+    # clusterIdConfigmap: cluster-id-configmap
     image:
       # -- Exporter container image registry
       registry: ghcr.io