fix #5614 (#5615)

Co-authored-by: Peter Laß <peter.lass@maibornwolff.de>
BerriAI · Sep 10, 2024 · b1ecfe0 · b1ecfe0
1 parent 43cd657
commit b1ecfe0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/deploy/charts/litellm-helm/README.md b/deploy/charts/litellm-helm/README.md
@@ -54,6 +54,7 @@ type: Opaque
 | `db.useExisting`                                           | Use an existing Postgres database.  A Kubernetes Secret object must exist that contains credentials for connecting to the database.  An example secret object definition is provided below.  | `false`  |
 | `db.endpoint`                                              | If `db.useExisting` is `true`, this is the IP, Hostname or Service Name of the Postgres server to connect to.                                                                         | `localhost`  |
 | `db.database`                                              | If `db.useExisting` is `true`, the name of the existing database to connect to.                                                                                                       | `litellm`  |
+| `db.url`                                              | If `db.useExisting` is `true`, the connection url of the existing database to connect to can be overwritten with this value.                                                                                                       | `postgresql://$(DATABASE_USERNAME):$(DATABASE_PASSWORD)@$(DATABASE_HOST)/$(DATABASE_NAME)`  |
 | `db.secret.name`                                           | If `db.useExisting` is `true`, the name of the Kubernetes Secret that contains credentials.                                                                                           | `postgres`  |
 | `db.secret.usernameKey`                                    | If `db.useExisting` is `true`, the name of the key within the Kubernetes Secret that holds the username for authenticating with the Postgres instance.                                | `username`  |
 | `db.secret.passwordKey`                                    | If `db.useExisting` is `true`, the name of the key within the Kubernetes Secret that holds the password associates with the above user.                                               | `password`  |

diff --git a/deploy/charts/litellm-helm/templates/deployment.yaml b/deploy/charts/litellm-helm/templates/deployment.yaml
@@ -137,13 +137,8 @@ spec:
               value: {{ .Values.db.endpoint }}
             - name: DATABASE_NAME
               value: {{ .Values.db.database }}
-            {{- end }}
-            {{- if .Values.database.url }}
-            - name: DATABASE_URL
-              value: {{ .Values.database.url | quote }}
-            {{- else }}
             - name: DATABASE_URL
-              value: "postgresql://$(DATABASE_USERNAME):$(DATABASE_PASSWORD)@$(DATABASE_HOST)/$(DATABASE_NAME)"
+              value: {{ .Values.db.url | quote }}
             {{- end }}
             - name: PROXY_MASTER_KEY
               valueFrom:

diff --git a/deploy/charts/litellm-helm/values.yaml b/deploy/charts/litellm-helm/values.yaml
@@ -137,6 +137,7 @@ db:
   # How to connect to the existing postgres server/cluster
   endpoint: localhost
   database: litellm
+  url: postgresql://$(DATABASE_USERNAME):$(DATABASE_PASSWORD)@$(DATABASE_HOST)/$(DATABASE_NAME)
   secret:
     name: postgres
     usernameKey: username