Helm Charts Reorganized: Corrected Hostnames client ids secrets and d…

…ependency default enables Signed-off-by: Lalith Kota <kotalalith@gmail.com>
OpenG2P · Jun 24, 2024 · 4348e39 · 4348e39
1 parent 4f57c63
commit 4348e39
Show file tree

Hide file tree

Showing 26 changed files with 378 additions and 315 deletions.
diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml
@@ -96,7 +96,7 @@ jobs:
         done
         helm repo index --url https://openg2p.github.io/openg2p-helm/ --merge rancher/index.yaml rancher
         for chartname in $RANCHER_CHARTS; do
-          rm rancher/${chartname}*.tgz
+          rm rancher/${chartname}*.tgz || true
         done
       if: env.SKIP != 'TRUE'
 

diff --git a/charts/openg2p-pbms-p2/questions.yaml b/charts/openg2p-pbms-p2/questions.yaml
@@ -3,29 +3,21 @@ questions:
   description: Keycloak Base Url used in all components
   type: string
   label: Keycloak Base URL
+  group: General Settings
 
+# Superset Settings
 - variable: superset.enabled
   description: This installs Superset for reporting
   type: boolean
   label: Install Superset?
+  group: Superset Settings
 
-- variable: esignet.enabled
-  description: This installs eSignet for mocking user authentication
-  type: boolean
-  label: Install eSignet?
-
-- variable: esignet.mock-identity-system.enabled
-  description: This installs Mock Identity System with eSignet
-  type: boolean
-  label: Install Mock Identity System?
-  show_if: "esignet.enabled=true"
-
-# Superset Settings
-- variable: global.supersetHostname
+- variable: superset.hostname
   description: Hostname for Superset Dashboards
   type: string
   label: Superset Hostname
   group: Superset Settings
+  show_if: "superset.enabled=true"
 
 - variable: superset.oidcClientId
   description: OIDC Client ID for Superset login
@@ -49,11 +41,18 @@ questions:
   show_if: "superset.enabled=true"
 
 # eSignet
-- variable: global.esignetHostname
+- variable: esignet.enabled
+  description: This installs eSignet for mocking user authentication
+  type: boolean
+  label: Install eSignet?
+  group: eSignet Settings
+
+- variable: esignet.hostname
   description: Hostname under which eSignet should be accessible
   type: string
   label: eSignet Hostname
   group: eSignet Settings
+  show_if: "esignet.enabled=true"
 
 - variable: esignet.springConfig.profile
   type: string
@@ -119,6 +118,19 @@ questions:
   show_if: "esignet.enabled=true&&esignet.springConfig.gitRepo.enabled=false"
 
 # Mock Identity Settings
+- variable: esignet.mock-identity-system.enabled
+  description: This installs Mock Identity System with eSignet
+  type: boolean
+  label: Install Mock Identity System?
+  show_if: "esignet.enabled=true"
+
+- variable: esignet.mock-identity-system.hostname
+  description: Hostname under which Mock Identity System should be accessible
+  type: string
+  label: Mock Identity System Hostname
+  group: Mock Identity System Settings
+  show_if: "esignet.enabled=true&&esignet.mock-identity-system.enabled=true"
+
 - variable: esignet.mock-identity-system.springConfig.profile
   type: string
   label: Spring Config Profile

diff --git a/charts/openg2p-pbms-p2/templates/superset/gateway.yaml b/charts/openg2p-pbms-p2/templates/superset/gateway.yaml
@@ -22,7 +22,7 @@ spec:
       number: 8080
       protocol: HTTP2
     hosts:
-      - {{ default .Values.global.supersetHostname .Values.superset.istio.gateway.host | quote }}
+      - {{ default .Values.superset.hostname .Values.superset.istio.gateway.host | quote }}
     {{- if .Values.superset.istio.gateway.httpTlsRedirect }}
     tls:
       httpsRedirect: true
@@ -34,7 +34,7 @@ spec:
       number: 8443
       protocol: HTTPS
     hosts:
