diff --git a/charts/my-recipes-chart/templates/backend-deployment.yaml b/charts/my-recipes-chart/templates/backend-deployment.yaml index d84672b..b7379bd 100644 --- a/charts/my-recipes-chart/templates/backend-deployment.yaml +++ b/charts/my-recipes-chart/templates/backend-deployment.yaml @@ -79,6 +79,8 @@ spec: envFrom: - secretRef: name: {{ .Release.Name }}-db-credentials + - secretRef: + name: {{ .Release.Name }}-app-secrets startupProbe: httpGet: path: /docs diff --git a/charts/my-recipes-chart/values.yaml b/charts/my-recipes-chart/values.yaml index 6dc7748..a87cafc 100644 --- a/charts/my-recipes-chart/values.yaml +++ b/charts/my-recipes-chart/values.yaml @@ -26,6 +26,9 @@ backend: env: PYTHONUNBUFFERED: "1" + + # Secrets are created in db-secret.yaml + # These are passed via envFrom secretRef ingress: enabled: true @@ -85,6 +88,7 @@ frontend: - secretName: my-recipes-tls hosts: - my-recipes.dvirlabs.com + externalUrl: "https://my-recipes.dvirlabs.com" # PostgreSQL configuration postgres: @@ -118,6 +122,27 @@ postgres: cpu: 1000m memory: 1Gi +# OAuth Configuration +oauth: + google: + clientId: "143092846986-hsi59m0on2c9rb5qrdoejfceieao2ioc.apps.googleusercontent.com" + clientSecret: "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" + redirectUri: "https://api-my-recipes.dvirlabs.com/auth/google/callback" + + azure: + clientId: "db244cf5-eb11-4738-a2ea-5b0716c9ec0a" + clientSecret: "Zad8Q~qRBxaQq8up0lLXAq4pHzrVM2JFGFJhHaDp" + tenantId: "consumers" + redirectUri: "https://api-my-recipes.dvirlabs.com/auth/azure/callback" + +# Email Configuration +email: + smtpHost: "smtp.gmail.com" + smtpPort: "587" + smtpUser: "dvirlabs@gmail.com" + smtpPassword: "agaanrhbbazbdytv" + smtpFrom: "dvirlabs@gmail.com" + # Ingress configuration ingress: enabled: false # Individual frontend/backend ingress resources handle routing instead diff --git a/manifests/my-recipes/values.yaml b/manifests/my-recipes/values.yaml index e920a1e..14d73b2 100644 --- a/manifests/my-recipes/values.yaml +++ b/manifests/my-recipes/values.yaml @@ -75,6 +75,8 @@ frontend: - secretName: my-recipes-tls hosts: - my-recipes.dvirlabs.com + externalUrl: "https://my-recipes.dvirlabs.com" + # Admin user configuration admin: username: "admin" @@ -106,10 +108,32 @@ postgres: resources: requests: cpu: 100m - memory: 256Mi + memory: 1Gi limits: cpu: 1000m memory: 1Gi + +# OAuth Configuration +oauth: + google: + clientId: "143092846986-hsi59m0on2c9rb5qrdoejfceieao2ioc.apps.googleusercontent.com" + clientSecret: "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" + redirectUri: "https://api-my-recipes.dvirlabs.com/auth/google/callback" + + azure: + clientId: "db244cf5-eb11-4738-a2ea-5b0716c9ec0a" + clientSecret: "Zad8Q~qRBxaQq8up0lLXAq4pHzrVM2JFGFJhHaDp" + tenantId: "consumers" + redirectUri: "https://api-my-recipes.dvirlabs.com/auth/azure/callback" + +# Email Configuration +email: + smtpHost: "smtp.gmail.com" + smtpPort: "587" + smtpUser: "dvirlabs@gmail.com" + smtpPassword: "agaanrhbbazbdytv" + smtpFrom: "dvirlabs@gmail.com" + # Ingress (top-level, disabled - use component-specific ingress instead) ingress: enabled: false