From 03a6969033ecf264bacb122bd36da045d7a577a6 Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Mon, 25 Nov 2024 17:20:08 +0530 Subject: [PATCH 1/6] [MOSIP-37815] Added New Config as Userinput Signed-off-by: VSIVAKALYAN --- deploy/signup-service/install.sh | 2 ++ helm/signup-service/values.yaml | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/deploy/signup-service/install.sh b/deploy/signup-service/install.sh index df63ba71..2b064edb 100755 --- a/deploy/signup-service/install.sh +++ b/deploy/signup-service/install.sh @@ -98,10 +98,12 @@ function installing_signup() { fi done +read -p "Enter KAFKA_CONSUMER_GROUP_ID: " kafkaConsumerGroupId echo Installing signup helm -n $NS install signup mosip/signup \ -f values.yaml --version $CHART_VERSION $ENABLE_INSECURE $plugin_option \ + --set kafkaConsumerGroupId="$kafkaConsumerGroupId" \ --set metrics.serviceMonitor.enabled=$servicemonitorflag --wait kubectl -n $NS get deploy -o name | xargs -n1 -t kubectl -n $NS rollout status diff --git a/helm/signup-service/values.yaml b/helm/signup-service/values.yaml index c34485b3..2de3b081 100644 --- a/helm/signup-service/values.yaml +++ b/helm/signup-service/values.yaml @@ -240,7 +240,13 @@ updateStrategy: ## - name: FOO ## value: "bar" ## + +# Other configurations... +kafkaConsumerGroupId: "" # Placeholder for user input + extraEnvVars: | + - name: KAFKA_CONSUMER_GROUP_ID + value: {{ .Values.kafkaConsumerGroupId | quote }} - name: MOSIP_ESIGNET_HOST valueFrom: configMapKeyRef: From e8f54b58eaf267fbf8de7e1f96f72b1c86c69081 Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Wed, 27 Nov 2024 20:17:45 +0530 Subject: [PATCH 2/6] [MOSIP-37815] Passing the Value with Namespace Signed-off-by: VSIVAKALYAN --- deploy/signup-service/install.sh | 6 +++--- helm/signup-service/templates/deployment.yaml | 2 ++ helm/signup-service/values.yaml | 5 ----- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/deploy/signup-service/install.sh b/deploy/signup-service/install.sh index 2b064edb..060470ca 100755 --- a/deploy/signup-service/install.sh +++ b/deploy/signup-service/install.sh @@ -98,12 +98,12 @@ function installing_signup() { fi done -read -p "Enter KAFKA_CONSUMER_GROUP_ID: " kafkaConsumerGroupId +echo Installing signup with KAFKA_CONSUMER_GROUP_ID="mock-signup-idv-kafka-$NS" echo Installing signup - helm -n $NS install signup mosip/signup \ + helm -n $NS install signup /home/siva/Videos/DSD_recordings/DSD6684/esignet-signup/helm/signup-service \ -f values.yaml --version $CHART_VERSION $ENABLE_INSECURE $plugin_option \ - --set kafkaConsumerGroupId="$kafkaConsumerGroupId" \ + --set kafkaConsumerGroupId="mock-signup-idv-kafka-$NS" \ --set metrics.serviceMonitor.enabled=$servicemonitorflag --wait kubectl -n $NS get deploy -o name | xargs -n1 -t kubectl -n $NS rollout status diff --git a/helm/signup-service/templates/deployment.yaml b/helm/signup-service/templates/deployment.yaml index a69b818d..060e0fa5 100644 --- a/helm/signup-service/templates/deployment.yaml +++ b/helm/signup-service/templates/deployment.yaml @@ -92,6 +92,8 @@ spec: env: - name: container_user value: {{ .Values.containerSecurityContext.runAsUser }} + - name: KAFKA_CONSUMER_GROUP_ID + value: mock-signup-idv-kafka-{{ .Release.Namespace }}" # Using the namespace dynamically - name: JDK_JAVA_OPTIONS value: {{ .Values.additionalResources.javaOpts }} {{- if .Values.pluginUrlEnv }} diff --git a/helm/signup-service/values.yaml b/helm/signup-service/values.yaml index 2de3b081..e544e60b 100644 --- a/helm/signup-service/values.yaml +++ b/helm/signup-service/values.yaml @@ -241,12 +241,7 @@ updateStrategy: ## value: "bar" ## -# Other configurations... -kafkaConsumerGroupId: "" # Placeholder for user input - extraEnvVars: | - - name: KAFKA_CONSUMER_GROUP_ID - value: {{ .Values.kafkaConsumerGroupId | quote }} - name: MOSIP_ESIGNET_HOST valueFrom: configMapKeyRef: From b21ef7130ba0ed0802911297308ad9c20889a97f Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Wed, 27 Nov 2024 20:26:04 +0530 Subject: [PATCH 3/6] [MOSIP-37815] Update install.sh Signed-off-by: VSIVAKALYAN --- deploy/signup-service/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/signup-service/install.sh b/deploy/signup-service/install.sh index 060470ca..78238ad6 100755 --- a/deploy/signup-service/install.sh +++ b/deploy/signup-service/install.sh @@ -101,7 +101,7 @@ function installing_signup() { echo Installing signup with KAFKA_CONSUMER_GROUP_ID="mock-signup-idv-kafka-$NS" echo Installing signup - helm -n $NS install signup /home/siva/Videos/DSD_recordings/DSD6684/esignet-signup/helm/signup-service \ + helm -n $NS install signup mosip/signup \ -f values.yaml --version $CHART_VERSION $ENABLE_INSECURE $plugin_option \ --set kafkaConsumerGroupId="mock-signup-idv-kafka-$NS" \ --set metrics.serviceMonitor.enabled=$servicemonitorflag --wait From 6a8b00917712dc2391de719a5e6e166eb67afc46 Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Wed, 27 Nov 2024 20:29:47 +0530 Subject: [PATCH 4/6] Updated minor change Signed-off-by: VSIVAKALYAN --- helm/signup-service/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/signup-service/templates/deployment.yaml b/helm/signup-service/templates/deployment.yaml index 060e0fa5..dcb57697 100644 --- a/helm/signup-service/templates/deployment.yaml +++ b/helm/signup-service/templates/deployment.yaml @@ -93,7 +93,7 @@ spec: - name: container_user value: {{ .Values.containerSecurityContext.runAsUser }} - name: KAFKA_CONSUMER_GROUP_ID - value: mock-signup-idv-kafka-{{ .Release.Namespace }}" # Using the namespace dynamically + value: mock-signup-idv-kafka-{{ .Release.Namespace }} # Using the namespace dynamically - name: JDK_JAVA_OPTIONS value: {{ .Values.additionalResources.javaOpts }} {{- if .Values.pluginUrlEnv }} From 6664b2b280dfc3351824bcdd28139a45bf4aeff9 Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Fri, 29 Nov 2024 10:41:14 +0530 Subject: [PATCH 5/6] [MOSIP-37815] Tested working as Expected Signed-off-by: VSIVAKALYAN --- deploy/signup-service/install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/signup-service/install.sh b/deploy/signup-service/install.sh index 78238ad6..03bd99aa 100755 --- a/deploy/signup-service/install.sh +++ b/deploy/signup-service/install.sh @@ -103,7 +103,6 @@ echo Installing signup with KAFKA_CONSUMER_GROUP_ID="mock-signup-idv-kafka-$NS" echo Installing signup helm -n $NS install signup mosip/signup \ -f values.yaml --version $CHART_VERSION $ENABLE_INSECURE $plugin_option \ - --set kafkaConsumerGroupId="mock-signup-idv-kafka-$NS" \ --set metrics.serviceMonitor.enabled=$servicemonitorflag --wait kubectl -n $NS get deploy -o name | xargs -n1 -t kubectl -n $NS rollout status From 9d0b3bc4756ed1c3c759572efe158b9f85a1694f Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Fri, 29 Nov 2024 10:55:27 +0530 Subject: [PATCH 6/6] [MOSIP-37815] Signed-off-by: VSIVAKALYAN --- deploy/signup-service/install.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/deploy/signup-service/install.sh b/deploy/signup-service/install.sh index 03bd99aa..4bb03756 100755 --- a/deploy/signup-service/install.sh +++ b/deploy/signup-service/install.sh @@ -98,8 +98,6 @@ function installing_signup() { fi done -echo Installing signup with KAFKA_CONSUMER_GROUP_ID="mock-signup-idv-kafka-$NS" - echo Installing signup helm -n $NS install signup mosip/signup \ -f values.yaml --version $CHART_VERSION $ENABLE_INSECURE $plugin_option \