[MOSIP-35816] updated helm chart to remove artifactory and config ser…

…ver dependency Signed-off-by: ckm007 <[email protected]>
mosip · Sep 24, 2024 · 2e74ac1 · 2e74ac1
1 parent 38d1362
commit 2e74ac1
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 37 deletions.
diff --git a/helm/signup-service/templates/deployment.yaml b/helm/signup-service/templates/deployment.yaml
@@ -94,6 +94,14 @@ spec:
               value: {{ .Values.containerSecurityContext.runAsUser }}
             - name: JDK_JAVA_OPTIONS
               value: {{ .Values.additionalResources.javaOpts }}
+            {{- if .Values.pluginUrlEnv }}
+            - name: plugin_url_env
+              value: {{ .Values.pluginUrlEnv }}
+            {{- end }}
+            {{- if .Values.pluginNameEnv }}
+            - name: plugin_name_env
+              value: {{ .Values.pluginNameEnv }}
+            {{- end }}
             {{- if .Values.extraEnvVars }}
             {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
@@ -156,4 +164,4 @@ spec:
         secret:
           secretName: {{ $secretName }}
       {{- end }}
-      {{- end }}
+      {{- end }}
diff --git a/helm/signup-service/values.yaml b/helm/signup-service/values.yaml
@@ -52,8 +52,8 @@ service:
 
 image:
   registry: docker.io
-  repository: mosipqa/signup-service
-  tag: release-1.x.x
+  repository: mosipdev/signup-service
+  tag: develop
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -67,7 +67,7 @@ image:
   #   - myRegistryKeySecretName
 
 ## Port on which this particular spring service module is running.
-springServicePort: 8088
+springServicePort: 8089
 
 ## Configure extra options for liveness and readiness probes
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
@@ -76,7 +76,7 @@ startupProbe:
   enabled: true
   httpGet:
     path: /v1/signup/actuator/health
-    port: 8088
+    port: 8089
   initialDelaySeconds: 0
   periodSeconds: 10
   timeoutSeconds: 5
@@ -87,7 +87,7 @@ livenessProbe:
   enabled: true
   httpGet:
     path: /v1/signup/actuator/health
-    port: 8088
+    port: 8089
   initialDelaySeconds: 20
   periodSeconds: 10
   timeoutSeconds: 5
@@ -98,7 +98,7 @@ readinessProbe:
   enabled: true
   httpGet:
     path: /v1/signup/actuator/health
-    port: 8088
+    port: 8089
   initialDelaySeconds: 0
   periodSeconds: 10
   timeoutSeconds: 5
@@ -240,19 +240,60 @@ updateStrategy:
 ##   - name: FOO
 ##     value: "bar"
 ##
-extraEnvVars: []
+extraEnvVars: |
+  - name: MOSIP_ESIGNET_HOST
+    valueFrom:
+      configMapKeyRef:
+        name: esignet-global
+        key: mosip-esignet-host
+  - name: MOSIP_SIGNUP_HOST
+    valueFrom:
+      configMapKeyRef:
+        name: esignet-global
+        key: mosip-signup-host
+  - name: KEYCLOAK_EXTERNAL_URL
+    valueFrom:
+      configMapKeyRef:
+        name: keycloak-host
+        key: keycloak-external-url
+  - name: MOSIP_SIGNUP_CAPTCHA_SITE_KEY
+    valueFrom:
+      secretKeyRef:
+        name: signup-captcha
+        key: signup-captcha-site-key
+  - name: MOSIP_SIGNUP_OIDC_KEYSTORE_PWD
+    valueFrom:
+      secretKeyRef:
+        name: signup-keystore-password
+        key: signup-keystore-password
+  - name: REDIS_HOST
+    valueFrom:
+      configMapKeyRef:
+        name: redis-config
+        key: redis-host
+  - name: REDIS_PORT
+    valueFrom:
+      configMapKeyRef:
+        name: redis-config
+        key: redis-port
+  - name: REDIS_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: redis
+        key: redis-password
+  - name: MOSIP_SIGNUP_CLIENT_SECRET
+    valueFrom:
+      secretKeyRef:
+        name: keycloak-client-secrets
+        key: mosip_signup_client_secret
 
 ## ConfigMap with extra environment variables that used
 ##
-extraEnvVarsCM:
-  - global
-  - config-server-share
-  - artifactory-share
-  - softhsm-signup-share
+extraEnvVarsCM: []
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##
@@ -445,20 +486,6 @@ metrics:
     rules: []
 ## There are various jars and libs in artifactory.  Listing their locations here.  The locations are vis-a-vis
 ## /usr/share/nginx/html/artifactory path in artifactory docker
-artifacts:
-  iamAdapter: /artifactory/libs-release-local/io/mosip/kernel/kernel-auth-adapter-lite.jar
-  iamAdapterRegproc: /artifactory/libs-release-local/io/mosip/kernel/kernel-auth-adapter.jar
-  iamAdapterRegprocExt: /artifactory/libs-release-local/io/mosip/kernel/kernel-auth-adapter.jar
-  hsmClientZip: /artifactory/libs-release-local/hsm/client.zip
-  cacheProvider: /artifactory/libs-release-local/cache/cache-provider.jar
-  runtimeDep: /artifactory/libs-release-local/io/mosip/kernel/
-  regprocJars: /artifactory/libs-release-local/clamav/kernel-virusscanner-clamav.jar
-  runtimeDepUrl: /artifactory/libs-release-local/io/mosip/kernel/
-  preregistrationBundleUrl: /artifactory/libs-release-local/i18n/pre-registration-i18n-bundle.zip
-  virusscannerUrl: /artifactory/libs-release-local/clamav/kernel-virusscanner-clamav.jar
-  authwrapperUrl: /artifactory/libs-release-local/idp/idp-auth-wrapper/authentication-wrapper.jar
-  esignetauthwrapperUrl: /artifactory/libs-release-local/esignet/esignet-wrapper.zip
-
 signup:
 ## Only internal access
 istio:
@@ -475,3 +502,5 @@ volumes:
     signupoidc:
       key: oidckeystore.p12
       path: /home/mosip/keys
+pluginNameEnv: esignet-mock-plugin.jar
+pluginUrlEnv:
diff --git a/helm/signup-ui/templates/deployment.yaml b/helm/signup-ui/templates/deployment.yaml
@@ -93,6 +93,18 @@ spec:
               value: {{ .Values.container_user }}
             - name: JDK_JAVA_OPTIONS
               value: {{ .Values.additionalResources.javaOpts }}
+            {{- if .Values.signup_ui.i18n_url_env }}
+            - name: i18n_url_env
+              value: {{ .Values.signup_ui.i18n_url_env }}
+            {{- end }}
+            {{- if .Values.signup_ui.theme_url_env }}
+            - name: theme_url_env
+              value: {{ .Values.signup_ui.theme_url_env }}
+            {{- end }}
+            {{- if .Values.signup_ui.images_url_env }}
+            - name: images_url_env
+              value: {{ .Values.signup_ui.images_url_env }}
+            {{- end }}
             {{- if .Values.extraEnvVars }}
             {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
@@ -141,4 +153,4 @@ spec:
             name: {{ template "common.names.fullname" . }}-nginx-cm
             items:
               - key: nginx.conf
-                path: nginx.conf
+                path: nginx.conf
diff --git a/helm/signup-ui/values.yaml b/helm/signup-ui/values.yaml
@@ -51,8 +51,8 @@ service:
 
 image:
   registry: docker.io
-  repository: mosipqa/signup-ui
-  tag: release-1.x.x
+  repository: mosipdev/signup-ui
+  tag: develop
 
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -245,15 +245,11 @@ extraEnvVars: []
 ## ConfigMap with extra environment variables
 ##
 extraEnvVarsCM:
-  - global
-  - config-server-share
-  - artifactory-share
-  - softhsm-signup-share
   - signup-ui
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##
@@ -420,12 +416,15 @@ metrics:
 signup_ui:
   signup_ui_port: '3000'
   signup_service_host: 'signup.signup'
+  i18n_url_env: ''
+  theme_url_env: ''
+  images_url_env: ''
   configmaps:
     signup-ui:
       REACT_APP_API_BASE_URL: 'http://signup.signup/v1/signup'
       REACT_APP_SBI_DOMAIN_URI: 'http://signup.$NS'
       SIGNUP_UI_PUBLIC_URL: ''
-      SIGN_IN_WITH_ESIGNET_PLUGIN_URL: 'http://artifactory.artifactory:80/artifactory/libs-release-local/mosip-plugins/sign-in-with-esignet.zip'
+      SIGN_IN_WITH_ESIGNET_PLUGIN_URL: ''
 
 ## SIGNUP UI swagger should have only internal access. Hence linked to internal gateway
 ## We create a gateway for esignet specific URL(s) listed under `hosts`