Support for extra egress rules and metricConfig ConfigMap (#183)

* feat: Adds support for extra egress rules for NetworkPolicy * feat: Adds support for metricsConfig ConfigMap This will create the /var/configs/metrics.json file for OpenCost to read. * fix: remove extra whitespace --------- Co-authored-by: Tony Scott <[email protected]>
opencost · Mar 26, 2024 · e9fb1d8 · e9fb1d8
1 parent 5046f8f
commit e9fb1d8
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 1 deletion.
diff --git a/charts/opencost/Chart.yaml b/charts/opencost/Chart.yaml
@@ -9,7 +9,7 @@ keywords:
   - finops
   - monitoring
   - opencost
-version: 1.32.0
+version: 1.33.0
 maintainers:
   - name: mattray
   - name: toscott

diff --git a/charts/opencost/templates/configmap-metrics-config.yaml b/charts/opencost/templates/configmap-metrics-config.yaml
@@ -0,0 +1,11 @@
+{{- if .Values.opencost.metrics.config.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-metrics-config
+  namespace: {{ include "opencost.namespace" . }}
+  labels: {{- include "opencost.labels" . | nindent 4 }}
+data:
+  metrics.json: |-
+    {"disabledMetrics": {{ toJson .Values.opencost.metrics.config.disabledMetrics }} }
+{{- end }}
diff --git a/charts/opencost/templates/deployment.yaml b/charts/opencost/templates/deployment.yaml
@@ -111,6 +111,12 @@ spec:
               value: {{ .Values.loglevel }}
             - name: CUSTOM_COST_ENABLED
               value: {{ .Values.plugins.enabled | quote }}
+            - name: KUBECOST_NAMESPACE
+              value: {{ include "opencost.namespace" . }}
+            {{- if .Values.opencost.metrics.config.enabled }}
+            - name: METRICS_CONFIGMAP_NAME
+              value: {{ .Release.Name }}-metrics-config
+            {{- end }}
             {{- if .Values.opencost.exporter.apiPort }}
             - name: API_PORT
               value: {{ .Values.opencost.exporter.apiPort | quote }}

diff --git a/charts/opencost/templates/networkpolicy.yaml b/charts/opencost/templates/networkpolicy.yaml
@@ -42,5 +42,8 @@ spec:
         {{- end }}
       ports:
       - port: {{ .Values.networkPolicies.prometheus.port }}
+    {{- if .Values.networkPolicies.extraEgress -}}
+      {{ toYaml .Values.networkPolicies.extraEgress | nindent 4 }}
+    {{- end -}}
 {{- end }}
 {{- end }}
diff --git a/charts/opencost/values.yaml b/charts/opencost/values.yaml
@@ -63,6 +63,9 @@ networkPolicies:
     labels:
       app.kubernetes.io/name: prometheus
 
+  # -- Extra egress rule
+  extraEgress: []
+
 # --  Strategy to be used for the Deployment
 updateStrategy:
   rollingUpdate:
@@ -295,6 +298,14 @@ opencost:
         # insecureSkipVerify: true
         # keyFile: /etc/prom-certs/key.pem
 
+    config:
+      # -- Enables creating the metrics.json configuration as a ConfigMap
+      enabled: false
+      # -- List of metrics to be disabled
+      disabledMetrics: []
+      # - <metric-to-be-disabled>
+      # - <metric-to-be-disabled>
+
   prometheus:
     # -- Secret name that contains credentials for Prometheus
     secret_name: ~