Skip to content

Commit a35373d

Browse files
bhumi46bhumi46
committed
[MOSIP-44613]updated esignet dsf file
Signed-off-by: bhumi46 <thisisbn46@gmail.com>
1 parent 56f1970 commit a35373d

6 files changed

Lines changed: 47 additions & 8 deletions

File tree

‎.github/workflows/helmsman_esignet.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ jobs:
8383
QABASE_DOMAIN="${{ github.event.inputs.qabase_domain_name || vars.QABASE_DOMAIN_NAME }}"
8484
echo "✓ cre_domain_name = $CRE_DOMAIN (esignet standalone)"
8585
echo "✓ qabase_domain_name = $QABASE_DOMAIN (esignet standalone)"
86+
CRE_SPRING_LABEL="${{ vars.ESIGNET_CRE_SPRING_CONFIG_LABEL }}"
87+
QA11_SPRING_LABEL="${{ vars.ESIGNET_QA11_SPRING_CONFIG_LABEL }}"
88+
echo "✓ cre_spring_config_label = ${CRE_SPRING_LABEL:-develop} (esignet standalone, default: develop)"
89+
echo "✓ qa11_spring_config_label = ${QA11_SPRING_LABEL:-develop} (esignet standalone, default: develop)"
8690
else
8791
CRE_PROVIDED="${{ github.event.inputs.cre_domain_name }}"
8892
QABASE_PROVIDED="${{ github.event.inputs.qabase_domain_name }}"
@@ -119,6 +123,11 @@ jobs:
119123
ESIGNET_QA11_CAPTCHA_SECRET_KEY: ${{ secrets.ESIGNET_QA11_CAPTCHA_SECRET_KEY }}
120124
ESIGNET_SUNBIRD_CAPTCHA_SITE_KEY: ${{ secrets.ESIGNET_SUNBIRD_CAPTCHA_SITE_KEY }}
121125
ESIGNET_SUNBIRD_CAPTCHA_SECRET_KEY: ${{ secrets.ESIGNET_SUNBIRD_CAPTCHA_SECRET_KEY }}
126+
# Spring config label per namespace — controls which Git branch/tag the config-server uses
127+
# Set as Environment Variables in Repository → Settings → Environments → <branch> → Variables
128+
# If unset, hooks default to 'develop'
129+
ESIGNET_CRE_SPRING_CONFIG_LABEL: ${{ vars.ESIGNET_CRE_SPRING_CONFIG_LABEL }}
130+
ESIGNET_QA11_SPRING_CONFIG_LABEL: ${{ vars.ESIGNET_QA11_SPRING_CONFIG_LABEL }}
122131
# Cluster access secrets
123132
KUBECONFIG_SECRET: ${{ secrets.KUBECONFIG }}
124133
CLUSTER_WIREGUARD_WG0: ${{ secrets.CLUSTER_WIREGUARD_WG0 }}

‎Helmsman/dsf/esignet/esignet-dsf.yaml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ apps:
152152
pluginNameEnv: "mosip-identity-plugin.jar"
153153
pluginUrlEnv: ""
154154
extraEnvVarsCM[0]: "esignet-softhsm-cre-share"
155-
#extraEnvVarsCM[1]: "kafka-config"
155+
extraEnvVarsCM[1]: "esignet-domain-config"
156+
extraEnvVarsCM[2]: "esignet-config-server-share"
156157
metrics.serviceMonitor.enabled: "false"
157158
domainConfig.MOSIP_ESIGNET_HOST: "esignet-mosipid-cre.${domain_name}"
158159
domainConfig.MOSIP_SIGNUP_HOST: "signup-mosipid-cre.${domain_name}"
@@ -184,7 +185,8 @@ apps:
184185
pluginNameEnv: "mosip-identity-plugin.jar"
185186
pluginUrlEnv: ""
186187
extraEnvVarsCM[0]: "esignet-softhsm-qa11-share"
187-
#extraEnvVarsCM[1]: "kafka-config"
188+
extraEnvVarsCM[1]: "esignet-domain-config"
189+
extraEnvVarsCM[2]: "esignet-config-server-share"
188190
metrics.serviceMonitor.enabled: "false"
189191
domainConfig.MOSIP_ESIGNET_HOST: "esignet-mosipid-qa11.${domain_name}"
190192
domainConfig.MOSIP_SIGNUP_HOST: "signup-mosipid-qa11.${domain_name}"
@@ -486,6 +488,8 @@ apps:
486488
# image.tag: "1.2.2.3"
487489
istio.gateways[0]: "pms-partner-cre-gateway"
488490
istio.corsPolicy.allowOrigins[0].prefix: "https://pms-cre.${domain_name}"
491+
extraEnvVarsCM[0]: "esignet-domain-config"
492+
extraEnvVarsCM[1]: "esignet-config-server-share"
489493
priority: -9
490494
timeout: 1200
491495
hooks:
@@ -501,6 +505,8 @@ apps:
501505
# image.tag: "1.2.2.2"
502506
istio.gateways[0]: "pms-partner-cre-gateway"
503507
istio.corsPolicy.allowOrigins[0].prefix: "https://pms-cre.${domain_name}"
508+
extraEnvVarsCM[0]: "esignet-domain-config"
509+
extraEnvVarsCM[1]: "esignet-config-server-share"
504510
priority: -9
505511
timeout: 1200
506512

