add support for oauth-proxy sidecar (#84)

Signed-off-by: Matt Ray <[email protected]> Co-authored-by: Matt Ray <[email protected]>
opencost · Oct 19, 2023 · 9e8288e · 9e8288e
1 parent fc1efeb
commit 9e8288e
Show file tree

Hide file tree

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

diff --git a/charts/opencost/templates/deployment.yaml b/charts/opencost/templates/deployment.yaml
@@ -208,6 +208,9 @@ spec:
           volumeMounts: {{- toYaml . | nindent 12 }}
           {{- end }}
         {{- end }}
+        {{- with .Values.opencost.extraContainers }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
       {{- if or .Values.opencost.exporter.persistence.enabled .Values.extraVolumes .Values.opencost.customPricing.enabled}}
       volumes:
         {{- if .Values.opencost.customPricing.enabled }}

diff --git a/charts/opencost/templates/ingress.yaml b/charts/opencost/templates/ingress.yaml
@@ -33,7 +33,7 @@ spec:
               service:
                 name: {{ include "opencost.fullname" $ }}
                 port:
-                  name: http-ui
-          {{- end }}
-    {{- end }}
-{{- end }}
+                  name: {{ $.Values.opencost.ui.ingress.servicePort }}
+        {{- end }}
+  {{- end }}
+{{- end }}
diff --git a/charts/opencost/templates/service.yaml b/charts/opencost/templates/service.yaml
@@ -23,4 +23,7 @@ spec:
       port: 9090
       targetPort: 9090
     {{- end }}
-{{- end }}
+    {{- with .Values.service.extraPorts }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+{{- end }}
diff --git a/charts/opencost/templates/servicemonitor.yaml b/charts/opencost/templates/servicemonitor.yaml
@@ -27,6 +27,9 @@ spec:
       {{- with .Values.opencost.metrics.serviceMonitor.metricRelabelings }}
       metricRelabelings: {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.opencost.metrics.serviceMonitor.extraEndpoints }}
+      {{- toYaml . | nindent 4 }}
+      {{- end }}
   selector:
     matchLabels: {{- include "opencost.selectorLabels" . | nindent 6 }}
   namespaceSelector:

diff --git a/charts/opencost/values.yaml b/charts/opencost/values.yaml
@@ -41,6 +41,14 @@ service:
   labels: {}
   # --  Kubernetes Service type
   type: ClusterIP
+  # -- extra ports.  Useful for sidecar pods such as oauth-proxy
+  extraPorts: []
+    # - name: oauth-proxy
+    #   port: 8081
+    #   targetPort: 8081
+    # - name: oauth-metrics
+    #   port: 8082
+    #   targetPort: 8082
 
 # Create cluster role policies
 rbac:
@@ -171,6 +179,10 @@ opencost:
       relabelings: []
       # -- MetricRelabelConfigs to apply to samples before ingestion
       metricRelabelings: []
+      # -- extra Endpoints to add to the ServiceMonitor.  Useful for scraping sidecars
+      extraEndpoints: []
+        # - port: oauth-metrics
+        #   path: /metrics
 
   prometheus:
     # -- Secret name that contains credentials for Prometheus
@@ -281,11 +293,15 @@ opencost:
         - host: example.local
           paths:
             - /
+      # -- Redirect ingress to an extraPort defined on the service such as oauth-proxy
+      servicePort: http-ui
+      # servicePort: oauth-proxy
       # -- Ingress TLS configuration
       tls: []
         #  - secretName: chart-example-tls
         #    hosts:
         #      - chart-example.local
+
   # -- Toleration labels for pod assignment
   tolerations: []
   # -- Node labels for pod assignment
@@ -295,5 +311,23 @@ opencost:
   # -- Assign custom TopologySpreadConstraints rules
   topologySpreadConstraints: []
 
+  # -- extra sidecars to add to the pod.  Useful for things like oauth-proxy for the UI
+  extraContainers: []
+    # - name: oauth-proxy
+    #   image: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0
+    #   args:
+    #     - --upstream=http://127.0.0.1:9090
+    #     - --http-address=0.0.0.0:8081
+    #     - --metrics-address=0.0.0.0:8082
+    #     - ...
+    #   ports:
+    #     - name: oauth-proxy
+    #       containerPort: 8081
+    #       protocol: TCP
+    #     - name: oauth-metrics
+    #       containerPort: 8082
+    #       protocol: TCP
+    #   resources: {}
+
 # -- A list of volumes to be added to the pod
 extraVolumes: []