From 4fdc80c2aa35a0172b99dd510e2c9e5dfb644475 Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Mon, 25 Nov 2024 17:23:59 +0530 Subject: [PATCH 1/6] [MOSIP-37815] Added Unique Config as Userinput Signed-off-by: VSIVAKALYAN --- deploy/esignet/install.sh | 5 ++++- helm/esignet/values.yaml | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/deploy/esignet/install.sh b/deploy/esignet/install.sh index 2dc71cf6b..5a635fb36 100755 --- a/deploy/esignet/install.sh +++ b/deploy/esignet/install.sh @@ -83,9 +83,12 @@ function installing_esignet() { fi done +read -p "Enter SPRING_KAFKA_CONSUMER_GROUP_ID: " springkafkaConsumerGroupId echo Installing esignet - helm -n $NS install esignet mosip/esignet --version $CHART_VERSION $ENABLE_INSECURE $plugin_option --set metrics.serviceMonitor.enabled=$servicemonitorflag -f values.yaml --wait + helm -n $NS install esignet mosip/esignet --version $CHART_VERSION $ENABLE_INSECURE $plugin_option \ + --set springkafkaConsumerGroupId="$springkafkaConsumerGroupId" \ + --set metrics.serviceMonitor.enabled=$servicemonitorflag -f values.yaml --wait kubectl -n $NS get deploy -o name | xargs -n1 -t kubectl -n $NS rollout status diff --git a/helm/esignet/values.yaml b/helm/esignet/values.yaml index 24fed18f2..60ee4322a 100644 --- a/helm/esignet/values.yaml +++ b/helm/esignet/values.yaml @@ -240,12 +240,18 @@ updateStrategy: ## - name: FOO ## value: "bar" ## + +#Other Configurations... +springkafkaConsumerGroupId: "" # Placeholder for user input + extraEnvVars: | - name: KEYCLOAK_EXTERNAL_URL valueFrom: configMapKeyRef: name: keycloak-host key: keycloak-external-url + - name: SPRING_KAFKA_CONSUMER_GROUP_ID + value: {{ .Values.springkafkaConsumerGroupId | quote }} - name: MOSIP_ESIGNET_CAPTCHA_SITE_KEY valueFrom: secretKeyRef: From 0bea85f62bada5dcdc0664a41f2ea13739aba637 Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Mon, 25 Nov 2024 17:39:28 +0530 Subject: [PATCH 2/6] [MOSIP-37815] Fixed Chart lint Failure Signed-off-by: VSIVAKALYAN --- helm/esignet/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/esignet/values.yaml b/helm/esignet/values.yaml index 60ee4322a..637367016 100644 --- a/helm/esignet/values.yaml +++ b/helm/esignet/values.yaml @@ -241,7 +241,7 @@ updateStrategy: ## value: "bar" ## -#Other Configurations... +# Other Configurations... springkafkaConsumerGroupId: "" # Placeholder for user input extraEnvVars: | From 2f70ee2999b6ef6b74a9ab068f53ced181c523a3 Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Wed, 27 Nov 2024 20:33:40 +0530 Subject: [PATCH 3/6] [MOSIP-37815] Updated as per requirement Signed-off-by: VSIVAKALYAN --- deploy/esignet/install.sh | 4 ++-- helm/esignet/templates/deployment.yaml | 2 ++ helm/esignet/values.yaml | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/esignet/install.sh b/deploy/esignet/install.sh index 5a635fb36..548117745 100755 --- a/deploy/esignet/install.sh +++ b/deploy/esignet/install.sh @@ -83,11 +83,11 @@ function installing_esignet() { fi done -read -p "Enter SPRING_KAFKA_CONSUMER_GROUP_ID: " springkafkaConsumerGroupId +echo Installing eSignet with SPRING_KAFKA_CONSUMER_GROUP_ID="esignet-consumer-$NS" echo Installing esignet helm -n $NS install esignet mosip/esignet --version $CHART_VERSION $ENABLE_INSECURE $plugin_option \ - --set springkafkaConsumerGroupId="$springkafkaConsumerGroupId" \ + --set springkafkaConsumerGroupId="esignet-consumer-$NS" \ --set metrics.serviceMonitor.enabled=$servicemonitorflag -f values.yaml --wait kubectl -n $NS get deploy -o name | xargs -n1 -t kubectl -n $NS rollout status diff --git a/helm/esignet/templates/deployment.yaml b/helm/esignet/templates/deployment.yaml index 6abaa3cd8..90a30eb53 100644 --- a/helm/esignet/templates/deployment.yaml +++ b/helm/esignet/templates/deployment.yaml @@ -95,6 +95,8 @@ spec: - name: container_user value: {{ .Values.containerSecurityContext.runAsUser }} {{- if .Values.additionalResources.javaOpts }} + - name: SPRING_KAFKA_CONSUMER_GROUP_ID + value: esignet-consumer-{{ .Release.Namespace }} # Using the namespace dynamically - name: JDK_JAVA_OPTIONS value: {{ .Values.additionalResources.javaOpts }} {{- end }} diff --git a/helm/esignet/values.yaml b/helm/esignet/values.yaml index 637367016..8ed9fd013 100644 --- a/helm/esignet/values.yaml +++ b/helm/esignet/values.yaml @@ -250,8 +250,6 @@ extraEnvVars: | configMapKeyRef: name: keycloak-host key: keycloak-external-url - - name: SPRING_KAFKA_CONSUMER_GROUP_ID - value: {{ .Values.springkafkaConsumerGroupId | quote }} - name: MOSIP_ESIGNET_CAPTCHA_SITE_KEY valueFrom: secretKeyRef: From 68d6c3e06f76e3a3b0522a452143ee88c5690e7a Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Wed, 27 Nov 2024 20:37:30 +0530 Subject: [PATCH 4/6] [MOSIP-37815] Updated values.yaml Signed-off-by: VSIVAKALYAN --- helm/esignet/values.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/helm/esignet/values.yaml b/helm/esignet/values.yaml index 8ed9fd013..f394b1e75 100644 --- a/helm/esignet/values.yaml +++ b/helm/esignet/values.yaml @@ -241,9 +241,6 @@ updateStrategy: ## value: "bar" ## -# Other Configurations... -springkafkaConsumerGroupId: "" # Placeholder for user input - extraEnvVars: | - name: KEYCLOAK_EXTERNAL_URL valueFrom: From 4abe63c4d6dc452313763059e77c62f2f632c3ec Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Fri, 29 Nov 2024 10:44:09 +0530 Subject: [PATCH 5/6] [MOSIP-37815] Tested Working as expected Signed-off-by: VSIVAKALYAN --- deploy/esignet/install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/esignet/install.sh b/deploy/esignet/install.sh index 548117745..381431b4b 100755 --- a/deploy/esignet/install.sh +++ b/deploy/esignet/install.sh @@ -87,7 +87,6 @@ echo Installing eSignet with SPRING_KAFKA_CONSUMER_GROUP_ID="esignet-consumer-$N echo Installing esignet helm -n $NS install esignet mosip/esignet --version $CHART_VERSION $ENABLE_INSECURE $plugin_option \ - --set springkafkaConsumerGroupId="esignet-consumer-$NS" \ --set metrics.serviceMonitor.enabled=$servicemonitorflag -f values.yaml --wait kubectl -n $NS get deploy -o name | xargs -n1 -t kubectl -n $NS rollout status From bd236eddb7cd80efa9df3971ad2511c4fe404845 Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Fri, 29 Nov 2024 10:50:53 +0530 Subject: [PATCH 6/6] [MOSIP-37815] Signed-off-by: VSIVAKALYAN --- deploy/esignet/install.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/deploy/esignet/install.sh b/deploy/esignet/install.sh index 381431b4b..c17d41f92 100755 --- a/deploy/esignet/install.sh +++ b/deploy/esignet/install.sh @@ -83,8 +83,6 @@ function installing_esignet() { fi done -echo Installing eSignet with SPRING_KAFKA_CONSUMER_GROUP_ID="esignet-consumer-$NS" - echo Installing esignet helm -n $NS install esignet mosip/esignet --version $CHART_VERSION $ENABLE_INSECURE $plugin_option \ --set metrics.serviceMonitor.enabled=$servicemonitorflag -f values.yaml --wait