Merge pull request #43 from lalithkota/main

Helm Charts: Fixed hostnames and global values. Reorganized charts ac…
OpenG2P · Jun 24, 2024 · 57a8ae2 · 57a8ae2
2 parents 56dfb30 + cea5d6f
commit 57a8ae2
Show file tree

Hide file tree

Showing 27 changed files with 70 additions and 70 deletions.
diff --git a/charts/esignet/questions.yaml b/charts/esignet/questions.yaml
@@ -1,5 +1,5 @@
 questions:
-- variable: global.esignetHostname
+- variable: hostname
   description: Hostname under which eSignet should be accessible
   type: string
   label: eSignet Hostname
@@ -9,11 +9,6 @@ questions:
   type: string
   label: Keycloak Base URL
 
-- variable: mock-identity-system.enabled
-  description: This installs Mock Identity System along with the current eSignet
-  type: boolean
-  label: Install Mock Identity System?
-
 - variable: springConfig.profile
   type: string
   label: Spring Config Profile
@@ -65,6 +60,16 @@ questions:
   show_if: "springConfig.gitRepo.enabled!=true"
 
 # Mock Identity Settings
+- variable: mock-identity-system.enabled
+  description: This installs Mock Identity System along with the current eSignet
+  type: boolean
+  label: Install Mock Identity System?
+
+- variable: mock-identity-system.hostname
+  description: Hostname under which Mock Identity System should be accessible
+  type: string
+  label: Mock Identity System Hostname
+
 - variable: mock-identity-system.springConfig.profile
   type: string
   label: Spring Config Profile

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

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

diff --git a/charts/esignet/templates/oidc-ui/virtualservice.yaml b/charts/esignet/templates/oidc-ui/virtualservice.yaml
@@ -14,14 +14,14 @@ metadata:
   {{- end }}
 spec:
   hosts:
-  - {{ default .Values.global.esignetHostname .Values.oidcUi.istio.virtualservice.host | quote }}
+  - {{ default .Values.hostname .Values.oidcUi.istio.virtualservice.host | quote }}
   gateways:
   - {{ default (include "common.names.fullname" .) .Values.oidcUi.istio.virtualservice.gateway }}
   http:
   - headers:
       request:
         set:
-          x-forwarded-host: {{ default .Values.global.esignetHostname .Values.oidcUi.istio.virtualservice.host | quote }}
+          x-forwarded-host: {{ default .Values.hostname .Values.oidcUi.istio.virtualservice.host | quote }}
           x-forwarded-proto: https
     match:
     - uri:

diff --git a/charts/esignet/templates/postgresql/gateway.yaml b/charts/esignet/templates/postgresql/gateway.yaml
@@ -21,7 +21,7 @@ spec:
       name: tcp-postgres
       protocol: tcp
     hosts:
-    - {{ default .Values.global.esignetHostname .Values.postgresql.istio.gateway.host | quote }}
+    - {{ default .Values.hostname .Values.postgresql.istio.gateway.host | quote }}
     {{- if .Values.postgresql.istio.gateway.tls.enabled }}
     tls:
       {{ toYaml (omit .Values.postgresql.istio.gateway.tls "enabled") | nindent 6 }}

diff --git a/charts/esignet/templates/postgresql/virtualservice.yaml b/charts/esignet/templates/postgresql/virtualservice.yaml
@@ -14,7 +14,7 @@ metadata:
   {{- end }}
 spec:
   hosts:
-  - {{ default .Values.global.esignetHostname .Values.postgresql.istio.virtualservice.host | quote }}
+  - {{ default .Values.hostname .Values.postgresql.istio.virtualservice.host | quote }}
   gateways:
   - {{ default (include "postgresql.v1.primary.fullname" .Subcharts.postgresql) .Values.postgresql.istio.virtualservice.gateway }}
   tcp:

diff --git a/charts/esignet/templates/virtualservice.yaml b/charts/esignet/templates/virtualservice.yaml
@@ -13,14 +13,14 @@ metadata:
   {{- end }}
 spec:
   hosts:
-  - {{ default .Values.global.esignetHostname .Values.istio.virtualservice.host | quote }}
+  - {{ default .Values.hostname .Values.istio.virtualservice.host | quote }}
   gateways:
   - {{ default (include "common.names.fullname" .) .Values.istio.virtualservice.gateway }}
   http:
   - headers:
       request:
         set:
-          x-forwarded-host: {{ default .Values.global.esignetHostname .Values.istio.virtualservice.host | quote }}
+          x-forwarded-host: {{ default .Values.hostname .Values.istio.virtualservice.host | quote }}
           x-forwarded-proto: https
     match:
     - uri:

diff --git a/charts/esignet/values.yaml b/charts/esignet/values.yaml
@@ -8,9 +8,10 @@
 #     - myRegistryKeySecretName
 #   storageClass: myStorageClass
 global:
-  esignetHostname: esignet.openg2p.sandbox.net
   keycloakBaseUrl: 'https://keycloak.your.org'
 
+hostname: esignet.openg2p.sandbox.net
+
 ## Add labels to all the deployed resources
 ##
 commonLabels:
@@ -543,6 +544,7 @@ softhsm:
 mock-identity-system:
   enabled: true
   nameOverride: esignet-mock-id
+  hostname: esignet.openg2p.sandbox.net
   artifactoryInstallationName: '{{ .Release.Name }}-esignet-artifactory'
   artifactory:
     enabled: false
@@ -845,7 +847,7 @@ oidcUi:
 captchaEnabled: false
 
 envVars:
-  JDK_JAVA_OPTIONS: '{{ .Values.javaOpts }}'
+  JDK_JAVA_OPTIONS: '{{ tpl .Values.javaOpts $ }}'
   SPRING_CONFIG_NAMES: '{{ tpl .Values.springConfig.names $ }}'
   SPRING_CONFIG_PROFILE: '{{ tpl .Values.springConfig.profile $ }}'
   SPRING_CONFIG_GIT_ENABLED: '{{ .Values.springConfig.gitRepo.enabled }}'
@@ -858,11 +860,11 @@ envVars:
   keycloak_internal_url: '{{ .Values.global.keycloakBaseUrl }}'
   keycloak_external_url: '{{ .Values.global.keycloakBaseUrl }}'
 
-  mosip_api_internal_host: '{{ .Values.global.esignetHostname }}'
-  mosip_api_public_host: '{{ .Values.global.esignetHostname }}'
-  mosip_signup_host: '{{ .Values.global.esignetHostname }}'
+  mosip_api_internal_host: '{{ tpl .Values.hostname $ }}'
+  mosip_api_public_host: '{{ tpl .Values.hostname $ }}'
+  mosip_signup_host: '{{ tpl .Values.hostname $ }}'
   mosip_mock_id_baseUrl: '{{ tpl .Values.mockIdentitySystemInstallationName $ }}'
-  mosip_esignet_host: '{{ .Values.global.esignetHostname }}'
+  mosip_esignet_host: '{{ tpl .Values.hostname $ }}'
 
   mosip_esignet_database_hostname: '{{ tpl .Values.postgresqlInstallationName $ }}'
   mosip_esignet_database_port: '5432'

diff --git a/charts/keymanager/questions.yaml b/charts/keymanager/questions.yaml
@@ -1,5 +1,5 @@
 questions:
-- variable: global.keymanagerHostname
+- variable: hostname
   description: Hostname under which Keymanager should be accessible
   type: string
   label: Keymanager Hostname

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

diff --git a/charts/keymanager/templates/postgresql/gateway.yaml b/charts/keymanager/templates/postgresql/gateway.yaml
@@ -21,7 +21,7 @@ spec:
       name: tcp-postgres
       protocol: tcp
     hosts:
-    - {{ default .Values.global.keymanagerHostname .Values.postgresql.istio.gateway.host | quote }}
+    - {{ default .Values.hostname .Values.postgresql.istio.gateway.host | quote }}
     {{- if .Values.postgresql.istio.gateway.tls.enabled }}
     tls:
       {{ toYaml (omit .Values.postgresql.istio.gateway.tls "enabled") | nindent 6 }}

diff --git a/charts/keymanager/templates/postgresql/virtualservice.yaml b/charts/keymanager/templates/postgresql/virtualservice.yaml
@@ -14,7 +14,7 @@ metadata:
   {{- end }}
 spec:
   hosts:
-  - {{ default .Values.global.keymanagerHostname .Values.postgresql.istio.virtualservice.host | quote }}
+  - {{ default .Values.hostname .Values.postgresql.istio.virtualservice.host | quote }}
   gateways:
   - {{ default (include "postgresql.v1.primary.fullname" .Subcharts.postgresql) .Values.postgresql.istio.virtualservice.gateway }}
   tcp:

