Merge pull request #22 from lalithkota/main

Social Registry: mail hostname settings
OpenG2P · May 28, 2024 · 7d9ee4b · 7d9ee4b
2 parents 4346353 + 3ed7780
commit 7d9ee4b
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 20 deletions.
diff --git a/charts/odk-central/charts/odk-central-backend/values.yaml b/charts/odk-central/charts/odk-central-backend/values.yaml
@@ -85,7 +85,7 @@ envVars:
   PYXFORM_PORT: "80"
 
   EMAIL_FROM: 'no-reply@{{ .Values.global.hostname }}'
-  EMAIL_HOST: '{{ .Release.Name }}-mail'
+  EMAIL_HOST: '{{ .Release.Name }}-odk-central-mail'
   EMAIL_PORT: "25"
   EMAIL_SECURE: "false"
   EMAIL_IGNORE_TLS: "true"

diff --git a/charts/openg2p-social-registry/questions.yaml b/charts/openg2p-social-registry/questions.yaml
@@ -44,19 +44,21 @@ questions:
   type: string
   label: Minio Console Hostname
   group: Minio Settings
-- variable: minio.extraEnvVars[0].value
-  default: http://keycloak.sandbox.openg2p.net/realms/master/.well-known/openid-configuration
-  description: OIDC Well know config URL for Minio Console login
-  type: string
-  label: OIDC Well-known Config URL
-  group: Minio Settings
-- variable: minio.extraEnvVars[1].value
-  description: OIDC Client ID for Minio Console login
-  type: string
-  label: OIDC Client ID
-  group: Minio Settings
-- variable: minio.extraEnvVars[2].value
-  description: OIDC Client Secret for Minio Console login
-  type: string
-  label: OIDC Client Secret
-  group: Minio Settings
+# The following configs will not work, because of Array type
+# These will have to be edited from yaml.
+# - variable: minio.extraEnvVars[0].value
+#   default: http://keycloak.sandbox.openg2p.net/realms/master/.well-known/openid-configuration
+#   description: OIDC Well know config URL for Minio Console login
+#   type: string
+#   label: OIDC Well-known Config URL
+#   group: Minio Settings
+# - variable: minio.extraEnvVars[1].value
+#   description: OIDC Client ID for Minio Console login
+#   type: string
+#   label: OIDC Client ID
+#   group: Minio Settings
+# - variable: minio.extraEnvVars[2].value
+#   description: OIDC Client Secret for Minio Console login
+#   type: string
+#   label: OIDC Client Secret
+#   group: Minio Settings
diff --git a/charts/openg2p-social-registry/templates/minioVirtualservice.yaml b/charts/openg2p-social-registry/templates/minioVirtualservice.yaml
@@ -4,7 +4,7 @@
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
-  name: {{ include "socialRegistry.fullname" . }}-minio
+  name: {{ .Release.Name }}-minio
   labels:
     {{- include "socialRegistry.labels" . | nindent 4 }}
 spec:
@@ -20,7 +20,7 @@ spec:
           x-forwarded-proto: https
     route:
     - destination:
-        host: {{ include "socialRegistry.fullname" . }}-minio
+        host: {{ .Release.Name }}-minio
         port:
           number: 9001
 {{- end }}

diff --git a/charts/openg2p-social-registry/templates/virtualservice.yaml b/charts/openg2p-social-registry/templates/virtualservice.yaml
@@ -24,7 +24,7 @@ spec:
           x-forwarded-proto: https
     route:
     - destination:
-        host: {{ include "socialRegistry.fullname" . }}-odoo
+        host: {{ .Release.Name . }}-odoo
         port:
           number: {{ .Values.odoo.service.port }}
 {{- end }}

diff --git a/charts/openg2p-social-registry/values.yaml b/charts/openg2p-social-registry/values.yaml
@@ -67,7 +67,15 @@ mail:
 
 odk-central:
   enabled: true
+  odk-central-mail:
+    enabled: false
+    envVars:
+      EMAIL_HOST: '{{ .Release.Name }}-mail'
   odk-central-backend:
+    envVars:
+      OIDC_ISSUER_URL: ""
+      OIDC_CLIENT_ID: ""
+      OIDC_CLIENT_SECRET: ""
     postgresql:
       nameOverride: odk-central-postgresql