feat: improvments and removal of 0.4.17

amikos-tech · Aug 22, 2024 · 74b1982 · 74b1982
1 parent 24127f4
commit 74b1982
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -20,7 +20,6 @@ jobs:
             0.4.7, #auth introduced
             0.4.8, #auth introduced
             0.4.10, #pre-flight checks introduced
-            0.4.17, #multi-tenancy introduced
             0.4.24,
             0.5.0,
             0.5.5,

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -86,7 +86,6 @@ jobs:
           [
             0.4.9,
             0.4.10, #pre-flight checks introduced
-            0.4.17, #multi-tenancy introduced
             0.4.24,
             0.5.5,
           ]

diff --git a/charts/chromadb-chart/templates/config.yaml b/charts/chromadb-chart/templates/config.yaml
@@ -36,6 +36,7 @@ data:
   password: {{ .Values.chromadb.auth.basic.password | default ( randAlphaNum 16 ) | b64enc | quote }}
 {{- end }}
 ---
+{{- if and .Values.chromadb.auth.enabled (eq .Values.chromadb.auth.type "basic") }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -50,7 +51,9 @@ data:
   CHROMA_SERVER_AUTHN_CREDENTIALS_FILE: "/chroma/auth/server.htpasswd"
   CHROMA_SERVER_AUTHN_PROVIDER: "chromadb.auth.basic_authn.BasicAuthenticationServerProvider"
 {{- end }}
+{{- end }}
 ---
+{{- if and  .Values.chromadb.auth.enabled (eq .Values.chromadb.auth.type "token") }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -64,4 +67,5 @@ data:
   CHROMA_SERVER_AUTHN_PROVIDER: "chromadb.auth.token_authn.TokenAuthenticationServerProvider"
   CHROMA_AUTH_TOKEN_TRANSPORT_HEADER: {{ .Values.chromadb.auth.token.headerType }}
 {{- end }}
+{{- end }}
 ---
diff --git a/charts/chromadb-chart/templates/statefulset.yaml b/charts/chromadb-chart/templates/statefulset.yaml
@@ -65,7 +65,7 @@ spec:
         - name: "chromadb"
           image: "{{ .Values.image.repository }}:{{ .Values.chromadb.apiVersion | default .Chart.AppVersion }}"
           imagePullPolicy: "{{ .Values.image.pullPolicy }}"
-          {{- if and .Values.chromadb.auth.enabled (eq .Values.chromadb.auth.type "token")}}
+          {{- if .Values.chromadb.auth.enabled}}
           envFrom:
             - configMapRef:
                 {{- if (eq .Values.chromadb.auth.type "token") }}
@@ -109,10 +109,6 @@ spec:
                   name: chromadb-auth
                   key: token
             {{- end }}
-            {{- if and .Values.chromadb.auth.enabled (eq .Values.chromadb.auth.type "basic") }}
-            - name: CHROMA_SERVER_AUTH_CREDENTIALS_FILE
-              value: "/chroma/auth/server.htpasswd"
-            {{- end }}
           ports:
             - containerPort: {{ .Values.chromadb.serverHttpPort }}
               name: http
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,7 +86,6 @@ jobs: @@
               [
 .4.9,
 .4.10, #pre-flight checks introduced
-.4.17, #multi-tenancy introduced
 .4.24,
 .5.5,
               ]
@@ Expand Down @@