diff --git a/charts/keymanager/templates/virtualservice.yaml b/charts/keymanager/templates/virtualservice.yaml
@@ -13,14 +13,14 @@ metadata:
   {{- end }}
 spec:
   hosts:
-  - {{ default .Values.global.keymanagerHostname .Values.istio.virtualservice.host | quote }}
+  - {{ default .Values.hostname .Values.istio.virtualservice.host | quote }}
   gateways:
   - {{ default (include "common.names.fullname" .) .Values.istio.virtualservice.gateway }}
   http:
   - headers:
       request:
         set:
-          x-forwarded-host: {{ default .Values.global.keymanagerHostname .Values.istio.virtualservice.host | quote }}
+          x-forwarded-host: {{ default .Values.hostname .Values.istio.virtualservice.host | quote }}
           x-forwarded-proto: https
     match:
     - uri:

diff --git a/charts/keymanager/values.yaml b/charts/keymanager/values.yaml
@@ -8,9 +8,10 @@
 #     - myRegistryKeySecretName
 #   storageClass: myStorageClass
 global:
-  keymanagerHostname: keymanager.openg2p.sandbox.net
   keycloakBaseUrl: 'https://keycloak.your.org'
 
+hostname: keymanager.openg2p.sandbox.net
+
 ## Add labels to all the deployed resources
 ##
 commonLabels:
@@ -548,15 +549,15 @@ keygen:
     exec java -jar ${ADDL_ARGS[@]} ./keys-generator.jar
 
 envVars:
-  JDK_JAVA_OPTIONS: '{{ .Values.javaOpts }}'
+  JDK_JAVA_OPTIONS: '{{ tpl .Values.javaOpts $ }}'
   SPRING_CONFIG_NAMES: '{{ tpl .Values.springConfig.names $ }}'
   SPRING_CONFIG_PROFILE: '{{ tpl .Values.springConfig.profile $ }}'
   SPRING_CONFIG_GIT_ENABLED: '{{ .Values.springConfig.gitRepo.enabled }}'
 
-  mosip_api_internal_host: '{{ .Values.global.keymanagerHostname }}'
+  mosip_api_internal_host: '{{ tpl .Values.hostname $ }}'
 
-  keycloak_internal_url: '{{ .Values.global.keycloakBaseUrl }}'
-  keycloak_external_url: '{{ .Values.global.keycloakBaseUrl }}'
+  keycloak_internal_url: '{{ tpl .Values.global.keycloakBaseUrl $ }}'
+  keycloak_external_url: '{{ tpl .Values.global.keycloakBaseUrl $ }}'
 
   auth_server_admin_allowed_audience: 'openg2p-sr,openg2p-sr-{{ .Release.Namespace }},openg2p-pbms,openg2p-pbms-{{ .Release.Namespace }},openg2p-spar-{{ .Release.Namespace }}'
 

diff --git a/charts/mail/values.yaml b/charts/mail/values.yaml
@@ -1,7 +1,6 @@
-global:
-  # domain name of installation
-  # mailname: "example.com"
-  mailname: ""
+# domain name of installation
+# mailname: "example.com"
+mailname: ""
 
 replicaCount: 1
 
@@ -69,7 +68,7 @@ podSecurityContext:
   fsGroup: 1001
 
 envVars:
-  MAILNAME: '{{ .Values.global.mailname }}'
+  MAILNAME: '{{ tpl .Values.mailname $ }}'
   RELAY_NETWORKS: ':10.0.0.0/8'
 
 envVarsFrom: {}

diff --git a/charts/mock-identity-system/questions.yaml b/charts/mock-identity-system/questions.yaml
@@ -1,5 +1,5 @@
 questions:
-- variable: global.esignetHostname
+- variable: hostname
   description: Hostname under which Mock Identity System should be accessible
   type: string
   label: Mock Identity System Hostname

diff --git a/charts/mock-identity-system/templates/gateway.yaml b/charts/mock-identity-system/templates/gateway.yaml
@@ -21,7 +21,7 @@ spec:
       number: 8080
       protocol: HTTP2
     hosts:
