Merge branch 'main' into feat/otlp-oidc-patches

Author: Randoooom

Cargo.lock

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.1
+version: 0.3.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.4.0"
+appVersion: "0.4.0"

charts/feedback-fusion/Chart.yaml

@@ -69,9 +69,9 @@ Create the name of the service account to use
 {{- if .Values.dashboard.fullnameOverride }}
 {{- .Values.dashboard.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
-{{- $name := default .Chart.Name .Values.dashboard.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- $name := default (printf "%s-%s" .Chart.Name "dashboard") .Values.dashboard.nameOverride }}
+{{- if contains $name (printf "%s-%s" .Release.Name "dashboard") }}
+{{- printf "%s-%s" .Release.Name "dashboard" | trunc 63 | trimSuffix "-" }}
 {{- else }}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
 {{- end }}

charts/feedback-fusion/templates/_helpers.tpl

@@ -1,6 +1,6 @@
 {{- if .Values.api.ingress.enabled -}}
 {{- $fullName := include "feedback-fusion.fullname" . -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}

charts/feedback-fusion/templates/api-ingress.yaml

@@ -30,41 +30,28 @@ spec:
       securityContext:
         {{- toYaml .Values.dashboard.podSecurityContext | nindent 8 }}
       containers:
-        - name: {{ .Chart.Name }}
+        - name: {{ .Chart.Name }}-dashboard
           securityContext:
             {{- toYaml .Values.dashboard.securityContext | nindent 12 }}
           image: "{{ .Values.dashboard.image.repository }}:{{ .Values.dashboard.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.dashboard.image.pullPolicy }}
           ports:
-            - name: grpc
-              containerPort: 8000 
+            - name: http
+              containerPort: 3000 
               protocol: TCP
-          env:
-            - name: RUST_LOG 
-              value: {{ .Values.feedbackFusion.log }}
-            - name: FEEDBACK_FUSION_CONFIG
-              value: /etc/config/config.yaml
           livenessProbe:
             {{- toYaml .Values.dashboard.livenessProbe | nindent 12 }}
           startupProbe:
             {{- toYaml .Values.dashboard.startupProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.dashboard.resources | nindent 12 }}
-          volumeMounts:
-            {{- with .Values.dashboard.volumeMounts }}
-            {{- toYaml . | nindent 12 }}
-            {{- end }}
-
-            - name: {{ .Values.feedbackFusion.config.secret }}
-              mountPath: /etc/config
+          envFrom:
+            - secretRef:
+                name: {{ .Values.feedbackFusion.dashboard.config.secret }}
       volumes:
         {{- with .Values.dashboard.volumes }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-
-        - name: {{ .Values.feedbackFusion.config.secret }}
-          secret:
-            secretName: {{ .Values.feedbackFusion.config.secret }}
       {{- with .Values.dashboard.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/feedback-fusion/templates/dashboard-deployment.yaml

@@ -1,6 +1,6 @@
 {{- if and .Values.dashboard.ingress.enabled .Values.dashboard.enabled -}}
 {{- $fullName := include "feedback-fusion-dashboard.fullname" . -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}

charts/feedback-fusion/templates/dashboard-ingress.yaml

@@ -234,3 +234,7 @@ feedbackFusion:
     # -- the secret containing the config.yaml
     # For all configuration options see https://onelitefeathernet.github.io/feedback-fusion/nightly/docs/configuration.html
     secret: feedback-fusion-config
+
+  dashboard:
+    config:
+      secret: feedback-fusion-dashboard-config

charts/feedback-fusion/values.yaml

@@ -80,4 +80,3 @@ export default defineNuxtConfig({
     bundledThemes: ["github-dark", "github-light"],
   },
 });
-

dashboard/nuxt.config.ts

@@ -176,9 +176,9 @@ impl<'de> Visitor<'de> for OIDCClaimsVisitor {
 
         let iss = iss.ok_or_else(|| serde::de::Error::missing_field("iss"))?;
         let iat = iat.ok_or_else(|| serde::de::Error::missing_field("iat"))?;
-        let aud = aud.or_else(|| Some(jwt::Audiences::default())).unwrap();
+        let aud = aud.unwrap_or(jwt::Audiences::default());
         let exp = exp.ok_or_else(|| serde::de::Error::missing_field("exp"))?;
-        let scope = scope.ok_or_else(|| serde::de::Error::missing_field("scope"))?;
+        let scope = scope.unwrap_or(Scope::empty());
         let groups = groups
             .ok_or_else(|| serde::de::Error::missing_field(CONFIG.oidc().group_claim().as_str()))?;