From 5f2737f9ee3fac7110492a6bd225398626137c3d Mon Sep 17 00:00:00 2001 From: Alexander L Date: Sun, 9 Jun 2024 02:43:36 +0200 Subject: [PATCH] Add OAuth env vars to API Server deployment (#1500) * Add oauth vars to the kubernetes api server deployment * Add example google oauth id and secret to kubernetes secrets --- .../kubernetes/api_server-service-deployment.yaml | 11 +++++++++++ deployment/kubernetes/secrets.yaml | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/deployment/kubernetes/api_server-service-deployment.yaml b/deployment/kubernetes/api_server-service-deployment.yaml index 5853a3609..eeac5fecc 100644 --- a/deployment/kubernetes/api_server-service-deployment.yaml +++ b/deployment/kubernetes/api_server-service-deployment.yaml @@ -41,6 +41,17 @@ spec: - containerPort: 8080 # There are some extra values since this is shared between services # There are no conflicts though, extra env variables are simply ignored + env: + - name: OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + name: danswer-secrets + key: google_oauth_client_id + - name: OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: danswer-secrets + key: google_oauth_client_secret envFrom: - configMapRef: name: env-configmap diff --git a/deployment/kubernetes/secrets.yaml b/deployment/kubernetes/secrets.yaml index 8193092f4..c135a29f6 100644 --- a/deployment/kubernetes/secrets.yaml +++ b/deployment/kubernetes/secrets.yaml @@ -7,5 +7,5 @@ type: Opaque data: postgres_user: cG9zdGdyZXM= # "postgres" base64 encoded postgres_password: cGFzc3dvcmQ= # "password" base64 encoded - google_oauth_client_id: # You will need to provide this, use echo -n "your-client-id" | base64 - google_oauth_client_secret: # You will need to provide this, use echo -n "your-client-id" | base64 + google_oauth_client_id: ZXhhbXBsZS1jbGllbnQtaWQ= # "example-client-id" base64 encoded. You will need to provide this, use echo -n "your-client-id" | base64 + google_oauth_client_secret: example_google_oauth_secret # "example-client-secret" base64 encoded. You will need to provide this, use echo -n "your-client-id" | base64