-      - {{ default .Values.global.esignetHostname .Values.istio.gateway.host | quote }}
+      - {{ default .Values.hostname .Values.istio.gateway.host | quote }}
     {{- if .Values.istio.gateway.httpTlsRedirect }}
     tls:
       httpsRedirect: true
@@ -33,7 +33,7 @@ spec:
       number: 8443
       protocol: HTTPS
     hosts:
-      - {{ default .Values.global.esignetHostname .Values.istio.gateway.host | quote }}
+      - {{ default .Values.hostname .Values.istio.gateway.host | quote }}
     tls:
       {{ toYaml (omit .Values.istio.gateway.tls "enabled") | nindent 6 }}
   {{- end }}

diff --git a/charts/mock-identity-system/templates/postgresql/gateway.yaml b/charts/mock-identity-system/templates/postgresql/gateway.yaml
@@ -21,7 +21,7 @@ spec:
       name: tcp-postgres
       protocol: tcp
     hosts:
-    - {{ default .Values.global.esignetHostname .Values.postgresql.istio.gateway.host | quote }}
+    - {{ default .Values.hostname .Values.postgresql.istio.gateway.host | quote }}
     {{- if .Values.postgresql.istio.gateway.tls.enabled }}
     tls:
       {{ toYaml (omit .Values.postgresql.istio.gateway.tls "enabled") | nindent 6 }}

diff --git a/charts/mock-identity-system/templates/postgresql/virtualservice.yaml b/charts/mock-identity-system/templates/postgresql/virtualservice.yaml
@@ -14,7 +14,7 @@ metadata:
   {{- end }}
 spec:
   hosts:
-  - {{ default .Values.global.esignetHostname .Values.postgresql.istio.virtualservice.host | quote }}
+  - {{ default .Values.hostname .Values.postgresql.istio.virtualservice.host | quote }}
   gateways:
   - {{ default (include "postgresql.v1.primary.fullname" .Subcharts.postgresql) .Values.postgresql.istio.virtualservice.gateway }}
   tcp:

diff --git a/charts/mock-identity-system/templates/virtualservice.yaml b/charts/mock-identity-system/templates/virtualservice.yaml
@@ -13,14 +13,14 @@ metadata:
   {{- end }}
 spec:
   hosts:
-  - {{ default .Values.global.esignetHostname .Values.istio.virtualservice.host | quote }}
+  - {{ default .Values.hostname .Values.istio.virtualservice.host | quote }}
   gateways:
   - {{ default (include "common.names.fullname" .) .Values.istio.virtualservice.gateway }}
   http:
   - headers:
       request:
         set:
-          x-forwarded-host: {{ default .Values.global.esignetHostname .Values.istio.virtualservice.host | quote }}
+          x-forwarded-host: {{ default .Values.hostname .Values.istio.virtualservice.host | quote }}
           x-forwarded-proto: https
     match:
     - uri:

diff --git a/charts/mock-identity-system/values.yaml b/charts/mock-identity-system/values.yaml
@@ -7,8 +7,8 @@
 #   imagePullSecrets:
 #     - myRegistryKeySecretName
 #   storageClass: myStorageClass
-global:
-  esignetHostname: esignet.openg2p.sandbox.net
+
+hostname: esignet.openg2p.sandbox.net
 
 ## Add labels to all the deployed resources
 ##
@@ -550,11 +550,11 @@ keygen:
     exec java -jar ${ADDL_ARGS[@]} ./keys-generator.jar
 
 envVars:
-  JDK_JAVA_OPTIONS: '{{ .Values.javaOpts }}'
+  JDK_JAVA_OPTIONS: '{{ tpl .Values.javaOpts $ }}'
   SPRING_CONFIG_NAMES: '{{ tpl .Values.springConfig.names $ }}'
   SPRING_CONFIG_PROFILE: '{{ tpl .Values.springConfig.profile $ }}'
   SPRING_CONFIG_GIT_ENABLED: '{{ .Values.springConfig.gitRepo.enabled }}'
-  mosip_api_internal_host: '{{ .Values.global.esignetHostname }}'
+  mosip_api_internal_host: '{{ tpl .Values.hostname $ }}'
   mosip_mockidentitysystem_database_hostname: '{{ tpl .Values.postgresqlInstallationName $ }}'
   mosip_mockidentitysystem_database_port: '5432'
   mosip_kernel_keymgr_hsm_health_check_enabled: false # this will tell mock id system not to wait for hsm