From ff0adcfa86dbbcc8d22d9d3a8eed668ccd0a628d Mon Sep 17 00:00:00 2001 From: techno-467 Date: Tue, 23 Jul 2024 11:50:13 +0530 Subject: [PATCH 1/4] [DSD-5811] updated values.yaml file --- helm/inji-config-server/values.yaml | 106 ++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/helm/inji-config-server/values.yaml b/helm/inji-config-server/values.yaml index c166e934..d5776fb8 100755 --- a/helm/inji-config-server/values.yaml +++ b/helm/inji-config-server/values.yaml @@ -15,15 +15,121 @@ envVariables: name: global key: mosip-api-host enabled: true + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_API_INTERNAL_HOST valueFrom: configMapKeyRef: name: global key: mosip-api-internal-host enabled: true + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_INJIWEB_HOST valueFrom: configMapKeyRef: name: global key: mosip-injiweb-host enabled: true + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_CERTIFY_MISP_KEY + valueFrom: + secretKeyRef: + key: mosip-certify-misp-key + name: certify-misp-onboarder-key + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_SOFTHSM_CERTIFY_SECURITY_PIN + valueFrom: + secretKeyRef: + key: security-pin + name: softhsm-certify + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MIMOTO_OIDC_MOCK_PARTNER_CLIENTID + valueFrom: + secretKeyRef: + key: mimoto-oidc-mock-partner-clientid + name: mimoto-oidc-mock-partner-clientid + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_SUNBIRD_URL + valueFrom: + configMapKeyRef: + key: mosip-sunbird-url + name: global + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_PARTNER_CRYPTO_P12_PASSWORD + valueFrom: + secretKeyRef: + key: mosip-partner-crypto-p12-password + name: conf-secrets-various + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MPARTNER_DEFAULT_MOBILE_SECRET + valueFrom: + secretKeyRef: + key: mpartner_default_mobile_secret + name: keycloak-client-secret + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MIMOTO_OIDC_SUNBIRD_PARTNER_CLIENTID + valueFrom: + secretKeyRef: + key: mimoto-oidc-sunbird-partner-clientid + name: mimoto-oidc-sunbird-partner-clientid + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_ESIGNET_INSURANCE_HOST + valueFrom: + configMapKeyRef: + key: mosip-esignet-insurance-host + name: global + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_KEYCLOAK_INTERNAL_URL + valueFrom: + configMapKeyRef: + name: keycloak-host + key: keycloak-internal-url + enabled: true + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_KEYCLOAK_EXTERNAL_URL + valueFrom: + configMapKeyRef: + name: keycloak-host + key: keycloak-external-url + enabled: true + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_KEYCLOAK_INTERNAL_HOST + valueFrom: + configMapKeyRef: + name: keycloak-host + key: keycloak-internal-host + enabled: true + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_KEYCLOAK_EXTERNAL_HOST + valueFrom: + configMapKeyRef: + name: keycloak-host + key: keycloak-external-host + enabled: true + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_DB_DBUSER_PASSWORD + valueFrom: + secretKeyRef: + name: db-common-secrets + key: db-dbuser-password + enabled: true + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_S3_ACCESSKEY + valueFrom: + configMapKeyRef: + name: s3 + key: s3-user-key + enabled: true + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_S3_REGION + valueFrom: + configMapKeyRef: + name: s3 + key: s3-region + enabled: true + + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_S3_SECRETKEY + valueFrom: + secretKeyRef: + name: s3 + key: s3-user-secret + enabled: true \ No newline at end of file From 4bcb557b1a1205023ea19bb5d7a105a6cf75f99d Mon Sep 17 00:00:00 2001 From: techno-467 Date: Tue, 23 Jul 2024 11:54:44 +0530 Subject: [PATCH 2/4] [DSD-5811] updated values.yaml file --- helm/inji-config-server/values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/helm/inji-config-server/values.yaml b/helm/inji-config-server/values.yaml index d5776fb8..cdb3347a 100755 --- a/helm/inji-config-server/values.yaml +++ b/helm/inji-config-server/values.yaml @@ -78,6 +78,12 @@ envVariables: key: mosip-esignet-insurance-host name: global + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_ESIGNET_HOST + valueFrom: + configMapKeyRef: + key: mosip-esignet-host + name: global + - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_KEYCLOAK_INTERNAL_URL valueFrom: configMapKeyRef: From 404fca4afabeed2a760ceb8056abfde389ef2e1a Mon Sep 17 00:00:00 2001 From: techno-467 Date: Tue, 23 Jul 2024 12:18:09 +0530 Subject: [PATCH 3/4] [DSD-5811] updated values.yaml file --- helm/inji-config-server/values.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/helm/inji-config-server/values.yaml b/helm/inji-config-server/values.yaml index cdb3347a..bf628bcb 100755 --- a/helm/inji-config-server/values.yaml +++ b/helm/inji-config-server/values.yaml @@ -23,13 +23,6 @@ envVariables: key: mosip-api-internal-host enabled: true - - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_INJIWEB_HOST - valueFrom: - configMapKeyRef: - name: global - key: mosip-injiweb-host - enabled: true - - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_CERTIFY_MISP_KEY valueFrom: secretKeyRef: From 0edd37d81f44e6e9960cea242d2d41a501320552 Mon Sep 17 00:00:00 2001 From: techno-467 Date: Tue, 23 Jul 2024 22:02:33 +0530 Subject: [PATCH 4/4] [DSD-5811] updated values.yaml file Signed-off-by: techno-467 --- helm/inji-config-server/copy_secrets.sh | 1 + helm/inji-config-server/values.yaml | 46 ++----------------------- 2 files changed, 4 insertions(+), 43 deletions(-) diff --git a/helm/inji-config-server/copy_secrets.sh b/helm/inji-config-server/copy_secrets.sh index 07757ed5..ad391a1f 100755 --- a/helm/inji-config-server/copy_secrets.sh +++ b/helm/inji-config-server/copy_secrets.sh @@ -5,6 +5,7 @@ function copying_secrets() { COPY_UTIL=./copy_cm_func.sh DST_NS=config-server # DST_NS: Destination namespace $COPY_UTIL secret db-common-secrets postgres $DST_NS + $COPY_UTIL secret conf-secrets-various conf-secrets $DST_NS return 0 } diff --git a/helm/inji-config-server/values.yaml b/helm/inji-config-server/values.yaml index bf628bcb..b707b126 100755 --- a/helm/inji-config-server/values.yaml +++ b/helm/inji-config-server/values.yaml @@ -23,59 +23,19 @@ envVariables: key: mosip-api-internal-host enabled: true - - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_CERTIFY_MISP_KEY - valueFrom: - secretKeyRef: - key: mosip-certify-misp-key - name: certify-misp-onboarder-key - - - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_SOFTHSM_CERTIFY_SECURITY_PIN - valueFrom: - secretKeyRef: - key: security-pin - name: softhsm-certify - - - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MIMOTO_OIDC_MOCK_PARTNER_CLIENTID - valueFrom: - secretKeyRef: - key: mimoto-oidc-mock-partner-clientid - name: mimoto-oidc-mock-partner-clientid - - - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_SUNBIRD_URL - valueFrom: - configMapKeyRef: - key: mosip-sunbird-url - name: global - - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_PARTNER_CRYPTO_P12_PASSWORD valueFrom: secretKeyRef: key: mosip-partner-crypto-p12-password name: conf-secrets-various + enabled: true - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MPARTNER_DEFAULT_MOBILE_SECRET valueFrom: secretKeyRef: key: mpartner_default_mobile_secret - name: keycloak-client-secret - - - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MIMOTO_OIDC_SUNBIRD_PARTNER_CLIENTID - valueFrom: - secretKeyRef: - key: mimoto-oidc-sunbird-partner-clientid - name: mimoto-oidc-sunbird-partner-clientid - - - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_ESIGNET_INSURANCE_HOST - valueFrom: - configMapKeyRef: - key: mosip-esignet-insurance-host - name: global - - - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_ESIGNET_HOST - valueFrom: - configMapKeyRef: - key: mosip-esignet-host - name: global + name: keycloak-client-secrets + enabled: true - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_KEYCLOAK_INTERNAL_URL valueFrom: