From 0fab14af7d0b96028c259cea21914429348838b4 Mon Sep 17 00:00:00 2001 From: Damien Ostler Date: Sat, 10 Feb 2024 21:24:51 -0500 Subject: [PATCH] updat eenvironment variables --- charts/ui/templates/deployment.yaml | 11 ++++++++++ charts/ui/values.yaml | 11 ++++++++++ dev/.config/config.json | 21 ------------------ dev/.config/development.json | 33 +++++++++++++++++++++++++++++ dev/apps/ui.yaml | 6 +++++- 5 files changed, 60 insertions(+), 22 deletions(-) delete mode 100644 dev/.config/config.json create mode 100644 dev/.config/development.json diff --git a/charts/ui/templates/deployment.yaml b/charts/ui/templates/deployment.yaml index c101d24..58e78af 100644 --- a/charts/ui/templates/deployment.yaml +++ b/charts/ui/templates/deployment.yaml @@ -36,6 +36,17 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + env: + - name: AUTH0_ISSUER_BASE_URL + value: '{{ .Values.auth0.issuerBaseUrl }}' + - name: AUTH0_CLIENT_ID + value: '{{ .Values.auth0.clientId }}' + - name: AUTH0_CLIENT_SECRET + value: '{{ .Values.auth0.clientSecret }}' + - name: AUTH0_BASE_URL + value: '{{ .Values.auth0.baseUrl }}' + - name: AUTH0_SECRET + value: '{{ .Values.auth0.clientSecret }}' ports: - name: http containerPort: {{ .Values.service.port }} diff --git a/charts/ui/values.yaml b/charts/ui/values.yaml index b3b6243..179e172 100644 --- a/charts/ui/values.yaml +++ b/charts/ui/values.yaml @@ -71,6 +71,17 @@ resources: {} # cpu: 100m # memory: 128Mi +auth0: + issuerBaseUrl: "https://dev-12mb5yq82dow1twh.us.auth0.com" + clientId: "avpoVGBxJfr15m6d3BfTzsEH4v3yBXna" + clientSecret: "rCbTzrXdwZermb-N2GGqnCVI8YSTa32CA3GtuqZcmDRA6X0OGQGyiP4cRkhBSIsd" + baseUrl: "https://development.comissions.app" + +# AUTH0_ISSUER_BASE_URL="https://dev-12mb5yq82dow1twh.us.auth0.com" +# AUTH0_CLIENT_ID="avpoVGBxJfr15m6d3BfTzsEH4v3yBXna" +# AUTH0_CLIENT_SECRET="rCbTzrXdwZermb-N2GGqnCVI8YSTa32CA3GtuqZcmDRA6X0OGQGyiP4cRkhBSIsd" +# AUTH0_BASE_URL="http://localhost:3000" +# AUTH0_SECRET="VX5LKeGHeaqKsgNz8Kn1gQ7MSHmwrXJdC2DMjVY82_YHjiRqdPrVNpFFkXBZy8yh" autoscaling: enabled: false diff --git a/dev/.config/config.json b/dev/.config/config.json deleted file mode 100644 index 4821879..0000000 --- a/dev/.config/config.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "deployment": { - "argocd": { - "project": "comissions.app" - }, - "cluster": { - "name": "in-cluster", - "namespace": "comissions-dev", - "address": "https://kubernetes.default.svc" - } - }, - "apps": { - "core-api": { - "version" : "latest", - "image": "ghcr.io/comissions-app/core-api", - "ingress":{ - "host": "core-api.comissions-dev.com" - } - } - } - } \ No newline at end of file diff --git a/dev/.config/development.json b/dev/.config/development.json new file mode 100644 index 0000000..fbfac46 --- /dev/null +++ b/dev/.config/development.json @@ -0,0 +1,33 @@ +{ + "deployment": { + "argocd": { + "project": "comissions.app" + }, + "cluster": { + "name": "in-cluster", + "namespace": "comissions-dev", + "address": "https://kubernetes.default.svc" + } + }, + "apps": { + "core-api": { + "version" : "latest", + "ingress":{ + "host": "core-api.comissions.dev" + } + }, + "ui" : { + "version" : "latest", + "ingress":{ + "host": "ui.comissions.dev" + }, + "auth0":{ + "issuerBaseUrl" : "https://dev-12mb5yq82dow1twh.us.auth0.com", + "clientId" : "avpoVGBxJfr15m6d3BfTzsEH4v3yBXna", + "clientSecret" : "rCbTzrXdwZermb-N2GGqnCVI8YSTa32CA3GtuqZcmDRA6X0OGQGyiP4cRkhBSIsd", + "baseUrl" : "https://development.comissions.app", + "secret" : "VX5LKeGHeaqKsgNz8Kn1gQ7MSHmwrXJdC2DMjVY82_YHjiRqdPrVNpFFkXBZy8yh" + } + } + } + } \ No newline at end of file diff --git a/dev/apps/ui.yaml b/dev/apps/ui.yaml index a7a1e65..2a9af96 100644 --- a/dev/apps/ui.yaml +++ b/dev/apps/ui.yaml @@ -23,7 +23,11 @@ spec: path: charts/ui helm: values: | - + auth0: + issuerBaseUrl: "https://dev-12mb5yq82dow1twh.us.auth0.com" + clientId: "avpoVGBxJfr15m6d3BfTzsEH4v3yBXna" + clientSecret: "rCbTzrXdwZermb-N2GGqnCVI8YSTa32CA3GtuqZcmDRA6X0OGQGyiP4cRkhBSIsd" + baseUrl: "https://development.comissions.app" image: repository: ghcr.io/comissions-app/ui