chore: adapt chart and docs

Author: Randoooom

charts/feedback-fusion/templates/configmap-preset.yaml

@@ -38,14 +38,11 @@ spec:
             - name: grpc
               containerPort: 8000 
               protocol: TCP
-          envFrom:
-            - secretRef:
-                name: {{ .Values.feedbackFusion.config.secret }}
           env:
-            {{- if .Values.feedbackFusion.preset.enabled }}
-            - name: CONFIG_PATH
+            - name: RUST_LOG 
+              value: INFO 
+            - name: FEEDBACK_FUSION_CONFIG
               value: /etc/config/config.yaml
-            {{- end }}
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           startupProbe:
@@ -57,20 +54,16 @@ spec:
             {{- toYaml . | nindent 12 }}
             {{- end }}
 
-            {{- if .Values.feedbackFusion.preset.enabled  }}
-            - name: {{ .Values.feedbackFusion.preset.name }}
+            - name: {{ .Values.feedbackFusion.config.secret }}
               mountPath: /etc/config
-            {{- end }}
       volumes:
         {{- with .Values.volumes }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
 
-        {{- if .Values.feedbackFusion.preset.enabled  }}
-        - name: {{ .Values.feedbackFusion.preset.name }}
-          configMap:
-            name: {{ .Values.feedbackFusion.preset.name }}
-        {{- end }}
+        - name: {{ .Values.feedbackFusion.config.secret }}
+          secret:
+            secretName: {{ .Values.feedbackFusion.config.secret }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/feedback-fusion/templates/deployment.yaml

@@ -93,52 +93,9 @@ tolerations: []
 affinity: {}
 
 feedbackFusion:
-  preset: 
-    enabled: false
-    name: feedback-fusion-preset
-    create: false 
-    data:
-      # targets:
-      #   - id: target 
-      #     name: TestTarget 
-      #     description: A nice Target 
-      #     prompts:
-      #       - id: prompt 
-      #         title: Testprompt 
-      #         description: A nice Prompt 
-      #         active: true
-      #         fields:
-      #           - id: field1 
-      #             title: TextField
-      #             field_type: text 
-      #             options:
-      #               type: text
-      #               lines: 1 
-      #               placeholder: test
-
-
   config: 
+    # with config.yaml as key
     secret: feedback-fusion-config
-    # RUST_LOG: INFO
-    # OIDC_AUDIENCE: ""
-    # OIDC_PROVIDER: ""
-    #
-    # POSTGRES_ENDPOINT: ""
-    # POSTGRES_USERNAME: ""
-    # POSTGRES_PASWORD: ""
-    # POSTGRES_DATABASE: ""
-    #
-    # MYSQL_ENDPOINT: ""
-    # MYSQL_USERNAME: ""
-    # MYSQL_PASWORD: ""
-    # MYSQL_DATABASE: ""
-    #
-    # MSSQL_ENDPOINT: ""
-    # MSSQL_USERNAME: ""
-    # MSSQL_PASWORD: ""
-    # MSSQL_DATABASE: ""
-    # MSSQL_ENCRYPT: true
-    # MSSQL_TRUST_SERVER_CERTIFICATE: true
 
   testSecret: feedback-fusion-integration-test
 

charts/feedback-fusion/values.yaml

@@ -19,11 +19,13 @@ services:
       - "8000:8000"
     environment:
       RUST_LOG: INFO 
-      # add here your configuration
+      FEEDBACK_FUSION_CONFIG: /path/to/container/config
     restart: unless-stopped
+    volumes:
+      - /path/to/config:/path/to/container/config
 ```
 
-Add in as `environment` your actual configuration values. Refer to the [configuration documentation](/docs/configuration) for the fields that need to be set.
+Refer to the [configuration documentation](/docs/configuration) for the config file details. 
 
 Afterwards start the application:
 

docs/docs/deployment/docker.md

@@ -8,8 +8,9 @@ For more information regarding the documentation checkout the [Configuration](/d
 
 ## Example with Jaeger
 
-To configure FeedbackFusion to use Jaeger for distributed tracing, you need to set the `OTLP_ENDPOINT` to Jaeger's default OTLP port:
+To configure FeedbackFusion to use Jaeger for distributed tracing, you need to set the endpoint to Jaeger's default OTLP port:
 
-```sh
-OTLP_ENDPOINT=http://jaeger:4317
+```yaml
+otlp:
+  endpoint: http://jaeger:4317
 ```