-      - {{ default .Values.global.supersetHostname .Values.superset.istio.gateway.host | quote }}
+      - {{ default .Values.superset.hostname .Values.superset.istio.gateway.host | quote }}
     tls:
       {{ toYaml (omit .Values.superset.istio.gateway.tls "enabled") | nindent 6 }}
   {{- end }}

diff --git a/charts/openg2p-pbms-p2/templates/superset/virtualservice.yaml b/charts/openg2p-pbms-p2/templates/superset/virtualservice.yaml
@@ -14,14 +14,14 @@ metadata:
   {{- end }}
 spec:
   hosts:
-  - {{ default .Values.global.supersetHostname .Values.superset.istio.virtualservice.host | quote }}
+  - {{ default .Values.superset.hostname .Values.superset.istio.virtualservice.host | quote }}
   gateways:
   - {{ default (include "common.names.fullname" .Subcharts.superset) .Values.superset.istio.virtualservice.gateway }}
   http:
   - headers:
       request:
         set:
-          x-forwarded-host: {{ default .Values.global.supersetHostname .Values.superset.istio.virtualservice.host | quote }}
+          x-forwarded-host: {{ default .Values.superset.hostname .Values.superset.istio.virtualservice.host | quote }}
           x-forwarded-proto: https
     route:
     - destination:

diff --git a/charts/openg2p-pbms-p2/values.yaml b/charts/openg2p-pbms-p2/values.yaml
@@ -1,35 +1,12 @@
 global:
-  supersetHostname: superset.openg2p.sandbox.net
-  esignetHostname: esignet.openg2p.sandbox.net
-
   keycloakBaseUrl: https://keycloak.openg2p.sandbox.net
   keycloakIssuerUrl: '{{ tpl .Values.global.keycloakBaseUrl $ }}/realms/master'
 
 nameOverride: openg2p-pbms
 
-# TODO: Doing this since postgres and redis charts inside superset are old.
-supersetPostgresql:
-  nameOverride: superset-postgresql
-  auth:
-    username: superset
-    password: superset
-    database: superset
-  primary:
-    extendedConfiguration: |-
-      wal_level = logical
-      max_wal_senders = 20
-      max_replication_slots = 10
-supersetRedis:
-  nameOverride: superset-redis
-  architecture: standalone
-  auth:
-    enabled: false
-  master:
-    persistence:
-      enabled: false
-
 superset:
-  enabled: false
+  enabled: true
+  hostname: superset-pbms.openg2p.sandbox.net
 
   oidcIssuerUrl: '{{ tpl .Values.global.keycloakIssuerUrl $ }}'
   oidcClientId: openg2p-pbms-superset
@@ -136,8 +113,31 @@ superset:
         mode: SIMPLE
         credentialName: ""
 
+# TODO: Doing this since postgres and redis charts inside superset are old.
+supersetPostgresql:
+  nameOverride: superset-postgresql
+  auth:
+    username: superset
+    password: superset
+    database: superset
+  primary:
+    extendedConfiguration: |-
+      wal_level = logical
+      max_wal_senders = 20
+      max_replication_slots = 10
+supersetRedis:
+  nameOverride: superset-redis
+  architecture: standalone
+  auth:
+    enabled: false
+  master:
+    persistence:
+      enabled: false
+
 esignet:
   enabled: false
+  hostname: esignet-pbms.openg2p.sandbox.net
+
   captchaEnabled: false
   envVars:
     esignet_captcha_site_key: ''

diff --git a/charts/openg2p-pbms/Chart.yaml b/charts/openg2p-pbms/Chart.yaml
@@ -21,9 +21,10 @@ dependencies:
   repository: https://openg2p.github.io/openg2p-helm
   condition: odk-central.enabled
 - name: opensearch
+  alias: loggingOpensearch
   version: 1.2.0
   repository: oci://registry-1.docker.io/bitnamicharts
-  condition: opensearch.enabled
+  condition: loggingOpensearch.enabled
 - name: keymanager
   version: 12.0.1
   repository: https://openg2p.github.io/openg2p-helm