Add support for API Ingress (#255)

* Add support for API Ingress

* Apply suggestions from code review

Co-authored-by: Theis Ferré Hjortkjær <theisferre@gmail.com>
Signed-off-by: Joseph Teddick <43552317+josephteddick@users.noreply.github.com>

* Update Chart patch

Signed-off-by: Joseph Teddick <43552317+josephteddick@users.noreply.github.com>

---------

Signed-off-by: Joseph Teddick <43552317+josephteddick@users.noreply.github.com>
Co-authored-by: Theis Ferré Hjortkjær <theisferre@gmail.com>

Author: josephteddick

charts/opencost/Chart.yaml

@@ -9,7 +9,7 @@ keywords:
   - finops
   - monitoring
   - opencost
-version: 2.1.1
+version: 2.1.2
 maintainers:
   - name: jessegoodier
   - name: toscott

charts/opencost/README.md

@@ -48,6 +48,12 @@ $ helm install opencost opencost/opencost
 | opencost.customPricing.enabled | bool | `false` | Enables custom pricing configuration |
 | opencost.customPricing.provider | string | `"custom"` | Sets the provider type for the custom pricing file. |
 | opencost.dataRetention.dailyResolutionDays | int | `15` |  |
+| opencost.exporter.apiIngress.annotations | object | `{}` | Annotations for API Ingress resource |
+| opencost.exporter.apiIngress.enabled | bool | `false` | Ingress for OpenCost API |
+| opencost.exporter.apiIngress.hosts | list | See [values.yaml](values.yaml) | A list of host rules used to configure the API Ingress |
+| opencost.exporter.apiIngress.ingressClassName | string | `""` | Ingress controller which implements the resource |
+| opencost.exporter.apiIngress.servicePort | string | `"http"` | Redirect ingress to an extraPort defined on the service such as oauth-proxy |
+| opencost.exporter.apiIngress.tls | list | `[]` | Ingress TLS configuration |
 | opencost.exporter.apiPort | int | `9003` |  |
 | opencost.exporter.aws.access_key_id | string | `""` | AWS secret key id |
 | opencost.exporter.aws.secret_access_key | string | `""` | AWS secret access key |

charts/opencost/templates/ingress.yaml

@@ -37,4 +37,45 @@ spec:
                   name: {{ $.Values.opencost.ui.ingress.servicePort }}
         {{- end }}
   {{- end }}
+{{- end }}
+---
+{{- if .Values.opencost.exporter.apiIngress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "opencost.fullname" . }}-api-ingress
+  namespace: {{ include "opencost.namespace" . }}
+  labels: {{- include "opencost.labels" . | nindent 4 }}
+  {{- with .Values.opencost.exporter.apiIngress.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- with .Values.opencost.exporter.apiIngress.ingressClassName }}
+  ingressClassName: {{ . }}
+  {{- end }}
+  {{- if .Values.opencost.exporter.apiIngress.tls }}
+  tls:
+    {{- range .Values.opencost.exporter.apiIngress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.opencost.exporter.apiIngress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ include "opencost.fullname" $ }}
+                port:
+                  name: {{ $.Values.opencost.exporter.apiIngress.servicePort }}
+        {{- end }}
+  {{- end }}
 {{- end }}

charts/opencost/values.yaml

@@ -223,6 +223,29 @@ opencost:
       # FOO: BAR
       # For example, if accessing mimir directly and getting 401 Unauthorized
       # PROMETHEUS_HEADER_X_SCOPE_ORGID: anonymous
+    apiIngress:
+      # -- Ingress for OpenCost API
+      enabled: false
+      # -- Ingress controller which implements the resource
+      ingressClassName: ""
+      # -- Annotations for Ingress resource
+      annotations: {}
+        # kubernetes.io/tls-acme: "true"
+      # -- A list of host rules used to configure the Ingress
+      # @default -- See [values.yaml](values.yaml)
+      hosts:
+        - host: example.local
+          paths:
+            - path: /
+              pathType: Prefix
+      # -- Redirect ingress to an extraPort defined on the service such as oauth-proxy
+      servicePort: http
+      # servicePort: oauth-proxy
+      # -- Ingress TLS configuration
+      tls: []
+        #  - secretName: chart-example-tls
+        #    hosts:
+        #      - chart-example.local
   customPricing:
     # -- Enables custom pricing configuration
     enabled: false