mount nginx.conf as a volume to the frontend container

opencost · Feb 9, 2025 · 38c1121 · 38c1121
1 parent c810b37
commit 38c1121
Show file tree

Hide file tree

Showing 4 changed files with 114 additions and 3 deletions.
diff --git a/charts/opencost/Chart.yaml b/charts/opencost/Chart.yaml
@@ -9,7 +9,7 @@ keywords:
   - finops
   - monitoring
   - opencost
-version: 1.44.0
+version: 2.0.0
 maintainers:
   - name: jessegoodier
   - name: toscott

diff --git a/charts/opencost/templates/configmap-frontend.yaml b/charts/opencost/templates/configmap-frontend.yaml
@@ -0,0 +1,93 @@
+{{- if .Values.opencost.ui.enabled }}
+{{- $serviceName := include "opencost.fullname" . -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: opencost-ui-nginx-conf
+  namespace: {{ .Release.Namespace }}
+data:
+  nginx.conf: |
+    gzip_static  on;
+    gzip on;
+    gzip_min_length 50000;
+    gzip_proxied expired no-cache no-store private auth;
+    gzip_types
+        application/atom+xml
+        application/geo+json
+        application/javascript
+        application/x-javascript
+        application/json
+        application/ld+json
+        application/manifest+json
+        application/rdf+xml
+        application/rss+xml
+        application/vnd.ms-fontobject
+        application/wasm
+        application/x-web-app-manifest+json
+        application/xhtml+xml
+        application/xml
+        font/eot
+        font/otf
+        font/ttf
+        image/bmp
+        image/svg+xml
+        text/cache-manifest
+        text/calendar
+        text/css
+        text/javascript
+        text/markdown
+        text/plain
+        text/xml
+        text/x-component
+        text/x-cross-domain-policy;
+
+    upstream model {
+    {{- if .Values.opencost.ui.useDefaultFqdn }}
+            server {{ $serviceName }}.{{ .Release.Namespace }}.svc.cluster.local:9003;
+    {{- else if .Values.opencost.ui.modelFqdn }}
+            server {{ .Values.opencost.ui.modelFqdn }};
+    {{- else }}
+            server {{ $serviceName }}.{{ .Release.Namespace }}:9003;
+    {{- end }}
+    }
+
+    server {
+        server_name _;
+        root /var/www;
+        index index.html;
+        large_client_header_buffers 4 32k;
+        add_header Cache-Control "must-revalidate";
+
+        error_page 504 /custom_504.html;
+        location = /custom_504.html {
+            internal;
+        }
+
+        add_header Cache-Control "max-age=300";
+        location / {
+            root /var/www;
+            index index.html index.htm;
+            try_files $uri /index.html;
+        }
+
+        add_header ETag "1.96.0";
+        listen {{ .Values.opencost.ui.uiPort }};
+        listen [::]:{{ .Values.opencost.ui.uiPort }};
+        resolver 127.0.0.1 valid=5s;
+        location /healthz {
+            access_log /dev/null;
+            return 200 'OK';
+        }
+        location /model/ {
+            proxy_connect_timeout       180;
+            proxy_send_timeout          180;
+            proxy_read_timeout          180;
+            proxy_pass http://model/;
+            proxy_redirect off;
+            proxy_http_version 1.1;
+            proxy_set_header Connection "";
+            proxy_set_header  X-Real-IP  $remote_addr;
+            proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+    }
+{{- end }}
diff --git a/charts/opencost/templates/deployment.yaml b/charts/opencost/templates/deployment.yaml
@@ -312,9 +312,13 @@ spec:
           {{- with .Values.opencost.ui.securityContext }}
           securityContext: {{- toYaml . | nindent 12 }}
           {{- end }}
+          volumeMounts:
           {{- with .Values.opencost.ui.extraVolumeMounts }}
-          volumeMounts: {{- toYaml . | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
           {{- end }}
+            - name: opencost-ui-nginx-config-volume
+              mountPath: /etc/nginx/conf.d/default.nginx.conf
+              subPath: default.nginx.conf
         {{- end }}
         {{- with .Values.opencost.extraContainers }}
           {{- toYaml . | nindent 8 }}
@@ -352,7 +356,7 @@ spec:
           {{- toYaml . | nindent 12 }}
           {{- end }}
         {{- end }}
-      {{- if or .Values.plugins.enabled .Values.opencost.exporter.persistence.enabled .Values.extraVolumes .Values.opencost.customPricing.enabled .Values.opencost.cloudIntegrationSecret}}
+      {{- if or .Values.plugins.enabled .Values.opencost.exporter.persistence.enabled .Values.extraVolumes .Values.opencost.customPricing.enabled }}
       volumes:
         {{- if .Values.plugins.enabled  }}
         {{- if .Values.plugins.install.enabled}}
@@ -389,6 +393,14 @@ spec:
               - key: cloud-integration.json
                 path: cloud-integration.json
           {{- end }}
+          {{- if .Values.opencost.ui.enabled }}
+        - name: opencost-ui-nginx-config-volume
+          configMap:
+            name: opencost-ui-nginx-config
+            items:
+              - key: nginx.conf
+                path: default.nginx.conf
+          {{- end }}
         {{- with .Values.extraVolumes }}
           {{- toYaml . | nindent 8 }}
         {{- end }}

diff --git a/charts/opencost/values.yaml b/charts/opencost/values.yaml
@@ -444,6 +444,12 @@ opencost:
     # -- A list of volume mounts to be added to the pod
     extraVolumeMounts: []
 
+    # set to true to set upstream to use <service>.<namespace>.svc.cluster.local instead of just <service>.<namespace>
+    useDefaultFqdn: false
+
+    # Set the model fqdn to use for the upstream
+    # modelFqdn: opencost.opencost.svc.cluster.local:9003
+
     ingress:
       # -- Ingress for OpenCost UI
       enabled: false