@@ -514,6 +520,8 @@ apps:
514520
# image.tag: "1.2.2.3"
515521
istio.gateways[0]: "pms-partner-qa11-gateway"
516522
istio.corsPolicy.allowOrigins[0].prefix: "https://pms-qa11.${domain_name}"
523+
extraEnvVarsCM[0]: "esignet-domain-config"
524+
extraEnvVarsCM[1]: "esignet-config-server-share"
517525
priority: -9
518526
timeout: 1200
519527
hooks:
@@ -528,6 +536,8 @@ apps:
528536
# image.repository: "mosipid/policy-management-service"
529537
# image.tag: "1.2.2.2"
530538
istio.gateways[0]: "pms-partner-qa11-gateway"
539+
extraEnvVarsCM[0]: "esignet-domain-config"
540+
extraEnvVarsCM[1]: "esignet-config-server-share"
531541
istio.corsPolicy.allowOrigins[0].prefix: "https://pms-qa11.${domain_name}"
532542
priority: -9
533543
timeout: 1200

‎Helmsman/hooks/esignet-1.7.1/config-server-esignet-postinstall.sh‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,23 @@
22
# =============================================================================
33
# eSignet 1.7.1 - Config-Server eSignet Post-install
44
# =============================================================================
5-
# Copies the esignet-config-server-share ConfigMap (created by the
6-
# config-server chart in the esignet namespace) to esignet-cre,
7-
# esignet-qa11, and esignet-sunbird so those instances can locate
8-
# the config-server.
5+
# Copies esignet-config-server-share CM from esignet ns to cre/qa11/sunbird,
6+
# then patches active_profile_env and spring_config_label_env per namespace
7+
# so each instance points to the correct config server profile and Git label.
8+
#
9+
# Environment variables (set in GitHub Actions workflow):
10+
# ESIGNET_CRE_SPRING_CONFIG_LABEL - Git label for esignet-cre (default: develop)
11+
# ESIGNET_QA11_SPRING_CONFIG_LABEL - Git label for esignet-qa11 (default: develop)
912
# =============================================================================
1013
set -euo pipefail
1114

1215
SOURCE_NS="esignet"
1316
COPY_UTIL="$WORKDIR/utils/copy-cm-and-secrets/copy_cm_func.sh"
1417
CM_NAME="esignet-config-server-share"
1518

19+
CRE_SPRING_LABEL="${ESIGNET_CRE_SPRING_CONFIG_LABEL:-develop}"
20+
QA11_SPRING_LABEL="${ESIGNET_QA11_SPRING_CONFIG_LABEL:-develop}"
21+
1622
echo "================================================"
1723
echo "eSignet 1.7.1 - Config-Server eSignet Post-install"
1824
echo "================================================"
@@ -22,4 +28,12 @@ for TARGET_NS in esignet-cre esignet-qa11 esignet-sunbird; do
2228
$COPY_UTIL configmap "$CM_NAME" "$SOURCE_NS" "$TARGET_NS"
2329
done
2430

25-
echo "Config-server share configmap propagation completed."
31+
echo "Patching $CM_NAME in esignet-cre (active_profile_env=cre, spring_config_label_env=$CRE_SPRING_LABEL)"
32+
kubectl -n esignet-cre patch configmap "$CM_NAME" --type merge \
33+
-p "{\"data\":{\"active_profile_env\":\"cre\",\"spring_config_label_env\":\"$CRE_SPRING_LABEL\"}}"
34+
35+
echo "Patching $CM_NAME in esignet-qa11 (active_profile_env=qa-11, spring_config_label_env=$QA11_SPRING_LABEL)"
36+
kubectl -n esignet-qa11 patch configmap "$CM_NAME" --type merge \
37+
-p "{\"data\":{\"active_profile_env\":\"qa-11\",\"spring_config_label_env\":\"$QA11_SPRING_LABEL\"}}"
38+
39+
echo "Config-server share configmap propagation and patching completed."

‎Helmsman/hooks/esignet-1.7.1/esignet-cre-preinstall.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ CAPTCHA_SECRET_KEY="${ESIGNET_CRE_CAPTCHA_SECRET_KEY:?ERROR: ESIGNET_CRE_CAPTCHA
1717

1818
"$WORKDIR/hooks/esignet-1.7.1/esignet-preinstall.sh"
1919

20+
# Copy esignet-domain-config from esignet ns (replaces 'global' CM referenced by chart defaults)
21+
$COPY_UTIL configmap esignet-domain-config esignet "$ESIGNET_NS"
22+
2023
# Override postgres-config with CRE-specific DB values
2124
kubectl -n "$ESIGNET_NS" patch configmap postgres-config --type merge \
2225
-p '{"data":{"database-name":"mosip_esignet_cre","database-username":"esignetuser_cre"}}'

‎Helmsman/hooks/esignet-1.7.1/esignet-qa11-preinstall.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ CAPTCHA_SECRET_KEY="${ESIGNET_QA11_CAPTCHA_SECRET_KEY:?ERROR: ESIGNET_QA11_CAPTC
1717

1818
"$WORKDIR/hooks/esignet-1.7.1/esignet-preinstall.sh"
1919

20+
# Copy esignet-domain-config from esignet ns (replaces 'global' CM referenced by chart defaults)
21+
$COPY_UTIL configmap esignet-domain-config esignet "$ESIGNET_NS"
22+
2023
# Override postgres-config with QA11-specific DB values
2124
kubectl -n "$ESIGNET_NS" patch configmap postgres-config --type merge \
2225
-p '{"data":{"database-name":"mosip_esignet_qa11","database-username":"esignetuser_qa11"}}'

‎Helmsman/utils/esignet-sunbird-plugin-values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ extraEnvVarsAdditional:
6666
- name: "MOSIP_ESIGNET_CAPTCHA_SITE_KEY"
6767
valueFrom:
6868
secretKeyRef:
69-
name: esignet-captcha
69+
name: esignet-captcha-sunbird
7070
key: esignet-captcha-site-key
7171

7272
# ---------------------------------------------------------------------------

0 commit comments

Comments
 (0)