Provider related custom pricing config file name (#144)

* Provider related custom pricing config file name RESOLVES: #129 * Bump version --------- Co-authored-by: Moritz Rieger <moritz.rieger@exaring.de> Co-authored-by: Tony Scott <toscott1@gmail.com>
opencost · Nov 11, 2023 · 19f72a5 · 19f72a5
1 parent 7e1acea
commit 19f72a5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/charts/opencost/Chart.yaml b/charts/opencost/Chart.yaml
@@ -9,7 +9,7 @@ keywords:
   - kubecost
   - opencost
   - monitoring
-version: 1.26.1
+version: 1.26.2
 maintainers:
   - name: mattray
     url: https://mattray.dev

diff --git a/charts/opencost/templates/_helpers.tpl b/charts/opencost/templates/_helpers.tpl
@@ -123,3 +123,14 @@ Check that the config is valid
     {{- end -}}
   {{- end -}}
 {{- end -}}
+
+{{/*
+Define opencost config file name
+*/}}
+{{- define "opencost.configFileName" -}}
+  {{- if  eq .Values.opencost.customPricing.provider "custom" -}}
+    {{- print "default" -}}
+  {{- else -}}
+    {{- .Values.opencost.customPricing.provider -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/opencost/templates/configmap-custom-pricing.yaml b/charts/opencost/templates/configmap-custom-pricing.yaml
@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ .Values.opencost.customPricing.configmapName }}
 data:
-  default.json: |-
+  {{ include "opencost.configFileName" . }}.json: |-
     {
 {{- range $key, $val := .Values.opencost.customPricing.costModel }}
 {{ $key | quote | indent 6}}: {{ $val | quote }},