Merge pull request #136 from Sean-Holcomb/sean/cloud-cost

Add CloudCost values
opencost · Oct 31, 2023 · 2494e5b · 2494e5b
2 parents 2286bc5 + 73ea46f
commit 2494e5b
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 4 deletions.
diff --git a/charts/opencost/Chart.yaml b/charts/opencost/Chart.yaml
@@ -9,7 +9,7 @@ keywords:
   - kubecost
   - opencost
   - monitoring
-version: 1.22.3
+version: 1.23.0
 maintainers:
   - name: mattray
     url: https://mattray.dev

diff --git a/charts/opencost/README.md b/charts/opencost/README.md
@@ -2,7 +2,7 @@
 
 OpenCost and OpenCost UI
 
-![Version: 1.22.3](https://img.shields.io/badge/Version-1.22.3-informational?style=flat-square)
+![Version: 1.23.0](https://img.shields.io/badge/Version-1.23.0-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 ![AppVersion: 1.106.4](https://img.shields.io/badge/AppVersion-1.106.4-informational?style=flat-square)
 

diff --git a/charts/opencost/templates/deployment.yaml b/charts/opencost/templates/deployment.yaml
@@ -150,12 +150,24 @@ spec:
             - name: CONFIG_PATH
               value: {{ .Values.opencost.customPricing.configPath | quote }}
             {{- end }}
+            - name: DATA_RETENTION_DAILY_RESOLUTION_DAYS
+              value: {{ .Values.opencost.dataRetention.dailyResolutionDays | quote }}
+            - name: CLOUD_COST_ENABLED
+              value: {{ .Values.opencost.cloudCost.enabled | quote }}
+            - name: CLOUD_COST_MONTH_TO_DATE_INTERVAL
+              value: {{ .Values.opencost.cloudCost.monthToDateInterval | quote }}
+            - name: CLOUD_COST_REFRESH_RATE_HOURS
+              value: {{ .Values.opencost.cloudCost.refreshRateHours | quote }}
+            - name: CLOUD_COST_QUERY_WINDOW_DAYS
+              value: {{ .Values.opencost.cloudCost.queryWindowDays | quote }}
+            - name: CLOUD_COST_RUN_WINDOW_DAYS
+              value: {{ .Values.opencost.cloudCost.runWindowDays | quote }}
             # Add any additional provided variables
             {{- range $key, $value := .Values.opencost.exporter.extraEnv }}
             - name: {{ $key }}
               value: {{ $value | quote }}
             {{- end }}
-          {{- if or .Values.opencost.exporter.persistence.enabled .Values.opencost.exporter.extraVolumeMounts .Values.opencost.customPricing.enabled}}
+          {{- if or .Values.opencost.exporter.persistence.enabled .Values.opencost.exporter.extraVolumeMounts .Values.opencost.customPricing.enabled .Values.opencost.cloudIntegrationSecret}}
           volumeMounts:
             {{- if .Values.opencost.exporter.persistence.enabled }}
             - mountPath: /mnt/export
@@ -167,6 +179,10 @@ spec:
               name: custom-configs
               readOnly: true
             {{- end }}
+            {{- if .Values.opencost.cloudIntegrationSecret }}
+            - name: cloud-integration
+              mountPath: /var/configs/cloud-integration
+            {{- end }}
             {{- with .Values.opencost.exporter.extraVolumeMounts }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
@@ -240,7 +256,7 @@ spec:
           {{- toYaml . | nindent 12 }}
           {{- end }}
         {{- end }}
-      {{- if or .Values.opencost.exporter.persistence.enabled .Values.extraVolumes .Values.opencost.customPricing.enabled}}
+      {{- if or .Values.opencost.exporter.persistence.enabled .Values.extraVolumes .Values.opencost.customPricing.enabled .Values.opencost.cloudIntegrationSecret}}
       volumes:
         {{- if .Values.opencost.customPricing.enabled }}
         - name: custom-configs
@@ -252,6 +268,14 @@ spec:
           persistentVolumeClaim:
             claimName: {{ include "opencost.fullname" . }}-pvc
         {{- end }}
+        {{- if .Values.opencost.cloudIntegrationSecret }}
+        - name: cloud-integration
+          secret:
+            secretName: {{ .Values.opencost.cloudIntegrationSecret }}
+            items:
+              - key: cloud-integration.json
+                path: cloud-integration.json
+          {{- end }}
         {{- with .Values.extraVolumes }}
           {{- toYaml . | nindent 8 }}
         {{- end }}

diff --git a/charts/opencost/values.yaml b/charts/opencost/values.yaml
@@ -169,6 +169,21 @@ opencost:
       regionNetworkEgress: 0.01
       internetNetworkEgress: 0.12
 
+  dataRetention:
+    dailyResolutionDays: 15
+
+  cloudCost:
+    # -- Enable cloud cost ingestion and querying, dependant on valid integration credentials
+    enabled: false
+    # -- Number of hours between each run of the Cloud Cost pipeline
+    refreshRateHours: 6
+    # -- Number of days into the past that a Cloud Cost standard run will query for
+    runWindowDays: 3
+    # -- The number of standard runs before a Month-to-Date run occurs
+    monthToDateInterval: 6
+    # -- The max number of days that any single query will be made to construct Cloud Costs
+    queryWindowDays: 7
+
 
   metrics:
     serviceMonitor: