cleaned up manifests and charts

charts/core-api/templates/deployment.yaml

@@ -37,22 +37,32 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
+          - name: UI__BaseUrl
+            value: {{.Values.auth.baseUrl}}
+          - name: Auth0__Audience
+            value: {{ .Values.auth.audience}}
+          - name: Auth0__Domain
+            value: {{ .Values.auth.issuerBaseUrl }}
           - name: Auth0__ClientId
-            value: 19GWUL7fWFQWEpdFFtlgv2x3kqfSa0ES
+            value: {{ .Values.auth.clientId }}
           - name: Auth0__ClientSecret
-            value: VX5LKeGHeaqKsgNz8Kn1gQ7MSHmwrXJdC2DMjVY82_YHjiRqdPrVNpFFkXBZy8yh
+            value: {{ .Values.auth.clientSecret }}
           - name: Stripe__WebHookSecret
-            value: 'whsec_I4tVknFRWurdaFnFzAVFEYGxJcVxsOYM'
+            value: '{{ .Values.stripe.webhookSecret }}'
+          - name: Stripe__ApiKey
+            value: '{{ .Values.stripe.apiKey }}'
+          - name: Novu__ApiKey
+            value: '{{ .Values.novu.apiKey }}'
           - name: Database__Host
-            value: '{{ .Values.postgresHost }}'
+            value: '{{ .Values.postgres.host }}'
           - name: Database__Port
-            value: '{{ .Values.postgresPort }}'
+            value: '{{ .Values.postgres.port }}'
           - name: Database__Database
-            value: '{{ .Values.postgresDatabase }}'
+            value: '{{ .Values.postgres.database }}'
           - name: Database__username
-            value: '{{ .Values.postgresUser }}'
+            value: '{{ .Values.postgres.user }}'
           - name: Database__password
-            value: '{{ .Values.postgresPassword }}'
+            value: '{{ .Values.postgres.password }}'
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}

charts/core-api/values.yaml

@@ -38,12 +38,29 @@ securityContext: {}
   # readOnlyRootFilesystem: true
   # runAsNonRoot: true
   # runAsUser: 1000
+ui:
+  baseUrl: "http://localhost:3000"
+
+postgres:
+  host: "acid-minimal-cluster"
+  port : 5432
+  user: "postgres"
+  password: "tbXeXzpmPK8l5e3DW6S3IXxzIO9CYCx0d5Ow0q50jgLyx0USEselZuC9JIuJi8Oo"
+  database: comissionsapp
+
+auth:
+  audience: "https://api.artplatform.com"
+  clientId: "19GWUL7fWFQWEpdFFtlgv2x3kqfSa0ES"
+  clientSecret: "VX5LKeGHeaqKsgNz8Kn1gQ7MSHmwrXJdC2DMjVY82_YHjiRqdPrVNpFFkXBZy8yh"
+  domain: "https://dev-12mb5yq82dow1twh.us.auth0.com/"
+
+stripe:
+  apiKey: "sk_test_51OdJ1SLooS0IZqYkx2IdNoLcscm6BisgaUyYVIc5jM1RMmarww2e9hLLQS3Atn6TQi00p9YQkCLGQPhAI2gf9ZSY00HmbQYCvP"
+  webhookSecret: "whsec_WTxw2seQHaJjSbLiRr1q8fs1wh8vGdGn"
+
+novu:
+  apiKey: "287ad99d1cbeba7f96a7d2637b022e6f"
 
-postgresHost : "acid-minimal-cluster"
-postgresPort : 5432
-postgresUser: "postgres"
-postgresPassword: "tbXeXzpmPK8l5e3DW6S3IXxzIO9CYCx0d5Ow0q50jgLyx0USEselZuC9JIuJi8Oo"
-postgresDatabase: comissionsapp
 service:
   type: ClusterIP
   port: 8080

charts/ui/templates/deployment.yaml

@@ -46,7 +46,13 @@ spec:
           - name: AUTH0_BASE_URL
             value: '{{ .Values.auth.baseUrl }}'
           - name: AUTH0_SECRET
-            value: '{{ .Values.auth.clientSecret }}'
+            value: '{{ .Values.auth.secret }}'
+          - name: AUTH0_AUDIENCE
+            value: '{{ .Values.auth.audience }}'
+          - name: AUTH0_SCOPE
+            value: '{{ .Values.auth.scope }}'
+          - name: NEXT_PUBLIC_API_URL
+            value: '{{ .Values.publicApiUrl }}'
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}

charts/ui/values.yaml

@@ -1,14 +1,17 @@
 # Default values for ui.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
-
 replicaCount: 1
 
+publicApiUrl: "https://core-api.development.comissions.app"
 auth:
   issuerBaseUrl: "https://dev-12mb5yq82dow1twh.us.auth0.com"
   clientId: "U39Jg6oyFoNihzjZ24SX2FxiBx2lqvsC"
   clientSecret: "UBH4HTsvkoWHImQwI4abyh46s6qpEnD3hfrODEYBTX7p_5v0bYogz-b_6wJtOkDg"
   baseUrl: "https://development.comissions.app"
+  secret: "U39Jg6oyFoNihzjZ24SX2FxiBx2lqvsC"
+  audience: "https://api.artplatform.com"
+  scope: "openid profile email read:user write:user read:request write:request read:artist write:artist"
 
 image:
   repository: docker pull ghcr.io/comissions-app/ui

dev/.config/config.json

@@ -1,7 +1,7 @@
 {
   "deployment": {
     "argocd": {
-        "project": "comissions.app"
+      "project": "default"
     },
     "cluster": {
       "name": "in-cluster",
@@ -9,13 +9,8 @@
       "address": "https://kubernetes.default.svc"
     }
   },
-    "apps": {
+  "apps": 
-        "core-api": {
+  {
-            "version" : "latest",
+    
-            "image": "ghcr.io/comissions-app/core-api",
-            "ingress":{
-                "host": "core-api.comissions-dev.com"
-            }
-        }
-    }
   }
+}

dev/apps/core-api.yaml

@@ -23,11 +23,30 @@ spec:
           path: charts/core-api
           helm:
             values: |
-              postgresHost: "postgres-postgresql"
+              postgres:
-              postgresPort: 5432
+                host: "postgres-postgresql"
-              postgresUsername: "postgres"
+                port: 5432
-              postgresPassword: "postgres"
+                username: "postgres"
-              postgresDatabase: "comissionsapp"
+                password: "postgres"
+                database: "comissionsapp"
+
+                ui:
+                  baseUrl: "http://development.comissions.app"
+
+                auth:
+                  audience: "https://api.artplatform.com"
+                  clientId: "19GWUL7fWFQWEpdFFtlgv2x3kqfSa0ES"
+                  clientSecret: "VX5LKeGHeaqKsgNz8Kn1gQ7MSHmwrXJdC2DMjVY82_YHjiRqdPrVNpFFkXBZy8yh"
+                  domain: "https://dev-12mb5yq82dow1twh.us.auth0.com/"
+
+                stripe:
+                  apiKey: "sk_test_51OdJ1SLooS0IZqYkx2IdNoLcscm6BisgaUyYVIc5jM1RMmarww2e9hLLQS3Atn6TQi00p9YQkCLGQPhAI2gf9ZSY00HmbQYCvP"
+                  webhookSecret: "whsec_WTxw2seQHaJjSbLiRr1q8fs1wh8vGdGn"
+
+                novu:
+                  apiKey: "287ad99d1cbeba7f96a7d2637b022e6f"
+
+              
               image:
                 repository: ghcr.io/comissions-app/core-api
                 pullPolicy: Always

dev/apps/ui.yaml

@@ -23,11 +23,17 @@ spec:
           path: charts/ui
           helm:
             values: | 
+            publicApiUrl: "https://core-api.development.comissions.app"
+            
             auth:
               issuerBaseUrl: "https://dev-12mb5yq82dow1twh.us.auth0.com"
               clientId: "U39Jg6oyFoNihzjZ24SX2FxiBx2lqvsC"
               clientSecret: "UBH4HTsvkoWHImQwI4abyh46s6qpEnD3hfrODEYBTX7p_5v0bYogz-b_6wJtOkDg"
               baseUrl: "https://development.comissions.app"
+              secret: "U39Jg6oyFoNihzjZ24SX2FxiBx2lqvsC"
+              audience: "https://api.artplatform.com"
+              scope: "openid profile email read:user write:user read:request write:request read:artist write:artist"
+
 
               image:
                 repository: ghcr.io/comissions-app/ui