[chromadb] Removing yq reference in NOTES and exposing token and password

Author: Gaspi

charts/chromadb/Chart.yaml

@@ -12,12 +12,12 @@ sources:
   - https://github.com/chroma-core/chroma
   - https://github.com/amikos-tech/chromadb-chart/
 type: application
-version: 1.0.0
+version: 1.0.1
 appVersion: "0.6.3"
 dependencies:
 - name: chromadb
   version: 0.1.23
   repository: https://amikos-tech.github.io/chromadb-chart
 - name: library-chart
-  version: 1.5.44
+  version: 1.6.12
   repository: https://inseefrlab.github.io/helm-charts-interactive-services

charts/chromadb/templates/NOTES.txt

@@ -19,20 +19,33 @@ kubectl port-forward service/{{ include "chart.fullname" .Subcharts.chromadb }}
 
 {{ end -}}
 
+{{- if .Values.chromadb.chromadb.auth.enabled -}}
+{{- if eq .Values.chromadb.chromadb.auth.type "token" }}
+Your token: **{{ .Values.chromadb.chromadb.auth.token.value }}**
+{{- else }}
+Your username: **{{ .Values.chromadb.chromadb.auth.basic.username }}**
+Your password: **{{ .Values.chromadb.chromadb.auth.basic.password }}**
+{{- end -}}
+{{- else }}
+Access to your service is not authenticated.
+{{- end }}
+
 Configure the access to your service using environment variables:
 ```bash
 export CHROMA_SERVER_HOST={{ $hostname }}
 export CHROMA_SERVER_HTTP_PORT={{ $httpport }}
 
-{{- if .Values.chromadb.chromadb.auth.enabled -}}
+{{- if .Values.chromadb.chromadb.auth.enabled }}
 {{- if eq .Values.chromadb.chromadb.auth.type "token" }}
-export CHROMA_CLIENT_AUTH_CREDENTIALS=$(kubectl get secret chromadb-auth -o jsonpath="{.data.token}" | base64 --decode)
+export CHROMA_CLIENT_AUTH_CREDENTIALS=$(kubectl get secret chromadb-auth -o jsonpath="{.data.token}" | base64 -d)
 export CHROMA_CLIENT_AUTH_PROVIDER=chromadb.auth.token_authn.TokenAuthClientProvider
 export CHROMA_AUTH_TOKEN_TRANSPORT_HEADER={{ .Values.chromadb.chromadb.auth.token.headerType }}
 {{- else }}
-export CHROMA_CLIENT_AUTH_CREDENTIALS=$(kubectl get secret chromadb-auth -o jsonpath="{.data}" | yq '(.username|@base64d)+":"+(.password|@base64d)')
+export CHROMA_CLIENT_AUTH_USERNAME=$(kubectl get secret chromadb-auth -o jsonpath="{.data.username}" | base64 -d)
+export CHROMA_CLIENT_AUTH_PASSWORD=$(kubectl get secret chromadb-auth -o jsonpath="{.data.password}" | base64 -d)
+export CHROMA_CLIENT_AUTH_CREDENTIALS="${CHROMA_CLIENT_AUTH_USERNAME}:${CHROMA_CLIENT_AUTH_PASSWORD}"
 export CHROMA_CLIENT_AUTH_PROVIDER=chromadb.auth.basic_authn.BasicAuthClientProvider
-{{- end -}}
+{{- end }}
 {{- end }}
 ```
 

charts/chromadb/values.schema.json

@@ -132,6 +132,19 @@
                         "value": false,
                         "path": "chromadb/chromadb/auth/enabled"
                       }
+                    },
+                    "value": {
+                      "title": "Service token",
+                      "type": "string",
+                      "default": "changeme",
+                      "render": "password",
+                      "x-onyxia": {
+                        "overwriteDefaultWith": "{{project.password}}"
+                      },
+                      "hidden": {
+                        "value": false,
+                        "path": "chromadb/chromadb/auth/enabled"
+                      }
                     }
                   }
                 }

charts/chromadb/values.yaml

@@ -14,6 +14,7 @@ chromadb:
         password: changeme
       token:
         headerType: Authorization # possible values: Authorization, X-Chroma-Token
+        value: changeme
   serviceAccount:
     create: false # Not properly implemented
   ingress: