feat: Update eks-cost-explorer and add option to map labels to the me…

…trics
AndreZiviani · Jan 4, 2023 · 14afe80 · 14afe80
1 parent adabf54
commit 14afe80
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/charts/eks-cost-exporter/Chart.yaml b/charts/eks-cost-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: eks-cost-exporter
 description: Exports the cost of each Kubernetes pod as prometheus metrics
 type: application
-appVersion: v0.5.0
-version: 0.5.0
+appVersion: v0.6.0
+version: 0.6.0
 maintainers:
   - name: AndreZiviani
diff --git a/charts/eks-cost-exporter/README.md b/charts/eks-cost-exporter/README.md
@@ -14,6 +14,8 @@ helm repo add andreziviani https://andreziviani.github.io/helm-charts
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| addNodeLabels | list | `[]` |  |
+| addPodLabels | list | `[]` |  |
 | annotations | object | `{}` |  |
 | args | list | `[]` |  |
 | containerSecurityContext.privileged | bool | `false` |  |

diff --git a/charts/eks-cost-exporter/templates/_helpers.tpl b/charts/eks-cost-exporter/templates/_helpers.tpl
@@ -60,3 +60,19 @@ Create the name of the service account
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Convert a list of options to csv
+*/}}
+{{- define "eks-cost-exporter.addPodLabels" -}}
+{{- if gt (len .Values.addPodLabels) 0 }}
+{{- $tmp := join "," .Values.addPodLabels }}
+{{- list "--addPodLabels" $tmp | toYaml }}
+{{- end }}
+{{- end }}
+{{- define "eks-cost-exporter.addNodeLabels" -}}
+{{- if gt (len .Values.addNodeLabels) 0 }}
+{{- $tmp := join "," .Values.addNodeLabels }}
+{{- list "--addNodeLabels" $tmp | toYaml }}
+{{- end }}
+{{- end }}
diff --git a/charts/eks-cost-exporter/templates/deployment.yaml b/charts/eks-cost-exporter/templates/deployment.yaml
@@ -39,10 +39,12 @@ spec:
         - name: eks-cost-exporter
           image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- with .Values.args }}
           args:
+          {{- with .Values.args }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
+            {{ include "eks-cost-exporter.addPodLabels" . | nindent 12 }}
+            {{ include "eks-cost-exporter.addNodeLabels" . | nindent 12 }}
           {{- with .Values.containerSecurityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}

diff --git a/charts/eks-cost-exporter/values.yaml b/charts/eks-cost-exporter/values.yaml
@@ -10,6 +10,16 @@ image:
 
 imagePullSecrets: []
 
+addPodLabels: []
+addNodeLabels: []
+#addPodLabels:
+#  - app
+#  - app.kubernetes.io/name
+#
+#addNodeLabels:
+#  - kubernetes.io/os
+#  - kubernetes.io/arch
+
 args: []
 
 annotations: {}