From a5882051ba417e5e29adc9ae28169984f8f898ef Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 19 Apr 2024 15:47:52 +0530 Subject: [PATCH 01/85] Resource change to large. --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a96eb7f31..cb4b12b73 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,7 +174,7 @@ jobs: machine: image: ubuntu-2004:current docker_layer_caching: true - resource_class: xlarge + resource_class: large environment: TERM: dumb parameters: @@ -395,7 +395,7 @@ jobs: helm repo update echo "helm upgrade --install ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE}" echo helm chart install starts - helm upgrade --install --timeout=1h --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + helm upgrade --install --timeout=1h --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade is done--------------------- @@ -442,7 +442,7 @@ jobs: command: | helm test g2p-sandbox --filter name=g2p-sandbox-test-gov --namespace paymenthub || echo test helm test g2p-sandbox --filter name=g2p-sandbox-test-ams --namespace paymenthub || echo test - + - run: name: Fetch Integration Test Report command: | From e8be1b8c5bde8e81a99ad100b5c62a529b081a23 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 19 Apr 2024 16:41:52 +0530 Subject: [PATCH 02/85] helm not found --- .circleci/config.yml | 124 +++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cb4b12b73..fa19a8d40 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -226,14 +226,14 @@ jobs: curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_amd64.deb sudo dpkg -i minikube_latest_amd64.deb echo minikube waiting - minikube config set cpus 6 - minikube config set memory 25600 + #minikube config set cpus 4 + #minikube config set memory 25600 minikube start #--extra-config=kubelet.max-pods=60 echo "Minikube started-----------------------------------------------------" # To check the allocated values - minikube config get cpus - minikube config get memory + #minikube config get cpus + #minikube config get memory MINIKUBE_IP=`minikube ip` echo $MINIKUBE_IP @@ -243,66 +243,66 @@ jobs: kubectl create namespace paymenthub kubectl get -A namespace - # # For remote access to minikube uncomment the following lines. - # #---------------------minikube remote aceess start--------------------- - # sudo apt install nginx - # sudo touch /etc/nginx/conf.d/minikube.conf - # echo "create nginx conf" - # sudo chmod 777 -R /etc/nginx/conf.d/ - # echo "changed access" - - # sudo apt-get install apache2-utils -y - # echo "apache2-utils installed" - # htpasswd -bc /home/circleci/project/.htpasswd minikube minikube - - # sudo cat \< /etc/nginx/conf.d/minikube.conf - # server { - # listen 8080; - # listen [::]:8080; - # server_name localhost; - # access_log /home/circleci/project/nginx_access.log; - # auth_basic "Administrators Area"; - # auth_basic_user_file /home/circleci/project/.htpasswd; - - # location / { - # proxy_pass https://$MINIKUBE_IP:8443; - # proxy_ssl_certificate /home/circleci/.minikube/profiles/minikube/client.crt; - # proxy_ssl_certificate_key /home/circleci/.minikube/profiles/minikube/client.key; - # } - # } - # EOF - # sudo service nginx restart || echo 'start nginx' - # #SYSTEMD_LESS=FRXMK systemctl status nginx.service - - # sleep 10 + # For remote access to minikube uncomment the following lines. + #---------------------minikube remote aceess start--------------------- + sudo apt install nginx + sudo touch /etc/nginx/conf.d/minikube.conf + echo "create nginx conf" + sudo chmod 777 -R /etc/nginx/conf.d/ + echo "changed access" + + sudo apt-get install apache2-utils -y + echo "apache2-utils installed" + htpasswd -bc /home/circleci/project/.htpasswd minikube minikube + + sudo cat \< /etc/nginx/conf.d/minikube.conf + server { + listen 8080; + listen [::]:8080; + server_name localhost; + access_log /home/circleci/project/nginx_access.log; + auth_basic "Administrators Area"; + auth_basic_user_file /home/circleci/project/.htpasswd; + + location / { + proxy_pass https://$MINIKUBE_IP:8443; + proxy_ssl_certificate /home/circleci/.minikube/profiles/minikube/client.crt; + proxy_ssl_certificate_key /home/circleci/.minikube/profiles/minikube/client.key; + } + } + EOF + sudo service nginx restart || echo 'start nginx' + #SYSTEMD_LESS=FRXMK systemctl status nginx.service + + sleep 10 - # echo "test-nginx-proxy" - # curl -u minikube:minikube http://localhost:8080 - - # curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok - # # ngrok config add-authtoken $AUTH_TOKEN - # echo "web_addr: $LOCAL_PORT" >> /home/circleci/.config/ngrok/ngrok.yml - # ngrok http 8080 > /dev/null & - - # echo -n "Extracting ngrok public url ." - # NGROK_PUBLIC_URL="" - # while [ -z "$NGROK_PUBLIC_URL" ]; do - # # Run 'curl' against ngrok API and extract public (using 'sed' command) - # export NGROK_PUBLIC_URL=$(curl --silent --max-time 10 --connect-timeout 5 \ - # --show-error http://127.0.0.1:$LOCAL_PORT/api/tunnels | \ - # sed -nE 's/.*public_url":"https:..([^"]*).*/\1/p') - # sleep 1 - # echo -n "." - # done - # echo ---------copy the below public_URL for NGrok---------- - # echo "https://$NGROK_PUBLIC_URL" - # echo "https://$NGROK_PUBLIC_URL" - - # #echo "test ngrok " - # #curl -u minikube:minikube https://$NGROK_PUBLIC_URL - # echo "https://$NGROK_PUBLIC_URL" + echo "test-nginx-proxy" + curl -u minikube:minikube http://localhost:8080 + + curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok + # ngrok config add-authtoken $AUTH_TOKEN + echo "web_addr: $LOCAL_PORT" >> /home/circleci/.config/ngrok/ngrok.yml + ngrok http 8080 > /dev/null & + + echo -n "Extracting ngrok public url ." + NGROK_PUBLIC_URL="" + while [ -z "$NGROK_PUBLIC_URL" ]; do + # Run 'curl' against ngrok API and extract public (using 'sed' command) + export NGROK_PUBLIC_URL=$(curl --silent --max-time 10 --connect-timeout 5 \ + --show-error http://127.0.0.1:$LOCAL_PORT/api/tunnels | \ + sed -nE 's/.*public_url":"https:..([^"]*).*/\1/p') + sleep 1 + echo -n "." + done + echo ---------copy the below public_URL for NGrok---------- + echo "https://$NGROK_PUBLIC_URL" + echo "https://$NGROK_PUBLIC_URL" + + #echo "test ngrok " + #curl -u minikube:minikube https://$NGROK_PUBLIC_URL + echo "https://$NGROK_PUBLIC_URL" - # # ---------------------minikube remote aceess end--------------------- + # ---------------------minikube remote aceess end--------------------- curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg > /dev/null sudo apt-get install apt-transport-https --yes From 4413f5ddbaacc80695d5da140f37d2fe0a7f1373 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 19 Apr 2024 16:45:46 +0530 Subject: [PATCH 03/85] helm install --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa19a8d40..25c05342f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -204,6 +204,8 @@ jobs: default: 0.0.0 type: string steps: + - helm/install-helm-client: + version: "v3.8.2" - run: name: run minikube no_output_timeout: 40m From 45ea18c5ee5c67234615024b8382f4fed37a859e Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 19 Apr 2024 17:04:42 +0530 Subject: [PATCH 04/85] test --- .circleci/config.yml | 118 +++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 25c05342f..aec6dcff0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -245,66 +245,66 @@ jobs: kubectl create namespace paymenthub kubectl get -A namespace - # For remote access to minikube uncomment the following lines. - #---------------------minikube remote aceess start--------------------- - sudo apt install nginx - sudo touch /etc/nginx/conf.d/minikube.conf - echo "create nginx conf" - sudo chmod 777 -R /etc/nginx/conf.d/ - echo "changed access" - - sudo apt-get install apache2-utils -y - echo "apache2-utils installed" - htpasswd -bc /home/circleci/project/.htpasswd minikube minikube - - sudo cat \< /etc/nginx/conf.d/minikube.conf - server { - listen 8080; - listen [::]:8080; - server_name localhost; - access_log /home/circleci/project/nginx_access.log; - auth_basic "Administrators Area"; - auth_basic_user_file /home/circleci/project/.htpasswd; - - location / { - proxy_pass https://$MINIKUBE_IP:8443; - proxy_ssl_certificate /home/circleci/.minikube/profiles/minikube/client.crt; - proxy_ssl_certificate_key /home/circleci/.minikube/profiles/minikube/client.key; - } - } - EOF - sudo service nginx restart || echo 'start nginx' - #SYSTEMD_LESS=FRXMK systemctl status nginx.service - - sleep 10 + # For remote access to minikube uncomment the following lines. + #---------------------minikube remote aceess start--------------------- + sudo apt install nginx + sudo touch /etc/nginx/conf.d/minikube.conf + echo "create nginx conf" + sudo chmod 777 -R /etc/nginx/conf.d/ + echo "changed access" - echo "test-nginx-proxy" - curl -u minikube:minikube http://localhost:8080 - - curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok - # ngrok config add-authtoken $AUTH_TOKEN - echo "web_addr: $LOCAL_PORT" >> /home/circleci/.config/ngrok/ngrok.yml - ngrok http 8080 > /dev/null & - - echo -n "Extracting ngrok public url ." - NGROK_PUBLIC_URL="" - while [ -z "$NGROK_PUBLIC_URL" ]; do - # Run 'curl' against ngrok API and extract public (using 'sed' command) - export NGROK_PUBLIC_URL=$(curl --silent --max-time 10 --connect-timeout 5 \ - --show-error http://127.0.0.1:$LOCAL_PORT/api/tunnels | \ - sed -nE 's/.*public_url":"https:..([^"]*).*/\1/p') - sleep 1 - echo -n "." - done - echo ---------copy the below public_URL for NGrok---------- - echo "https://$NGROK_PUBLIC_URL" - echo "https://$NGROK_PUBLIC_URL" - - #echo "test ngrok " - #curl -u minikube:minikube https://$NGROK_PUBLIC_URL - echo "https://$NGROK_PUBLIC_URL" - - # ---------------------minikube remote aceess end--------------------- + sudo apt-get install apache2-utils -y + echo "apache2-utils installed" + htpasswd -bc /home/circleci/project/.htpasswd minikube minikube + + sudo cat \< /etc/nginx/conf.d/minikube.conf + server { + listen 8080; + listen [::]:8080; + server_name localhost; + access_log /home/circleci/project/nginx_access.log; + auth_basic "Administrators Area"; + auth_basic_user_file /home/circleci/project/.htpasswd; + + location / { + proxy_pass https://$MINIKUBE_IP:8443; + proxy_ssl_certificate /home/circleci/.minikube/profiles/minikube/client.crt; + proxy_ssl_certificate_key /home/circleci/.minikube/profiles/minikube/client.key; + } + } + EOF + sudo service nginx restart || echo 'start nginx' + #SYSTEMD_LESS=FRXMK systemctl status nginx.service + + sleep 10 + + echo "test-nginx-proxy" + curl -u minikube:minikube http://localhost:8080 + + curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok + # ngrok config add-authtoken $AUTH_TOKEN + echo "web_addr: $LOCAL_PORT" >> /home/circleci/.config/ngrok/ngrok.yml + ngrok http 8080 > /dev/null & + + echo -n "Extracting ngrok public url ." + NGROK_PUBLIC_URL="" + while [ -z "$NGROK_PUBLIC_URL" ]; do + # Run 'curl' against ngrok API and extract public (using 'sed' command) + export NGROK_PUBLIC_URL=$(curl --silent --max-time 10 --connect-timeout 5 \ + --show-error http://127.0.0.1:$LOCAL_PORT/api/tunnels | \ + sed -nE 's/.*public_url":"https:..([^"]*).*/\1/p') + sleep 1 + echo -n "." + done + echo ---------copy the below public_URL for NGrok---------- + echo "https://$NGROK_PUBLIC_URL" + echo "https://$NGROK_PUBLIC_URL" + + #echo "test ngrok " + #curl -u minikube:minikube https://$NGROK_PUBLIC_URL + echo "https://$NGROK_PUBLIC_URL" + + # ---------------------minikube remote aceess end--------------------- curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg > /dev/null sudo apt-get install apt-transport-https --yes From f65f6b1f1676c1c4e560a51542f3be91ec57b830 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 19 Apr 2024 17:18:27 +0530 Subject: [PATCH 05/85] int test memory reduced 1.5G --- .circleci/config.yml | 52 ++++++++++++++++++------------------ helm/g2p-sandbox/values.yaml | 6 +++++ 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aec6dcff0..e1bb0abbc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -245,61 +245,61 @@ jobs: kubectl create namespace paymenthub kubectl get -A namespace - # For remote access to minikube uncomment the following lines. + # # For remote access to minikube uncomment the following lines. #---------------------minikube remote aceess start--------------------- sudo apt install nginx sudo touch /etc/nginx/conf.d/minikube.conf echo "create nginx conf" sudo chmod 777 -R /etc/nginx/conf.d/ echo "changed access" - + sudo apt-get install apache2-utils -y echo "apache2-utils installed" htpasswd -bc /home/circleci/project/.htpasswd minikube minikube - + sudo cat \< /etc/nginx/conf.d/minikube.conf server { - listen 8080; - listen [::]:8080; - server_name localhost; - access_log /home/circleci/project/nginx_access.log; - auth_basic "Administrators Area"; - auth_basic_user_file /home/circleci/project/.htpasswd; - - location / { - proxy_pass https://$MINIKUBE_IP:8443; - proxy_ssl_certificate /home/circleci/.minikube/profiles/minikube/client.crt; - proxy_ssl_certificate_key /home/circleci/.minikube/profiles/minikube/client.key; - } + listen 8080; + listen [::]:8080; + server_name localhost; + access_log /home/circleci/project/nginx_access.log; + auth_basic "Administrators Area"; + auth_basic_user_file /home/circleci/project/.htpasswd; + + location / { + proxy_pass https://$MINIKUBE_IP:8443; + proxy_ssl_certificate /home/circleci/.minikube/profiles/minikube/client.crt; + proxy_ssl_certificate_key /home/circleci/.minikube/profiles/minikube/client.key; + } } EOF sudo service nginx restart || echo 'start nginx' #SYSTEMD_LESS=FRXMK systemctl status nginx.service - + sleep 10 echo "test-nginx-proxy" curl -u minikube:minikube http://localhost:8080 - + curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok - # ngrok config add-authtoken $AUTH_TOKEN + ngrok config add-authtoken 2Zo2HVFOaaiyCIQ6ICNzBtzkfCB_4MW1T7uMsNnXgJxra4ssi echo "web_addr: $LOCAL_PORT" >> /home/circleci/.config/ngrok/ngrok.yml ngrok http 8080 > /dev/null & - + echo -n "Extracting ngrok public url ." NGROK_PUBLIC_URL="" while [ -z "$NGROK_PUBLIC_URL" ]; do - # Run 'curl' against ngrok API and extract public (using 'sed' command) - export NGROK_PUBLIC_URL=$(curl --silent --max-time 10 --connect-timeout 5 \ - --show-error http://127.0.0.1:$LOCAL_PORT/api/tunnels | \ - sed -nE 's/.*public_url":"https:..([^"]*).*/\1/p') - sleep 1 - echo -n "." + # Run 'curl' against ngrok API and extract public (using 'sed' command) + export NGROK_PUBLIC_URL=$(curl --silent --max-time 10 --connect-timeout 5 \ + --show-error http://127.0.0.1:$LOCAL_PORT/api/tunnels | \ + sed -nE 's/.*public_url":"https:..([^"]*).*/\1/p') + sleep 1 + echo -n "." done echo ---------copy the below public_URL for NGrok---------- echo "https://$NGROK_PUBLIC_URL" echo "https://$NGROK_PUBLIC_URL" - + #echo "test ngrok " #curl -u minikube:minikube https://$NGROK_PUBLIC_URL echo "https://$NGROK_PUBLIC_URL" diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index e2711b888..8d9a266dd 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -512,6 +512,12 @@ ph-ee-engine: enabled: true gradle: command: ./gradlew test -Dcucumber.filter.tags="@gov" + limits: + cpu: "500m" + memory: "1.5Gi" + requests: + cpu: "100m" + memory: "1Gi" billPay: enabled: true From fb601947ff62f769e2208fd7c24c5a59f1793592 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 19 Apr 2024 18:03:36 +0530 Subject: [PATCH 06/85] reduce memory to 512 --- .circleci/config.yml | 1 + helm/g2p-sandbox/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e1bb0abbc..0c93346d8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -399,6 +399,7 @@ jobs: echo helm chart install starts helm upgrade --install --timeout=1h --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + sleep 20000; echo --------------------helm upgrade is done--------------------- # ----------------------Post-Installation-Steps-starts--------------------------- diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 8d9a266dd..6295e9b8e 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -514,10 +514,10 @@ ph-ee-engine: command: ./gradlew test -Dcucumber.filter.tags="@gov" limits: cpu: "500m" - memory: "1.5Gi" + memory: "512M" requests: cpu: "100m" - memory: "1Gi" + memory: "512M" billPay: enabled: true From c0f3ee35ea866f5fd0d88618bf63bec3d0e94632 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 19 Apr 2024 18:42:13 +0530 Subject: [PATCH 07/85] test --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0c93346d8..3ede85a65 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -398,8 +398,8 @@ jobs: echo "helm upgrade --install ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE}" echo helm chart install starts helm upgrade --install --timeout=1h --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false - - sleep 20000; + + sleep 83200; echo --------------------helm upgrade is done--------------------- # ----------------------Post-Installation-Steps-starts--------------------------- From 731e04bf87573138b46398a586d3bc9517668ab4 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 19 Apr 2024 18:45:32 +0530 Subject: [PATCH 08/85] reduced time out --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3ede85a65..d84944a34 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -397,7 +397,7 @@ jobs: helm repo update echo "helm upgrade --install ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE}" echo helm chart install starts - helm upgrade --install --timeout=1h --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + helm upgrade --install --timeout=30m --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false sleep 83200; echo --------------------helm upgrade is done--------------------- From 4790f29b42cd1052b4cb3140465b29781d04be2b Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 19 Apr 2024 19:09:12 +0530 Subject: [PATCH 09/85] increased wait time --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d84944a34..53d7b9c9e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -397,9 +397,9 @@ jobs: helm repo update echo "helm upgrade --install ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE}" echo helm chart install starts - helm upgrade --install --timeout=30m --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + helm upgrade --install --timeout=70m --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false - sleep 83200; + sleep 70m 30s; echo --------------------helm upgrade is done--------------------- # ----------------------Post-Installation-Steps-starts--------------------------- From 240be336d1449f4ece589ba9d47871854590208c Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 19 Apr 2024 19:13:53 +0530 Subject: [PATCH 10/85] xlarge --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 53d7b9c9e..2070318f3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,7 +174,7 @@ jobs: machine: image: ubuntu-2004:current docker_layer_caching: true - resource_class: large + resource_class: xlarge environment: TERM: dumb parameters: From ef59fa824d35b098729057a6a64159463b799b0a Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 19 Apr 2024 19:32:16 +0530 Subject: [PATCH 11/85] test --- .circleci/config.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2070318f3..a1c6244f8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,7 +174,7 @@ jobs: machine: image: ubuntu-2004:current docker_layer_caching: true - resource_class: xlarge + resource_class: large environment: TERM: dumb parameters: @@ -313,7 +313,8 @@ jobs: sudo apt-get update sudo apt-get install helm kubectl create namespace paymenthub || echo namespace already exists - + sleep 70m 30s; + - run: name: fetch docker images and helm upgrade environment: @@ -397,9 +398,7 @@ jobs: helm repo update echo "helm upgrade --install ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE}" echo helm chart install starts - helm upgrade --install --timeout=70m --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false - - sleep 70m 30s; + helm upgrade --install --timeout=50m --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade is done--------------------- # ----------------------Post-Installation-Steps-starts--------------------------- From 12b059cf09c4488dec80bf1c7b55e10ae897e082 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 19 Apr 2024 19:45:12 +0530 Subject: [PATCH 12/85] tse --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1c6244f8..fc0dc0c89 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -313,7 +313,7 @@ jobs: sudo apt-get update sudo apt-get install helm kubectl create namespace paymenthub || echo namespace already exists - sleep 70m 30s; + sleep 70m 30s & - run: name: fetch docker images and helm upgrade From 98c6e72bc637dec392186dfd638bf243dc83e09d Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Mon, 22 Apr 2024 15:39:35 +0530 Subject: [PATCH 13/85] reduced memory --- helm/g2p-sandbox/values.yaml | 7 +---- helm/ph-ee-engine/connector-gsma/values.yaml | 2 +- helm/ph-ee-engine/values.yaml | 30 ++++++++++++-------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 6295e9b8e..d3b59783d 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -305,12 +305,6 @@ ph-ee-engine: enabled: true image: docker.io/openmf/ph-ee-connector-gsma:latest SPRING_PROFILES_ACTIVE: "bb" - limits: - cpu: "500m" - memory: "512M" - requests: - cpu: "100m" - memory: "256M" deployment: annotations: deployTime: "{{ .Values.deployTime }}" @@ -602,6 +596,7 @@ ph-ee-engine: minio: enabled: true + account_mapper: enabled: true image: docker.io/openmf/ph-ee-identity-account-mapper:v1.4.0 diff --git a/helm/ph-ee-engine/connector-gsma/values.yaml b/helm/ph-ee-engine/connector-gsma/values.yaml index eaa54656b..b3287f0ab 100644 --- a/helm/ph-ee-engine/connector-gsma/values.yaml +++ b/helm/ph-ee-engine/connector-gsma/values.yaml @@ -26,4 +26,4 @@ requests: deployment: apiVersion: "apps/v1" annotations: - deployTime: "{{ .Values.deployTime }}" \ No newline at end of file + deployTime: "{{ .Values.deployTime }}" diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index b75512087..ead4d574a 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1252,10 +1252,10 @@ zeebe_ops: privileged: false resources: limits: - memory: "512M" + memory: "384M" cpu: "500m" requests: - memory: "512M" + memory: "384M" cpu: "100m" # Enabling this will publicly expose your zeebe_ops instance. # Only enable this if you have security enabled on your cluster @@ -1281,10 +1281,10 @@ zeebe_ops: privileged: false resources: limits: - memory: "512M" + memory: "384M" cpu: "500m" requests: - memory: "512M" + memory: "384M" cpu: "100m" # Allows you to add any config files in /usr/share/ # such as zeebeops.yml for deployment @@ -1692,10 +1692,10 @@ ph_ee_connector_gsma: privileged: false resources: limits: - memory: "512M" + memory: "256M" cpu: "500m" requests: - memory: "512M" + memory: "256M" cpu: "100m" deployment: annotations: {} @@ -1714,10 +1714,10 @@ ph_ee_connector_gsma: privileged: false resources: limits: - memory: "512M" + memory: "256M" cpu: "500m" requests: - memory: "512M" + memory: "256M" cpu: "100m" # Allows you to add any config files in /usr/share/ # such as ph_ee_connector_gsma.yml for deployment @@ -2027,6 +2027,12 @@ vouchers: paymentadvice: false replicas: 1 image: docker.io/openmf/ph-ee-vouchers:v1.1.0 + limits: + cpu: "500m" + memory: "384M" + requests: + cpu: "100m" + memory: "384M" ingress: enabled: true annotations: @@ -2112,10 +2118,10 @@ billPay: privileged: false resources: limits: - memory: "512M" + memory: "256M" cpu: "500m" requests: - memory: "512M" + memory: "256M" cpu: "100m" service: annotations: {} @@ -2182,10 +2188,10 @@ crm: privileged: false resources: limits: - memory: "512M" + memory: "256M" cpu: "500m" requests: - memory: "512M" + memory: "256M" cpu: "100m" service: annotations: {} From 83789cf9c03802e21b14428b32ea10bb41a6ba0b Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Mon, 22 Apr 2024 16:04:46 +0530 Subject: [PATCH 14/85] incerease sleep --- .circleci/config.yml | 4 ++-- helm/ph-ee-engine/values.yaml | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fc0dc0c89..ef17025a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -313,7 +313,7 @@ jobs: sudo apt-get update sudo apt-get install helm kubectl create namespace paymenthub || echo namespace already exists - sleep 70m 30s & + - run: name: fetch docker images and helm upgrade @@ -438,7 +438,7 @@ jobs: # cd .. # sh orchestration/deployBpmn.sh || echo 'deploy Bpmn done' #------------------Post-Installation-Steps-ends------------------------------- - + sleep 70m 30s & - run: name: Run Helm Tests command: | diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index ead4d574a..a4559ee82 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -2186,13 +2186,13 @@ crm: securityContext: runAsUser: 0 privileged: false - resources: - limits: - memory: "256M" - cpu: "500m" - requests: - memory: "256M" - cpu: "100m" + + limits: + memory: "256M" + cpu: "500m" + requests: + memory: "256M" + cpu: "100m" service: annotations: {} # Only enable this if you have security enabled on your cluster From 1b64e28e3dddc863e55c1a1b39410ad3bb52a8fe Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Mon, 22 Apr 2024 16:20:11 +0530 Subject: [PATCH 15/85] test --- .circleci/config.yml | 4 +-- helm/ph-ee-engine/values.yaml | 46 ++++++++++++++--------------------- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ef17025a1..9f73ce982 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -228,13 +228,13 @@ jobs: curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_amd64.deb sudo dpkg -i minikube_latest_amd64.deb echo minikube waiting - #minikube config set cpus 4 + minikube config set cpus 4 #minikube config set memory 25600 minikube start #--extra-config=kubelet.max-pods=60 echo "Minikube started-----------------------------------------------------" # To check the allocated values - #minikube config get cpus + minikube config get cpus #minikube config get memory MINIKUBE_IP=`minikube ip` diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index a4559ee82..fd90cf066 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1250,13 +1250,12 @@ zeebe_ops: securityContext: runAsUser: 0 privileged: false - resources: - limits: - memory: "384M" - cpu: "500m" - requests: - memory: "384M" - cpu: "100m" + limits: + memory: "384M" + cpu: "500m" + requests: + memory: "384M" + cpu: "100m" # Enabling this will publicly expose your zeebe_ops instance. # Only enable this if you have security enabled on your cluster ingress: @@ -1690,13 +1689,12 @@ ph_ee_connector_gsma: securityContext: runAsUser: 0 privileged: false - resources: - limits: - memory: "256M" - cpu: "500m" - requests: - memory: "256M" - cpu: "100m" + limits: + memory: "256M" + cpu: "500m" + requests: + memory: "256M" + cpu: "100m" deployment: annotations: {} affinity: {} @@ -1712,13 +1710,6 @@ ph_ee_connector_gsma: securityContext: runAsUser: 0 privileged: false - resources: - limits: - memory: "256M" - cpu: "500m" - requests: - memory: "256M" - cpu: "100m" # Allows you to add any config files in /usr/share/ # such as ph_ee_connector_gsma.yml for deployment # ph_ee_connector_gsmaConfig: {} @@ -2116,13 +2107,12 @@ billPay: securityContext: runAsUser: 0 privileged: false - resources: - limits: - memory: "256M" - cpu: "500m" - requests: - memory: "256M" - cpu: "100m" + limits: + memory: "256M" + cpu: "500m" + requests: + memory: "256M" + cpu: "100m" service: annotations: {} # Only enable this if you have security enabled on your cluster From df921add127fc6e57fd3433e07f19184d71cf660 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Mon, 22 Apr 2024 16:59:51 +0530 Subject: [PATCH 16/85] increased memory --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f73ce982..d13e67614 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -229,13 +229,13 @@ jobs: sudo dpkg -i minikube_latest_amd64.deb echo minikube waiting minikube config set cpus 4 - #minikube config set memory 25600 + minikube config set memory 15721 minikube start #--extra-config=kubelet.max-pods=60 echo "Minikube started-----------------------------------------------------" # To check the allocated values minikube config get cpus - #minikube config get memory + minikube config get memory MINIKUBE_IP=`minikube ip` echo $MINIKUBE_IP From c59268a3bfe3749e3c917901bcddd26bb355142d Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Mon, 22 Apr 2024 17:13:10 +0530 Subject: [PATCH 17/85] test --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d13e67614..6db5b5dcf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -228,14 +228,14 @@ jobs: curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_amd64.deb sudo dpkg -i minikube_latest_amd64.deb echo minikube waiting - minikube config set cpus 4 - minikube config set memory 15721 + #minikube config set cpus 4 + #minikube config set memory 15721 minikube start #--extra-config=kubelet.max-pods=60 echo "Minikube started-----------------------------------------------------" # To check the allocated values - minikube config get cpus - minikube config get memory + #minikube config get cpus + #minikube config get memory MINIKUBE_IP=`minikube ip` echo $MINIKUBE_IP From e4a81769a4dc74f14475f7b7f7526e18376b4454 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Mon, 22 Apr 2024 17:49:39 +0530 Subject: [PATCH 18/85] limits in kafka --- .circleci/config.yml | 2 +- helm/ph-ee-engine/values.yaml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6db5b5dcf..2ead95cc0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,7 +230,7 @@ jobs: echo minikube waiting #minikube config set cpus 4 #minikube config set memory 15721 - minikube start #--extra-config=kubelet.max-pods=60 + minikube start --extra-config=kubelet.max-pods=60 echo "Minikube started-----------------------------------------------------" # To check the allocated values diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index fd90cf066..d8a45bddc 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1420,6 +1420,13 @@ kafka: controller: replicaCount: 1 + resources: + limits: + memory: "1400Mi" + cpu: "1" + requests: + memory: "512Mi" + cpu: "250m" listeners: client: From f6b6f9143083f947d229ee477c3dfafc4c1bd240 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Mon, 22 Apr 2024 18:06:34 +0530 Subject: [PATCH 19/85] reduced cpus for service --- helm/g2p-sandbox/values.yaml | 6 +-- helm/ph-ee-engine/values.yaml | 74 +++++++++++++++++------------------ 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index d3b59783d..7d20521a5 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -68,10 +68,10 @@ ph-ee-engine: # Allocate smaller chunks of memory per pod. resources: requests: - cpu: "100m" + cpu: "200m" memory: "1024M" limits: - cpu: "1000m" + cpu: "500m" memory: "1024M" volumeClaimTemplate: accessModes: [ "ReadWriteOnce" ] @@ -507,7 +507,7 @@ ph-ee-engine: gradle: command: ./gradlew test -Dcucumber.filter.tags="@gov" limits: - cpu: "500m" + cpu: "150m" memory: "512M" requests: cpu: "100m" diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index d8a45bddc..73b4774ae 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -273,7 +273,7 @@ channel: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -305,7 +305,7 @@ channel: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -380,7 +380,7 @@ ph_ee_connector_ams_mifos: resources: limits: memory: "384M" - cpu: "500m" + cpu: "150m" requests: memory: "256M" cpu: "300m" @@ -408,7 +408,7 @@ ph_ee_connector_ams_mifos: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -481,7 +481,7 @@ ph_ee_connector_mojaloop: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -510,7 +510,7 @@ ph_ee_connector_mojaloop: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -574,7 +574,7 @@ operations_app: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -603,7 +603,7 @@ operations_app: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -660,7 +660,7 @@ operations_web: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -693,7 +693,7 @@ operations_web: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -799,7 +799,7 @@ mpesa: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -828,7 +828,7 @@ mpesa: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -891,7 +891,7 @@ roster_connector: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -913,7 +913,7 @@ roster_connector: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -976,7 +976,7 @@ paygops_connector: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -998,7 +998,7 @@ paygops_connector: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -1062,7 +1062,7 @@ messagegateway: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -1098,7 +1098,7 @@ messagegateway: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -1162,7 +1162,7 @@ notifications: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -1191,7 +1191,7 @@ notifications: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512" cpu: "100m" @@ -1252,7 +1252,7 @@ zeebe_ops: privileged: false limits: memory: "384M" - cpu: "500m" + cpu: "150m" requests: memory: "384M" cpu: "100m" @@ -1281,7 +1281,7 @@ zeebe_ops: resources: limits: memory: "384M" - cpu: "500m" + cpu: "150m" requests: memory: "384M" cpu: "100m" @@ -1381,7 +1381,7 @@ importer_es: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -1399,7 +1399,7 @@ mockpayment: percentage: "0" limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "256M" cpu: "100m" @@ -1423,7 +1423,7 @@ kafka: resources: limits: memory: "1400Mi" - cpu: "1" + cpu: "500m" requests: memory: "512Mi" cpu: "250m" @@ -1511,7 +1511,7 @@ importer_rdbms: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -1533,7 +1533,7 @@ importer_rdbms: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -1629,7 +1629,7 @@ connector_bulk: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -1658,7 +1658,7 @@ connector_bulk: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -1698,7 +1698,7 @@ ph_ee_connector_gsma: privileged: false limits: memory: "256M" - cpu: "500m" + cpu: "150m" requests: memory: "256M" cpu: "100m" @@ -1787,7 +1787,7 @@ ph-ee-connector_slcb: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -1809,7 +1809,7 @@ ph-ee-connector_slcb: resources: limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -1849,7 +1849,7 @@ mock_oracle: targetport: 4100 limits: memory: "512M" - cpu: "500m" + cpu: "150m" requests: memory: "512M" cpu: "100m" @@ -1899,7 +1899,7 @@ integration_test: imageTag: v1.4.0-rc.1 imagePullPolicy: "Never" limits: - cpu: "500m" + cpu: "150m" memory: "3Gi" requests: cpu: "100m" @@ -2026,7 +2026,7 @@ vouchers: replicas: 1 image: docker.io/openmf/ph-ee-vouchers:v1.1.0 limits: - cpu: "500m" + cpu: "150m" memory: "384M" requests: cpu: "100m" @@ -2116,7 +2116,7 @@ billPay: privileged: false limits: memory: "256M" - cpu: "500m" + cpu: "150m" requests: memory: "256M" cpu: "100m" @@ -2186,7 +2186,7 @@ crm: limits: memory: "256M" - cpu: "500m" + cpu: "150m" requests: memory: "256M" cpu: "100m" From b5f9d85c8f0a882172dbdbcda4b7223f5201d8dd Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Mon, 22 Apr 2024 18:12:56 +0530 Subject: [PATCH 20/85] fix for cpu shortage --- helm/ph-ee-engine/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 73b4774ae..01d15722e 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -383,7 +383,7 @@ ph_ee_connector_ams_mifos: cpu: "150m" requests: memory: "256M" - cpu: "300m" + cpu: "100m" # Enabling this will publicly expose your ams-mifos instance. # Only enable this if you have security enabled on your cluster ingress: From 27165e98ad08fe5c4ece61ffff1900196ec6b18d Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Mon, 22 Apr 2024 18:28:08 +0530 Subject: [PATCH 21/85] remove kibana --- .circleci/config.yml | 2 +- helm/ph-ee-engine/values.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ead95cc0..1a6307466 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -398,7 +398,7 @@ jobs: helm repo update echo "helm upgrade --install ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE}" echo helm chart install starts - helm upgrade --install --timeout=50m --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + helm upgrade --install --timeout=50m --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade is done--------------------- # ----------------------Post-Installation-Steps-starts--------------------------- diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 01d15722e..b6e87fcc4 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -105,6 +105,8 @@ camunda-platform: resources: requests: cpu: 100m + limits: + cpu: 200m zeebe-gateway: replicas: 1 From 2b599648bac6a161dedd9737f960c9494475e525 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Mon, 22 Apr 2024 18:47:29 +0530 Subject: [PATCH 22/85] Change in ngrok --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1a6307466..cc2201e88 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -282,7 +282,7 @@ jobs: curl -u minikube:minikube http://localhost:8080 curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok - ngrok config add-authtoken 2Zo2HVFOaaiyCIQ6ICNzBtzkfCB_4MW1T7uMsNnXgJxra4ssi + ngrok config add-authtoken 2XZrGubibPqLSX5y16wCIAVMvKY_5QnDM2TPcqrSxqNPmD7j5 echo "web_addr: $LOCAL_PORT" >> /home/circleci/.config/ngrok/ngrok.yml ngrok http 8080 > /dev/null & From 4db5ad2271b8432823daf67bd13296618d4d5d95 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Mon, 22 Apr 2024 19:08:08 +0530 Subject: [PATCH 23/85] reduce cpu to 500 --- helm/ph-ee-engine/values.yaml | 66 ++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index b6e87fcc4..80398f9dc 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -106,7 +106,7 @@ camunda-platform: requests: cpu: 100m limits: - cpu: 200m + cpu: 150m zeebe-gateway: replicas: 1 @@ -163,6 +163,14 @@ elasticsearch: name: elastic-credentials key: password + resources: + limits: + cpu: 300m + memory: 1024M + requests: + cpu: 200m + memory: 1024M + kibana: enabled: true @@ -275,7 +283,7 @@ channel: resources: limits: memory: "512M" - cpu: "150m" + cpu: "100m" requests: memory: "512M" cpu: "100m" @@ -382,10 +390,10 @@ ph_ee_connector_ams_mifos: resources: limits: memory: "384M" - cpu: "150m" + cpu: "100m" requests: memory: "256M" - cpu: "100m" + cpu: "50m" # Enabling this will publicly expose your ams-mifos instance. # Only enable this if you have security enabled on your cluster ingress: @@ -410,10 +418,10 @@ ph_ee_connector_ams_mifos: resources: limits: memory: "512M" - cpu: "150m" + cpu: "100m" requests: memory: "512M" - cpu: "100m" + cpu: "50m" # Allows you to add any config files in /usr/share/ # such as ph-ee-connector-ams-mifos.yml for deployment # ph-ee-connector-ams-mifosConfig: {} @@ -483,10 +491,10 @@ ph_ee_connector_mojaloop: resources: limits: memory: "512M" - cpu: "150m" + cpu: "100m" requests: memory: "512M" - cpu: "100m" + cpu: "50m" # Enabling this will publicly expose your mojaloop instance. # Only enable this if you have security enabled on your cluster ingress: @@ -579,7 +587,7 @@ operations_app: cpu: "150m" requests: memory: "512M" - cpu: "100m" + cpu: "100m" # Enabling this will publicly expose your operations_app instance. # Only enable this if you have security enabled on your cluster ingress: @@ -608,7 +616,7 @@ operations_app: cpu: "150m" requests: memory: "512M" - cpu: "100m" + cpu: "100m" # Allows you to add any config files in /usr/share/ # such as operations_app.yml for deployment @@ -1254,10 +1262,10 @@ zeebe_ops: privileged: false limits: memory: "384M" - cpu: "150m" + cpu: "100m" requests: memory: "384M" - cpu: "100m" + cpu: "50m" # Enabling this will publicly expose your zeebe_ops instance. # Only enable this if you have security enabled on your cluster ingress: @@ -1283,10 +1291,10 @@ zeebe_ops: resources: limits: memory: "384M" - cpu: "150m" + cpu: "100m" requests: memory: "384M" - cpu: "100m" + cpu: "50m" # Allows you to add any config files in /usr/share/ # such as zeebeops.yml for deployment # ph-ee-zeebe-opsConfig: {} @@ -1401,10 +1409,10 @@ mockpayment: percentage: "0" limits: memory: "512M" - cpu: "150m" + cpu: "100m" requests: memory: "256M" - cpu: "100m" + cpu: "50m" deployment: annotations: {} @@ -1425,7 +1433,7 @@ kafka: resources: limits: memory: "1400Mi" - cpu: "500m" + cpu: "300m" requests: memory: "512Mi" cpu: "250m" @@ -1513,10 +1521,10 @@ importer_rdbms: resources: limits: memory: "512M" - cpu: "150m" + cpu: "100m" requests: memory: "512M" - cpu: "100m" + cpu: "50m" deployment: annotations: {} affinity: {} @@ -1700,10 +1708,10 @@ ph_ee_connector_gsma: privileged: false limits: memory: "256M" - cpu: "150m" + cpu: "100m" requests: memory: "256M" - cpu: "100m" + cpu: "50m" deployment: annotations: {} affinity: {} @@ -1901,10 +1909,10 @@ integration_test: imageTag: v1.4.0-rc.1 imagePullPolicy: "Never" limits: - cpu: "150m" + cpu: "100m" memory: "3Gi" requests: - cpu: "100m" + cpu: "50m" memory: "2Gi" operations_app: contactpoint: "http://ph-ee-operations-app:80" @@ -2028,10 +2036,10 @@ vouchers: replicas: 1 image: docker.io/openmf/ph-ee-vouchers:v1.1.0 limits: - cpu: "150m" + cpu: "100m" memory: "384M" requests: - cpu: "100m" + cpu: "50m" memory: "384M" ingress: enabled: true @@ -2118,10 +2126,10 @@ billPay: privileged: false limits: memory: "256M" - cpu: "150m" + cpu: "100m" requests: memory: "256M" - cpu: "100m" + cpu: "50m" service: annotations: {} # Only enable this if you have security enabled on your cluster @@ -2188,10 +2196,10 @@ crm: limits: memory: "256M" - cpu: "150m" + cpu: "100m" requests: memory: "256M" - cpu: "100m" + cpu: "50m" service: annotations: {} # Only enable this if you have security enabled on your cluster From 0f20c2cd65bba497f7125e5b43fd7cf01931b4bd Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 23 Apr 2024 10:18:00 +0530 Subject: [PATCH 24/85] test --- helm/ph-ee-engine/values.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 80398f9dc..fe23b64ba 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -393,7 +393,7 @@ ph_ee_connector_ams_mifos: cpu: "100m" requests: memory: "256M" - cpu: "50m" + cpu: "100m" # Enabling this will publicly expose your ams-mifos instance. # Only enable this if you have security enabled on your cluster ingress: @@ -421,7 +421,7 @@ ph_ee_connector_ams_mifos: cpu: "100m" requests: memory: "512M" - cpu: "50m" + cpu: "100m" # Allows you to add any config files in /usr/share/ # such as ph-ee-connector-ams-mifos.yml for deployment # ph-ee-connector-ams-mifosConfig: {} @@ -494,7 +494,7 @@ ph_ee_connector_mojaloop: cpu: "100m" requests: memory: "512M" - cpu: "50m" + cpu: "100m" # Enabling this will publicly expose your mojaloop instance. # Only enable this if you have security enabled on your cluster ingress: @@ -1265,7 +1265,7 @@ zeebe_ops: cpu: "100m" requests: memory: "384M" - cpu: "50m" + cpu: "100m" # Enabling this will publicly expose your zeebe_ops instance. # Only enable this if you have security enabled on your cluster ingress: @@ -1294,7 +1294,7 @@ zeebe_ops: cpu: "100m" requests: memory: "384M" - cpu: "50m" + cpu: "100m" # Allows you to add any config files in /usr/share/ # such as zeebeops.yml for deployment # ph-ee-zeebe-opsConfig: {} @@ -1412,7 +1412,7 @@ mockpayment: cpu: "100m" requests: memory: "256M" - cpu: "50m" + cpu: "100m" deployment: annotations: {} @@ -1524,7 +1524,7 @@ importer_rdbms: cpu: "100m" requests: memory: "512M" - cpu: "50m" + cpu: "100m" deployment: annotations: {} affinity: {} @@ -1711,7 +1711,7 @@ ph_ee_connector_gsma: cpu: "100m" requests: memory: "256M" - cpu: "50m" + cpu: "100m" deployment: annotations: {} affinity: {} @@ -1912,7 +1912,7 @@ integration_test: cpu: "100m" memory: "3Gi" requests: - cpu: "50m" + cpu: "100m" memory: "2Gi" operations_app: contactpoint: "http://ph-ee-operations-app:80" @@ -2039,7 +2039,7 @@ vouchers: cpu: "100m" memory: "384M" requests: - cpu: "50m" + cpu: "100m" memory: "384M" ingress: enabled: true @@ -2129,7 +2129,7 @@ billPay: cpu: "100m" requests: memory: "256M" - cpu: "50m" + cpu: "100m" service: annotations: {} # Only enable this if you have security enabled on your cluster @@ -2199,7 +2199,7 @@ crm: cpu: "100m" requests: memory: "256M" - cpu: "50m" + cpu: "100m" service: annotations: {} # Only enable this if you have security enabled on your cluster From 1eb4b93f6614c9ca3abe3f19e2abe6c3b5bf7f63 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 23 Apr 2024 10:29:47 +0530 Subject: [PATCH 25/85] test1 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cc2201e88..719723657 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,7 +174,7 @@ jobs: machine: image: ubuntu-2004:current docker_layer_caching: true - resource_class: large + resource_class: xlarge environment: TERM: dumb parameters: From 51d49af7eb5125a06fb3d212dea8fc6dd20969df Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 23 Apr 2024 11:49:41 +0530 Subject: [PATCH 26/85] reduced memeory and storage --- .circleci/config.yml | 2 +- helm/g2p-sandbox/values.yaml | 19 +++--- helm/identity-account-mapper/values.yaml | 2 +- .../templates/tests/integration-test-ams.yaml | 8 +-- .../templates/tests/integration-test-gov.yaml | 8 +-- helm/ph-ee-engine/values.yaml | 67 ++++++++++--------- 6 files changed, 53 insertions(+), 53 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 719723657..cc2201e88 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,7 +174,7 @@ jobs: machine: image: ubuntu-2004:current docker_layer_caching: true - resource_class: xlarge + resource_class: large environment: TERM: dumb parameters: diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 7d20521a5..5fa2a8970 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -66,19 +66,12 @@ ph-ee-engine: # Shrink default JVM heap. esJavaOpts: "-Xmx512m -Xms512m" # Allocate smaller chunks of memory per pod. - resources: - requests: - cpu: "200m" - memory: "1024M" - limits: - cpu: "500m" - memory: "1024M" volumeClaimTemplate: accessModes: [ "ReadWriteOnce" ] storageClassName: "gp2" resources: requests: - storage: 10Gi + storage: 5Gi kibana: enabled: true @@ -189,8 +182,6 @@ ph-ee-engine: mockpayment: enabled: true - limits: - memory: "768M" ingress: enabled: false hosts: @@ -601,7 +592,13 @@ account_mapper: enabled: true image: docker.io/openmf/ph-ee-identity-account-mapper:v1.4.0 hostname: "identity-mapper.sandbox.mifos.io" - LOGGING_LEVEL_ROOT: INFO + LOGGING_LEVEL_ROOT: INFO + limits: + cpu: "100m" + memory: "384M" + requests: + cpu: "100m" + memory: "256M" ingress: enabled: false pathtype: Prefix diff --git a/helm/identity-account-mapper/values.yaml b/helm/identity-account-mapper/values.yaml index 420d709c8..e340e5457 100644 --- a/helm/identity-account-mapper/values.yaml +++ b/helm/identity-account-mapper/values.yaml @@ -107,7 +107,7 @@ elasticsearch: storageClassName: "gp2" resources: requests: - storage: 10Gi + storage: 5Gi kibana: enabled: true diff --git a/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml b/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml index 6992f47ba..e5f7a98b2 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml @@ -17,9 +17,9 @@ spec: {{- include "inttest.env" . | nindent 4 }} resources: limits: - cpu: "500m" - memory: "1.5Gi" + cpu: "{{.Values.integration_test.limits.cpu}}" + memory: "{{.Values.integration_test.limits.memory}}" requests: - cpu: "100m" - memory: "1Gi" + cpu: "{{.Values.integration_test.requests.cpu}}" + memory: "{{.Values.integration_test.requests.memory}}" restartPolicy: Never diff --git a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml index 40be17baf..1721d0c8b 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml @@ -18,9 +18,9 @@ spec: {{- include "inttest.env" . | nindent 4 }} resources: limits: - cpu: "500m" - memory: "1.5Gi" + cpu: "{{.Values.integration_test.limits.cpu}}" + memory: "{{.Values.integration_test.limits.memory}}" requests: - cpu: "100m" - memory: "1Gi" + cpu: "{{.Values.integration_test.requests.cpu}}" + memory: "{{.Values.integration_test.requests.memory}}" restartPolicy: Never diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index fe23b64ba..ac8c85633 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -100,7 +100,7 @@ camunda-platform: replicationFactor: "1" cpuThreadCount: "2" ioThreadCount: "2" - pvcSize: "10Gi" + pvcSize: "5Gi" resources: requests: @@ -166,10 +166,10 @@ elasticsearch: resources: limits: cpu: 300m - memory: 1024M + memory: 512M requests: cpu: 200m - memory: 1024M + memory: 512M kibana: @@ -280,13 +280,12 @@ channel: securityContext: runAsUser: 0 privileged: false - resources: - limits: - memory: "512M" - cpu: "100m" - requests: - memory: "512M" - cpu: "100m" + limits: + memory: "384M" + cpu: "100m" + requests: + memory: "256M" + cpu: "100m" service: annotations: {} # Enabling this will publicly expose your channel instance. @@ -339,6 +338,9 @@ operationsmysql: username: "mifos" password: "password" rootPassword: "4ET6ywqlGt" + primary: + persistence: + size: 4Gi initdbScripts: setup.sql: |- CREATE DATABASE IF NOT EXISTS phdefault; @@ -488,13 +490,12 @@ ph_ee_connector_mojaloop: securityContext: runAsUser: 0 privileged: false - resources: - limits: - memory: "512M" - cpu: "100m" - requests: - memory: "512M" - cpu: "100m" + limits: + memory: "384M" + cpu: "100m" + requests: + memory: "256M" + cpu: "100m" # Enabling this will publicly expose your mojaloop instance. # Only enable this if you have security enabled on your cluster ingress: @@ -581,13 +582,12 @@ operations_app: securityContext: runAsUser: 0 privileged: false - resources: - limits: - memory: "512M" - cpu: "150m" - requests: - memory: "512M" - cpu: "100m" + limits: + memory: "384M" + cpu: "100m" + requests: + memory: "256M" + cpu: "100m" # Enabling this will publicly expose your operations_app instance. # Only enable this if you have security enabled on your cluster ingress: @@ -1388,13 +1388,12 @@ importer_es: securityContext: runAsUser: 0 privileged: false - resources: - limits: - memory: "512M" - cpu: "150m" - requests: - memory: "512M" - cpu: "100m" + limits: + memory: "512M" + cpu: "150m" + requests: + memory: "512M" + cpu: "100m" javaToolOptions: "-Xmx256M" deployment: annotations: {} @@ -1430,6 +1429,8 @@ kafka: controller: replicaCount: 1 + persistence: + size: "4Gi" resources: limits: memory: "1400Mi" @@ -1945,6 +1946,8 @@ integration_test: redis: enabled: true replica: + persistence: + size: "4Gi" replicaCount: 1 volumeClaimTemplate: storageClassName: "gp2" @@ -2229,7 +2232,7 @@ minio: replicas: 1 persistence: enabled: true - size: 10Gi + size: 5Gi mode: standalone rootUser: root rootPassword: password From 84dd4594e9c2a3bc1158d10ac13545e8285a9848 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 23 Apr 2024 12:29:56 +0530 Subject: [PATCH 27/85] final --- helm/g2p-sandbox/values.yaml | 2 +- helm/ph-ee-engine/values.yaml | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 5fa2a8970..6c083230e 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -71,7 +71,7 @@ ph-ee-engine: storageClassName: "gp2" resources: requests: - storage: 5Gi + storage: 1Gi kibana: enabled: true diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index ac8c85633..059124bc5 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -100,7 +100,7 @@ camunda-platform: replicationFactor: "1" cpuThreadCount: "2" ioThreadCount: "2" - pvcSize: "5Gi" + pvcSize: "1Gi" resources: requests: @@ -340,7 +340,7 @@ operationsmysql: rootPassword: "4ET6ywqlGt" primary: persistence: - size: 4Gi + size: 1Gi initdbScripts: setup.sql: |- CREATE DATABASE IF NOT EXISTS phdefault; @@ -1430,7 +1430,7 @@ kafka: controller: replicaCount: 1 persistence: - size: "4Gi" + size: "1Gi" resources: limits: memory: "1400Mi" @@ -1833,6 +1833,12 @@ ph-ee-connector: enabled: false replicas: 1 image: docker.io/openmf/ph-ee-connector-bulk:v1.1.0 + limits: + cpu: "100m" + memory: "256M" + requests: + cpu: "100m" + memory: "256M" ingress: enabled: true annotations: @@ -1945,9 +1951,12 @@ integration_test: redis: enabled: true + master: + persistence: + size: "1Gi" replica: persistence: - size: "4Gi" + size: "1Gi" replicaCount: 1 volumeClaimTemplate: storageClassName: "gp2" @@ -2232,7 +2241,7 @@ minio: replicas: 1 persistence: enabled: true - size: 5Gi + size: 1Gi mode: standalone rootUser: root rootPassword: password From 0fca76473a6e68a88e57262d3f2cf2e5d05c55aa Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 23 Apr 2024 14:48:43 +0530 Subject: [PATCH 28/85] readiness probe --- helm/g2p-sandbox/values.yaml | 2 +- helm/ph-ee-engine/values.yaml | 45 +++++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 6c083230e..a0ec9f87f 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -71,7 +71,7 @@ ph-ee-engine: storageClassName: "gp2" resources: requests: - storage: 1Gi + storage: 2Gi kibana: enabled: true diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 059124bc5..4f7edeefa 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -89,6 +89,8 @@ camunda-platform: volumeMounts: - name: exporters mountPath: /exporters/ + readinessProbe: + initialDelaySeconds: 60 volumeClaimTemplate: storageClassName: "gp2" @@ -104,13 +106,17 @@ camunda-platform: resources: requests: - cpu: 100m + cpu: "100m" + memory: "786Mi" limits: - cpu: 150m + cpu: "150m" + memory: "1000Mi" zeebe-gateway: replicas: 1 logLevel: warn + readinessProbe: + initialDelaySeconds: 60 env: - name: ZEEBE_GATEWAY_THREADS_MANAGEMENTTHREADS value: "4" @@ -162,7 +168,8 @@ elasticsearch: secretKeyRef: name: elastic-credentials key: password - + readinessProbe: + initialDelaySeconds: 180 resources: limits: cpu: 300m @@ -252,7 +259,7 @@ channel: path: /actuator/health/readiness port: 8443 scheme: HTTPS - initialDelaySeconds: 120 + initialDelaySeconds: 180 periodSeconds: 30 failureThreshold: 3 timeoutSeconds: 5 @@ -340,7 +347,9 @@ operationsmysql: rootPassword: "4ET6ywqlGt" primary: persistence: - size: 1Gi + size: 2Gi + readinessProbe: + initialDelaySeconds: 180 initdbScripts: setup.sql: |- CREATE DATABASE IF NOT EXISTS phdefault; @@ -462,7 +471,7 @@ ph_ee_connector_mojaloop: httpGet: path: /actuator/health/readiness port: 9191 - initialDelaySeconds: 120 + initialDelaySeconds: 180 periodSeconds: 30 failureThreshold: 3 timeoutSeconds: 5 @@ -554,7 +563,7 @@ operations_app: httpGet: path: /actuator/health/readiness port: 9191 - initialDelaySeconds: 120 + initialDelaySeconds: 180 periodSeconds: 30 failureThreshold: 3 timeoutSeconds: 5 @@ -1232,7 +1241,7 @@ zeebe_ops: httpGet: path: /actuator/health/readiness port: 9191 - initialDelaySeconds: 120 + initialDelaySeconds: 180 periodSeconds: 30 failureThreshold: 3 timeoutSeconds: 5 @@ -1360,7 +1369,7 @@ importer_es: httpGet: path: /actuator/health/readiness port: 9191 - initialDelaySeconds: 120 + initialDelaySeconds: 180 periodSeconds: 30 failureThreshold: 3 timeoutSeconds: 5 @@ -1414,6 +1423,7 @@ mockpayment: cpu: "100m" deployment: annotations: {} + initialDelaySeconds: 180 kafka: @@ -1430,7 +1440,9 @@ kafka: controller: replicaCount: 1 persistence: - size: "1Gi" + size: "2Gi" + readinessProbe: + initialDelaySeconds: 180 resources: limits: memory: "1400Mi" @@ -1491,7 +1503,7 @@ importer_rdbms: httpGet: path: /actuator/health/readiness port: 9191 - initialDelaySeconds: 120 + initialDelaySeconds: 180 periodSeconds: 30 failureThreshold: 3 timeoutSeconds: 5 @@ -1609,7 +1621,7 @@ connector_bulk: httpGet: path: /actuator/health/readiness port: 9191 - initialDelaySeconds: 120 + initialDelaySeconds: 180 periodSeconds: 30 failureThreshold: 3 timeoutSeconds: 5 @@ -1954,10 +1966,12 @@ redis: master: persistence: size: "1Gi" + readinessProbe: + initialDelaySeconds: 180 replica: persistence: size: "1Gi" - replicaCount: 1 + replicaCount: 0 volumeClaimTemplate: storageClassName: "gp2" @@ -2093,6 +2107,7 @@ vouchers: hostname: "http://ph-ee-operations-app:80" endpoints: transfers: "/api/v1/transfers?size=1&page=0" + initialDelaySeconds: 180 billPay: enabled: false @@ -2113,7 +2128,7 @@ billPay: path: /actuator/health/readiness port: 8080 scheme: HTTPS - initialDelaySeconds: 120 + initialDelaySeconds: 180 periodSeconds: 30 failureThreshold: 3 timeoutSeconds: 5 @@ -2182,7 +2197,7 @@ crm: path: /actuator/health/readiness port: 8080 scheme: HTTPS - initialDelaySeconds: 120 + initialDelaySeconds: 180 periodSeconds: 30 failureThreshold: 3 timeoutSeconds: 5 From ff2d9c2da409f66ee8a7c5a4ec340171e7b145a2 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 23 Apr 2024 14:50:47 +0530 Subject: [PATCH 29/85] increase pvc size --- helm/ph-ee-engine/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 4f7edeefa..c11b3fe57 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -102,7 +102,7 @@ camunda-platform: replicationFactor: "1" cpuThreadCount: "2" ioThreadCount: "2" - pvcSize: "1Gi" + pvcSize: "2Gi" resources: requests: From 4003c6da9364830c8331a59394bb89e8498dbc1c Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 23 Apr 2024 15:01:12 +0530 Subject: [PATCH 30/85] fix for pvc issue --- helm/g2p-sandbox/values.yaml | 3 ++- helm/ph-ee-engine/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index a0ec9f87f..3ec3840ed 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -71,7 +71,7 @@ ph-ee-engine: storageClassName: "gp2" resources: requests: - storage: 2Gi + storage: 1Gi kibana: enabled: true @@ -599,6 +599,7 @@ account_mapper: requests: cpu: "100m" memory: "256M" + initialDelaySeconds: 180 ingress: enabled: false pathtype: Prefix diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index c11b3fe57..31e7fec03 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -102,7 +102,7 @@ camunda-platform: replicationFactor: "1" cpuThreadCount: "2" ioThreadCount: "2" - pvcSize: "2Gi" + pvcSize: "1Gi" resources: requests: @@ -1440,7 +1440,7 @@ kafka: controller: replicaCount: 1 persistence: - size: "2Gi" + size: "1Gi" readinessProbe: initialDelaySeconds: 180 resources: From 3d643f890606a8058c14b07b90d790816c7111ae Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 23 Apr 2024 15:11:46 +0530 Subject: [PATCH 31/85] tste --- helm/ph-ee-engine/values.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 31e7fec03..9212adfbf 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -105,12 +105,13 @@ camunda-platform: pvcSize: "1Gi" resources: - requests: - cpu: "100m" - memory: "786Mi" limits: cpu: "150m" memory: "1000Mi" + requests: + cpu: "100m" + memory: "786Mi" + zeebe-gateway: replicas: 1 From 01097f675fd3fda6aadd8303f0a07ae987540be0 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 23 Apr 2024 16:34:04 +0530 Subject: [PATCH 32/85] config readiness probe --- .../ph-ee-engine/ams-paygops/templates/deployment.yaml | 10 +++++----- helm/ph-ee-engine/ams-paygops/values.yaml | 8 +++++++- helm/ph-ee-engine/ams-roster/templates/deployment.yaml | 10 +++++----- helm/ph-ee-engine/ams-roster/values.yaml | 8 +++++++- .../connector-channel/templates/deployment.yaml | 8 ++++---- .../templates/deployment.yaml | 8 ++++---- .../connector-mock-payment-schema/values.yaml | 9 ++++++++- .../connector-mpesa/templates/deployment.yaml | 10 +++++----- helm/ph-ee-engine/connector-mpesa/values.yaml | 8 +++++++- .../connector-notifications/templates/deployment.yaml | 10 +++++----- helm/ph-ee-engine/connector-notifications/values.yaml | 9 ++++++++- .../message-gateway/templates/deployment.yaml | 10 +++++----- helm/ph-ee-engine/message-gateway/values.yaml | 9 ++++++++- .../operations-app/templates/deployment.yaml | 3 ++- helm/ph-ee-engine/operations-app/values.yaml | 7 +++++++ helm/ph-ee-engine/values.yaml | 9 ++++++--- helm/ph-ee-engine/vouchers/templates/deployment.yaml | 8 ++++---- helm/ph-ee-engine/vouchers/values.yaml | 6 ++++++ 18 files changed, 103 insertions(+), 47 deletions(-) diff --git a/helm/ph-ee-engine/ams-paygops/templates/deployment.yaml b/helm/ph-ee-engine/ams-paygops/templates/deployment.yaml index e68595932..9006680d0 100644 --- a/helm/ph-ee-engine/ams-paygops/templates/deployment.yaml +++ b/helm/ph-ee-engine/ams-paygops/templates/deployment.yaml @@ -29,14 +29,14 @@ spec: httpGet: path: /actuator/health/liveness port: 8080 - initialDelaySeconds: 20 - periodSeconds: 30 + initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.livenessProbe.periodSeconds}} readinessProbe: httpGet: path: /actuator/health/readiness port: 8080 - initialDelaySeconds: 20 - periodSeconds: 30 + initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.readinessProbe.periodSeconds}} env: - name: "SPRING_PROFILES_ACTIVE" value: "{{ .Values.global.SPRING_PROFILES_ACTIVE }}" @@ -66,4 +66,4 @@ spec: requests: memory: "{{ .Values.requests.memory }}" cpu: "{{ .Values.requests.cpu }}" -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/ph-ee-engine/ams-paygops/values.yaml b/helm/ph-ee-engine/ams-paygops/values.yaml index 139076e46..a3ee841e9 100644 --- a/helm/ph-ee-engine/ams-paygops/values.yaml +++ b/helm/ph-ee-engine/ams-paygops/values.yaml @@ -31,4 +31,10 @@ requests: deployment: apiVersion: "apps/v1" annotations: - deployTime: "{{ .Values.deployTime }}" \ No newline at end of file + deployTime: "{{ .Values.deployTime }}" +livenessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 +readinessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 diff --git a/helm/ph-ee-engine/ams-roster/templates/deployment.yaml b/helm/ph-ee-engine/ams-roster/templates/deployment.yaml index 87c1ea188..5c122ea72 100644 --- a/helm/ph-ee-engine/ams-roster/templates/deployment.yaml +++ b/helm/ph-ee-engine/ams-roster/templates/deployment.yaml @@ -30,14 +30,14 @@ spec: httpGet: path: /actuator/health/liveness port: 8080 - initialDelaySeconds: 20 - periodSeconds: 30 + initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.livenessProbe.periodSeconds}} readinessProbe: httpGet: path: /actuator/health/readiness port: 8080 - initialDelaySeconds: 20 - periodSeconds: 30 + initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.readinessProbe.periodSeconds}} env: - name: "SPRING_PROFILES_ACTIVE" value: "{{ .Values.global.SPRING_PROFILES_ACTIVE }}" @@ -66,4 +66,4 @@ spec: requests: memory: "{{ .Values.requests.memory }}" cpu: "{{ .Values.requests.cpu }}" -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/ph-ee-engine/ams-roster/values.yaml b/helm/ph-ee-engine/ams-roster/values.yaml index 6756f89e3..4955976fc 100644 --- a/helm/ph-ee-engine/ams-roster/values.yaml +++ b/helm/ph-ee-engine/ams-roster/values.yaml @@ -28,4 +28,10 @@ requests: deployment: apiVersion: "apps/v1" annotations: - deployTime: "{{ .Values.deployTime }}" \ No newline at end of file + deployTime: "{{ .Values.deployTime }}" +livenessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 +readinessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 diff --git a/helm/ph-ee-engine/connector-channel/templates/deployment.yaml b/helm/ph-ee-engine/connector-channel/templates/deployment.yaml index ebe53ca3d..c598ef51d 100644 --- a/helm/ph-ee-engine/connector-channel/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-channel/templates/deployment.yaml @@ -39,15 +39,15 @@ spec: path: /actuator/health/liveness port: 8443 scheme: HTTPS - initialDelaySeconds: 20 - periodSeconds: 180 + initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.livenessProbe.periodSeconds}} readinessProbe: httpGet: path: /actuator/health/readiness port: 8443 scheme: HTTPS - initialDelaySeconds: 20 - periodSeconds: 180 + initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.readinessProbe.periodSeconds}} env: - name: "SPRING_PROFILES_ACTIVE" value: "{{ .Values.SPRING_PROFILES_ACTIVE }}" diff --git a/helm/ph-ee-engine/connector-mock-payment-schema/templates/deployment.yaml b/helm/ph-ee-engine/connector-mock-payment-schema/templates/deployment.yaml index e0ed454b1..196d30f81 100644 --- a/helm/ph-ee-engine/connector-mock-payment-schema/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-mock-payment-schema/templates/deployment.yaml @@ -38,14 +38,14 @@ spec: httpGet: path: /actuator/health/liveness port: 8080 - initialDelaySeconds: 20 - periodSeconds: 30 + initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.livenessProbe.periodSeconds}} readinessProbe: httpGet: path: /actuator/health/readiness port: 8080 - initialDelaySeconds: 20 - periodSeconds: 30 + initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.readinessProbe.periodSeconds}} env: - name: "SPRING_PROFILES_ACTIVE" value: "{{ .Values.global.SPRING_PROFILES_ACTIVE }}" diff --git a/helm/ph-ee-engine/connector-mock-payment-schema/values.yaml b/helm/ph-ee-engine/connector-mock-payment-schema/values.yaml index be5a7730c..c03e8f54e 100644 --- a/helm/ph-ee-engine/connector-mock-payment-schema/values.yaml +++ b/helm/ph-ee-engine/connector-mock-payment-schema/values.yaml @@ -37,4 +37,11 @@ ingress: tls: [ ] # - secretName: sandbox-secret # hosts: - # - chart-example.local \ No newline at end of file + # - chart-example.local +livenessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 +readinessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 + diff --git a/helm/ph-ee-engine/connector-mpesa/templates/deployment.yaml b/helm/ph-ee-engine/connector-mpesa/templates/deployment.yaml index edfd6a85c..fdcce07d0 100644 --- a/helm/ph-ee-engine/connector-mpesa/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-mpesa/templates/deployment.yaml @@ -30,14 +30,14 @@ spec: httpGet: path: /actuator/health/liveness port: 8080 - initialDelaySeconds: 20 - periodSeconds: 30 + initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.livenessProbe.periodSeconds}} readinessProbe: httpGet: path: /actuator/health/readiness port: 8080 - initialDelaySeconds: 20 - periodSeconds: 30 + initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.readinessProbe.periodSeconds}} resources: limits: memory: "{{ .Values.limits.memory }}" @@ -132,4 +132,4 @@ spec: envFrom: {{ toYaml ( .Values.envFrom | default .Values.deployment.envFrom ) | nindent 12 }} securityContext: {{ toYaml ( .Values.podSecurityContext | default .Values.deployment.securityContext ) | nindent 12 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/ph-ee-engine/connector-mpesa/values.yaml b/helm/ph-ee-engine/connector-mpesa/values.yaml index 51d82221b..d53c68b49 100644 --- a/helm/ph-ee-engine/connector-mpesa/values.yaml +++ b/helm/ph-ee-engine/connector-mpesa/values.yaml @@ -78,4 +78,10 @@ deployment: annotations: deployTime: "{{ .Values.deployTime }}" skip: - enabled: false \ No newline at end of file + enabled: false +livenessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 +readinessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 diff --git a/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml b/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml index ccb530337..3dbf62dff 100644 --- a/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml @@ -37,14 +37,14 @@ spec: httpGet: path: /actuator/health/liveness port: 8080 - initialDelaySeconds: 20 - periodSeconds: 30 + initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.livenessProbe.periodSeconds}} readinessProbe: httpGet: path: /actuator/health/readiness port: 8080 - initialDelaySeconds: 20 - periodSeconds: 30 + initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.readinessProbe.periodSeconds}} env: - name: "SPRING_PROFILES_ACTIVE" value: "{{ .Values.global.SPRING_PROFILES_ACTIVE }}" @@ -70,4 +70,4 @@ spec: envFrom: {{ toYaml ( .Values.envFrom | default .Values.deployment.envFrom ) | nindent 12 }} securityContext: {{ toYaml ( .Values.podSecurityContext | default .Values.deployment.securityContext ) | nindent 12 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/ph-ee-engine/connector-notifications/values.yaml b/helm/ph-ee-engine/connector-notifications/values.yaml index 85cc8db3b..d358aaf70 100644 --- a/helm/ph-ee-engine/connector-notifications/values.yaml +++ b/helm/ph-ee-engine/connector-notifications/values.yaml @@ -42,4 +42,11 @@ ingress: deployment: apiVersion: "apps/v1" annotations: - deployTime: "{{ .Values.deployTime }}" \ No newline at end of file + deployTime: "{{ .Values.deployTime }}" + +livenessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 +readinessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 diff --git a/helm/ph-ee-engine/message-gateway/templates/deployment.yaml b/helm/ph-ee-engine/message-gateway/templates/deployment.yaml index 59c80ff0a..b0eabc61f 100644 --- a/helm/ph-ee-engine/message-gateway/templates/deployment.yaml +++ b/helm/ph-ee-engine/message-gateway/templates/deployment.yaml @@ -37,14 +37,14 @@ spec: httpGet: path: /actuator/health/liveness port: 9191 - initialDelaySeconds: 120 - periodSeconds: 30 + initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.livenessProbe.periodSeconds}} readinessProbe: httpGet: path: /actuator/health/readiness port: 9191 - initialDelaySeconds: 120 - periodSeconds: 30 + initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.readinessProbe.periodSeconds}} env: - name: "SPRING_DATASOURCE_URL" @@ -102,4 +102,4 @@ spec: - name: ph-ee-config configMap: name: ph-ee-config -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/ph-ee-engine/message-gateway/values.yaml b/helm/ph-ee-engine/message-gateway/values.yaml index 318347411..ee263fe4b 100644 --- a/helm/ph-ee-engine/message-gateway/values.yaml +++ b/helm/ph-ee-engine/message-gateway/values.yaml @@ -47,4 +47,11 @@ deployment: operations_app: datasource: - host: "operationsmysql" \ No newline at end of file + host: "operationsmysql" + +livenessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 +readinessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 diff --git a/helm/ph-ee-engine/operations-app/templates/deployment.yaml b/helm/ph-ee-engine/operations-app/templates/deployment.yaml index b146369fe..cabe671ec 100644 --- a/helm/ph-ee-engine/operations-app/templates/deployment.yaml +++ b/helm/ph-ee-engine/operations-app/templates/deployment.yaml @@ -31,8 +31,9 @@ spec: httpGet: path: /oauth/token_key port: 5000 - periodSeconds: 180 timeoutSeconds: 5 + initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.readinessProbe.periodSeconds}} resources: limits: memory: "{{ .Values.limits.memory }}" diff --git a/helm/ph-ee-engine/operations-app/values.yaml b/helm/ph-ee-engine/operations-app/values.yaml index 80e2d47d5..b1b13f4b7 100644 --- a/helm/ph-ee-engine/operations-app/values.yaml +++ b/helm/ph-ee-engine/operations-app/values.yaml @@ -43,3 +43,10 @@ deployment: apiVersion: "apps/v1" annotations: deployTime: "{{ .Values.deployTime }}" + +livenessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 +readinessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 9212adfbf..cff7e6059 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -788,7 +788,7 @@ mpesa: httpGet: path: /actuator/health/readiness port: 9191 - initialDelaySeconds: 120 + initialDelaySeconds: 180 periodSeconds: 30 failureThreshold: 3 timeoutSeconds: 5 @@ -965,7 +965,7 @@ paygops_connector: httpGet: path: /actuator/health/readiness port: 9191 - initialDelaySeconds: 120 + initialDelaySeconds: 180 periodSeconds: 30 failureThreshold: 3 timeoutSeconds: 5 @@ -1422,6 +1422,8 @@ mockpayment: requests: memory: "256M" cpu: "100m" + readinessProbe: + initialDelaySeconds: 180 deployment: annotations: {} initialDelaySeconds: 180 @@ -2108,7 +2110,8 @@ vouchers: hostname: "http://ph-ee-operations-app:80" endpoints: transfers: "/api/v1/transfers?size=1&page=0" - initialDelaySeconds: 180 + readinessProbe: + initialDelaySeconds: 180 billPay: enabled: false diff --git a/helm/ph-ee-engine/vouchers/templates/deployment.yaml b/helm/ph-ee-engine/vouchers/templates/deployment.yaml index defa45f79..8f95edb54 100644 --- a/helm/ph-ee-engine/vouchers/templates/deployment.yaml +++ b/helm/ph-ee-engine/vouchers/templates/deployment.yaml @@ -37,14 +37,14 @@ spec: httpGet: path: /actuator/health/liveness port: 8080 - initialDelaySeconds: 20 - periodSeconds: 30 + initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.livenessProbe.periodSeconds}} readinessProbe: httpGet: path: /actuator/health/readiness port: 8080 - initialDelaySeconds: 20 - periodSeconds: 30 + initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.readinessProbe.periodSeconds}} env: - name: "SPRING_PROFILES_ACTIVE" diff --git a/helm/ph-ee-engine/vouchers/values.yaml b/helm/ph-ee-engine/vouchers/values.yaml index c5122bc47..bf6f65630 100644 --- a/helm/ph-ee-engine/vouchers/values.yaml +++ b/helm/ph-ee-engine/vouchers/values.yaml @@ -72,3 +72,9 @@ deployment: apiVersion: "apps/v1" annotations: deployTime: "{{ .Values.deployTime }}" +livenessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 +readinessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 From 21b8a1694c7a2970dfef551fd54f7b9a9a3ccadc Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 23 Apr 2024 16:35:39 +0530 Subject: [PATCH 33/85] increase readiness probe --- helm/ph-ee-engine/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index cff7e6059..9122c701b 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -117,7 +117,7 @@ camunda-platform: replicas: 1 logLevel: warn readinessProbe: - initialDelaySeconds: 60 + initialDelaySeconds: 180 env: - name: ZEEBE_GATEWAY_THREADS_MANAGEMENTTHREADS value: "4" From 3a39b97e001eaeb51b41982a678cea1ae2537200 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 23 Apr 2024 18:26:40 +0530 Subject: [PATCH 34/85] test --- helm/g2p-sandbox/values.yaml | 4 ++-- .../account-mapper/templates/deployment.yaml | 8 ++++---- .../identity-account-mapper/account-mapper/values.yaml | 6 ++++++ helm/ph-ee-engine/values.yaml | 10 +++++----- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 3ec3840ed..2127cef32 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -594,12 +594,12 @@ account_mapper: hostname: "identity-mapper.sandbox.mifos.io" LOGGING_LEVEL_ROOT: INFO limits: - cpu: "100m" + cpu: "150m" memory: "384M" requests: cpu: "100m" memory: "256M" - initialDelaySeconds: 180 + ingress: enabled: false pathtype: Prefix diff --git a/helm/identity-account-mapper/account-mapper/templates/deployment.yaml b/helm/identity-account-mapper/account-mapper/templates/deployment.yaml index 2db4faf69..8b0f3dbd6 100644 --- a/helm/identity-account-mapper/account-mapper/templates/deployment.yaml +++ b/helm/identity-account-mapper/account-mapper/templates/deployment.yaml @@ -37,14 +37,14 @@ spec: httpGet: path: /actuator/health/liveness port: 8080 - initialDelaySeconds: 20 - periodSeconds: 30 + initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.livenessProbe.periodSeconds}} readinessProbe: httpGet: path: /actuator/health/readiness port: 8080 - initialDelaySeconds: 20 - periodSeconds: 30 + initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}} + periodSeconds: {{.Values.readinessProbe.periodSeconds}} env: - name: "ZEEBE_BROKER_CONTACTPOINT" value: "{{ .Release.Name }}-zeebe-gateway:26500" diff --git a/helm/identity-account-mapper/account-mapper/values.yaml b/helm/identity-account-mapper/account-mapper/values.yaml index 0ba156821..e2c16c280 100644 --- a/helm/identity-account-mapper/account-mapper/values.yaml +++ b/helm/identity-account-mapper/account-mapper/values.yaml @@ -59,3 +59,9 @@ deployment: apiVersion: "apps/v1" annotations: deployTime: "{{ .Values.deployTime }}" +livenessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 +readinessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 9122c701b..b03a7d58c 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -173,10 +173,10 @@ elasticsearch: initialDelaySeconds: 180 resources: limits: - cpu: 300m + cpu: 500m memory: 512M requests: - cpu: 200m + cpu: 300m memory: 512M @@ -290,7 +290,7 @@ channel: privileged: false limits: memory: "384M" - cpu: "100m" + cpu: "150m" requests: memory: "256M" cpu: "100m" @@ -348,7 +348,7 @@ operationsmysql: rootPassword: "4ET6ywqlGt" primary: persistence: - size: 2Gi + size: 1Gi readinessProbe: initialDelaySeconds: 180 initdbScripts: @@ -2065,7 +2065,7 @@ vouchers: replicas: 1 image: docker.io/openmf/ph-ee-vouchers:v1.1.0 limits: - cpu: "100m" + cpu: "150m" memory: "384M" requests: cpu: "100m" From 8376d1dd775a7270fee06052a913730e998300a0 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 23 Apr 2024 18:35:51 +0530 Subject: [PATCH 35/85] account mapper readiness 180 --- helm/g2p-sandbox/values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 2127cef32..d974f185a 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -599,6 +599,12 @@ account_mapper: requests: cpu: "100m" memory: "256M" + livenessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 + readinessProbe: + initialDelaySeconds: 180 + periodSeconds: 30 ingress: enabled: false From b7c2cbfeee1c724943e97e9b80d4e2bf24beeafb Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 26 Apr 2024 12:30:09 +0530 Subject: [PATCH 36/85] test it with 1Gi --- .circleci/config.yml | 85 ++++++++------- helm/g2p-sandbox/values.yaml | 2 +- .../account-mapper/templates/deployment.yaml | 5 + helm/identity-account-mapper/values.yaml | 2 +- .../templates/deployment.yaml | 7 +- .../templates/deployment.yaml | 5 + .../connector-bulk/templates/deployment.yaml | 5 + .../templates/deployment.yaml | 10 ++ .../connector-crm/templates/deployment.yaml | 5 + .../connector-gsma/templates/deployment.yaml | 7 +- .../templates/deployment.yaml | 5 + .../templates/deployment.yaml | 7 +- .../connector-mpesa/templates/deployment.yaml | 5 + .../templates/deployment.yaml | 5 + .../templates/deployment.yaml | 5 + .../connector-slcb/templates/deployment.yaml | 7 +- .../message-gateway/templates/deployment.yaml | 5 + .../operations-app/templates/deployment.yaml | 5 + .../templates/deployment.yaml | 7 +- .../templates/deployment.yaml | 5 + helm/ph-ee-engine/values.yaml | 102 +++++++++--------- .../vouchers/templates/deployment.yaml | 5 + .../zeebe-ops/templates/deployment.yaml | 5 + 23 files changed, 201 insertions(+), 100 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cc2201e88..831fac434 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -282,7 +282,7 @@ jobs: curl -u minikube:minikube http://localhost:8080 curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok - ngrok config add-authtoken 2XZrGubibPqLSX5y16wCIAVMvKY_5QnDM2TPcqrSxqNPmD7j5 + ngrok config add-authtoken $AUTH_TOKEN echo "web_addr: $LOCAL_PORT" >> /home/circleci/.config/ngrok/ngrok.yml ngrok http 8080 > /dev/null & @@ -314,7 +314,22 @@ jobs: sudo apt-get install helm kubectl create namespace paymenthub || echo namespace already exists - + # ----------------------Post-Installation-Steps-starts--------------------------- + #ES and Kibana secret creation + git clone -b 7.17 https://github.com/elastic/helm-charts.git elastic/helm-charts + cd elastic/helm-charts/elasticsearch/examples/security/ + make secrets || echo "elastic-secrets" already exists + git clone -b 7.17 https://github.com/elastic/helm-charts.git elastic/helm-charts + cd elastic/helm-charts/kibana/examples/security/ + make secrets || echo "kibana-secrets" already exists + kubectl get secret elastic-certificate-crt -n default -o yaml | sed 's/namespace: default/namespace: paymenthub/' | kubectl create -f - + kubectl get secret elastic-certificate-pem -n default -o yaml | sed 's/namespace: default/namespace: paymenthub/' | kubectl create -f - + kubectl get secret elastic-certificates -n default -o yaml | sed 's/namespace: default/namespace: paymenthub/' | kubectl create -f - + kubectl get secret elastic-credentials -n default -o yaml | sed 's/namespace: default/namespace: paymenthub/' | kubectl create -f - + kubectl get secret kibana -n default -o yaml | sed 's/namespace: default/namespace: paymenthub/' | kubectl create -f - + kubectl get secrets -n paymenthub + echo ---------secrets created-------- + - run: name: fetch docker images and helm upgrade environment: @@ -398,45 +413,35 @@ jobs: helm repo update echo "helm upgrade --install ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE}" echo helm chart install starts - helm upgrade --install --timeout=50m --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false - echo --------------------helm upgrade is done--------------------- - - # ----------------------Post-Installation-Steps-starts--------------------------- - # #ES and Kibana secret creation - # git clone -b 7.17 https://github.com/elastic/helm-charts.git elastic/helm-charts - # cd elastic/helm-charts/elasticsearch/examples/security/ - # make secrets || echo "elastic-secrets" already exists - # git clone -b 7.17 https://github.com/elastic/helm-charts.git elastic/helm-charts - # cd elastic/helm-charts/kibana/examples/security/ - # make secrets || echo "kibana-secrets" already exists - # kubectl get secret elastic-certificate-crt -n default -o yaml | sed 's/namespace: default/namespace: paymenthub/' | kubectl create -f - - # kubectl get secret elastic-certificate-pem -n default -o yaml | sed 's/namespace: default/namespace: paymenthub/' | kubectl create -f - - # kubectl get secret elastic-certificates -n default -o yaml | sed 's/namespace: default/namespace: paymenthub/' | kubectl create -f - - # kubectl get secret elastic-credentials -n default -o yaml | sed 's/namespace: default/namespace: paymenthub/' | kubectl create -f - - # kubectl get secret kibana -n default -o yaml | sed 's/namespace: default/namespace: paymenthub/' | kubectl create -f - - # kubectl get secrets -n paymenthub - # echo ---------secrets created-------- + helm upgrade --install --timeout=50m --set account_mapper.enabled=false --set ph-ee-engine.ph_ee_connector_ams_mifos.enabled=false --set ph-ee-engine.channel.enabled=false --set ph-ee-engine.crm.enabled=false --set ph-ee-engine.billPay.enabled=false --set ph-ee-engine.operations_app.enabled=false --set ph-ee-engine.connector_bulk.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + echo --------------------helm upgrade in Phase 1 done--------------------- + sleep 2m 30s; + helm upgrade --install --timeout=50m --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + echo --------------------helm upgrade in Phase 2 done--------------------- + sleep 3m 30s; + helm upgrade --install --timeout=50m --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + echo --------------------helm upgrade in Phase 3 done--------------------- + sleep 5m; + #insatll netcat + sudo apt install -y netcat + check_count=0 + until ((check_count==20)) || nc -vz ph-ee-zeebe-ops 80; do + echo "Waiting for zeebe-ops service"; + sleep 5; + check_count=$(($check_count + 1)); + done; + echo ------zeebe-ops service available----------- + # until nc -vz ph-ee-zeebe-ops 80; do echo "Waiting for zeebe-ops service"; sleep 2; done; - # #insatll netcat - # sudo apt install -y netcat - # check_count=0 - # until ((check_count==20)) || nc -vz ph-ee-zeebe-ops 80; do - # echo "Waiting for zeebe-ops service"; - # sleep 5; - # check_count=$(($check_count + 1)); - # done; - # echo ------zeebe-ops service available----------- - # # until nc -vz ph-ee-zeebe-ops 80; do echo "Waiting for zeebe-ops service"; sleep 2; done; - - # #Deploy BPMN - # kubectl port-forward service/ph-ee-zeebe-ops 5000:80 -n paymenthub & #portforward zeebe-ops &' - # git clone https://github.com/openMF/ph-ee-env-labs.git openMF/ph-ee-env-labs - # cd openMF/ph-ee-env-labs/orchestration - # ls - # sed -i "/HOST=/c\HOST=http://localhost:5000/zeebe/upload" deployBpmn.sh - # cat deployBpmn.sh - # cd .. - # sh orchestration/deployBpmn.sh || echo 'deploy Bpmn done' + #Deploy BPMN + kubectl port-forward service/ph-ee-zeebe-ops 5000:80 -n paymenthub & #portforward zeebe-ops &' + git clone https://github.com/openMF/ph-ee-env-labs.git openMF/ph-ee-env-labs + cd openMF/ph-ee-env-labs/orchestration + ls + sed -i "/HOST=/c\HOST=http://localhost:5000/zeebe/upload" deployBpmn.sh + cat deployBpmn.sh + cd .. + sh orchestration/deployBpmn.sh || echo 'deploy Bpmn done' #------------------Post-Installation-Steps-ends------------------------------- sleep 70m 30s & - run: diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index d974f185a..d09c7e52f 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -594,7 +594,7 @@ account_mapper: hostname: "identity-mapper.sandbox.mifos.io" LOGGING_LEVEL_ROOT: INFO limits: - cpu: "150m" + cpu: "400m" memory: "384M" requests: cpu: "100m" diff --git a/helm/identity-account-mapper/account-mapper/templates/deployment.yaml b/helm/identity-account-mapper/account-mapper/templates/deployment.yaml index 8b0f3dbd6..d3b2fc471 100644 --- a/helm/identity-account-mapper/account-mapper/templates/deployment.yaml +++ b/helm/identity-account-mapper/account-mapper/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that operationsmysql service is up and running before starting this pod + - name: check-operationsmysql-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz operationsmysql 3306; do echo "Waiting for operationsmysql service"; sleep 2; done;' ] containers: - name: ph-ee-identity-account-mapper image: "{{ .Values.image}}" diff --git a/helm/identity-account-mapper/values.yaml b/helm/identity-account-mapper/values.yaml index e340e5457..420d709c8 100644 --- a/helm/identity-account-mapper/values.yaml +++ b/helm/identity-account-mapper/values.yaml @@ -107,7 +107,7 @@ elasticsearch: storageClassName: "gp2" resources: requests: - storage: 5Gi + storage: 10Gi kibana: enabled: true diff --git a/helm/ph-ee-engine/connector-ams-mifos/templates/deployment.yaml b/helm/ph-ee-engine/connector-ams-mifos/templates/deployment.yaml index 1d53441f0..6054d747d 100644 --- a/helm/ph-ee-engine/connector-ams-mifos/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-ams-mifos/templates/deployment.yaml @@ -19,7 +19,12 @@ spec: {{- if .Values.deployment.annotations }} {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} - spec: + spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] affinity: {{ toYaml .Values.deployment.affinity | nindent 8 }} nodeSelector: {{ toYaml .Values.deployment.nodeSelector | nindent 8 }} tolerations: {{ toYaml ( .Values.tolerations | default .Values.deployment.tolerations ) | nindent 8 }} diff --git a/helm/ph-ee-engine/connector-bill-pay/templates/deployment.yaml b/helm/ph-ee-engine/connector-bill-pay/templates/deployment.yaml index 577275da5..0cbbab377 100644 --- a/helm/ph-ee-engine/connector-bill-pay/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-bill-pay/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }} containers: - name: ph-ee-connector-bill-pay diff --git a/helm/ph-ee-engine/connector-bulk/templates/deployment.yaml b/helm/ph-ee-engine/connector-bulk/templates/deployment.yaml index e5ef7003a..7699c4bcb 100644 --- a/helm/ph-ee-engine/connector-bulk/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-bulk/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }} containers: - name: ph-ee-connector-bulk diff --git a/helm/ph-ee-engine/connector-channel/templates/deployment.yaml b/helm/ph-ee-engine/connector-channel/templates/deployment.yaml index c598ef51d..5b965cbff 100644 --- a/helm/ph-ee-engine/connector-channel/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-channel/templates/deployment.yaml @@ -20,6 +20,16 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] + #During this Pod's initialization, check that redis is up and running before starting this pod + - name: check-redis-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-redis-master 6379; do echo "Waiting for redis-master service"; sleep 2; done;' ] + terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }} containers: - name: ph-ee-connector-channel diff --git a/helm/ph-ee-engine/connector-crm/templates/deployment.yaml b/helm/ph-ee-engine/connector-crm/templates/deployment.yaml index ed2fe144c..44d19f16a 100644 --- a/helm/ph-ee-engine/connector-crm/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-crm/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }} containers: - name: ph-ee-connector-crm diff --git a/helm/ph-ee-engine/connector-gsma/templates/deployment.yaml b/helm/ph-ee-engine/connector-gsma/templates/deployment.yaml index 74a117a14..77d3faf1f 100644 --- a/helm/ph-ee-engine/connector-gsma/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-gsma/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] containers: - name: "ph-ee-connector-gsma-mm" image: "{{ .Values.image }}" @@ -50,4 +55,4 @@ spec: - name: ph-ee-config configMap: name: ph-ee-config -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/ph-ee-engine/connector-mock-payment-schema/templates/deployment.yaml b/helm/ph-ee-engine/connector-mock-payment-schema/templates/deployment.yaml index 196d30f81..80ae08c51 100644 --- a/helm/ph-ee-engine/connector-mock-payment-schema/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-mock-payment-schema/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }} containers: - name: ph-ee-connector-mock-payment-schema diff --git a/helm/ph-ee-engine/connector-mojaloop/templates/deployment.yaml b/helm/ph-ee-engine/connector-mojaloop/templates/deployment.yaml index 1dccf8eb5..25b59db12 100644 --- a/helm/ph-ee-engine/connector-mojaloop/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-mojaloop/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] containers: - name: ph-ee-connector-mojaloop-java image: "{{ .Values.image }}" @@ -88,4 +93,4 @@ spec: - name: ph-ee-config configMap: name: ph-ee-config -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/ph-ee-engine/connector-mpesa/templates/deployment.yaml b/helm/ph-ee-engine/connector-mpesa/templates/deployment.yaml index fdcce07d0..c9e611b32 100644 --- a/helm/ph-ee-engine/connector-mpesa/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-mpesa/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] containers: - name: ph-ee-connector-mpesa image: "{{ .Values.image }}" diff --git a/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml b/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml index 3dbf62dff..f4ea5a0b5 100644 --- a/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] containers: - name: "ph-ee-connector-notifications" image: "{{ .Values.image }}" diff --git a/helm/ph-ee-engine/connector-ph-ee-bulk/templates/deployment.yaml b/helm/ph-ee-engine/connector-ph-ee-bulk/templates/deployment.yaml index d3912b3cf..4c64525d7 100644 --- a/helm/ph-ee-engine/connector-ph-ee-bulk/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-ph-ee-bulk/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] containers: - name: ph-ee-connector image: "{{ .Values.image }}" diff --git a/helm/ph-ee-engine/connector-slcb/templates/deployment.yaml b/helm/ph-ee-engine/connector-slcb/templates/deployment.yaml index 36935f57b..dda465858 100644 --- a/helm/ph-ee-engine/connector-slcb/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-slcb/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] containers: - name: ph-ee-connector-slcb-mm image: "{{ .Values.image }}" @@ -102,4 +107,4 @@ spec: - name: ph-ee-config configMap: name: ph-ee-config -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/ph-ee-engine/message-gateway/templates/deployment.yaml b/helm/ph-ee-engine/message-gateway/templates/deployment.yaml index b0eabc61f..e91547f74 100644 --- a/helm/ph-ee-engine/message-gateway/templates/deployment.yaml +++ b/helm/ph-ee-engine/message-gateway/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] containers: - name: message-gateway image: "{{ .Values.image }}" diff --git a/helm/ph-ee-engine/operations-app/templates/deployment.yaml b/helm/ph-ee-engine/operations-app/templates/deployment.yaml index cabe671ec..98ded4ae2 100644 --- a/helm/ph-ee-engine/operations-app/templates/deployment.yaml +++ b/helm/ph-ee-engine/operations-app/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that operationsmysql service is up and running before starting this pod + - name: check-operationsmysql-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz operationsmysql 3306; do echo "Waiting for operationsmysql service"; sleep 2; done;' ] terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }} containers: - name: ph-ee-operations-app diff --git a/helm/ph-ee-engine/operations-importer-es/templates/deployment.yaml b/helm/ph-ee-engine/operations-importer-es/templates/deployment.yaml index 9201b695f..c821c0f79 100644 --- a/helm/ph-ee-engine/operations-importer-es/templates/deployment.yaml +++ b/helm/ph-ee-engine/operations-importer-es/templates/deployment.yaml @@ -16,6 +16,11 @@ spec: labels: app: ph-ee-importer-es spec: + initContainers: + #During this Pod's initialization, check that ph-ee-elasticsearch service is up and running before starting this pod + - name: check-ph-ee-elasticsearch-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz ph-ee-elasticsearch 9200; do echo "Waiting for ph-ee-elasticsearch service"; sleep 2; done;' ] containers: - name: ph-ee-importer-es image: "{{ .Values.image }}" @@ -121,4 +126,4 @@ spec: securityContext: {{ toYaml ( .Values.podSecurityContext | default .Values.deployment.securityContext ) | nindent 12 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/ph-ee-engine/operations-importer-rdbms/templates/deployment.yaml b/helm/ph-ee-engine/operations-importer-rdbms/templates/deployment.yaml index 0d6dbfa15..92c5d0203 100644 --- a/helm/ph-ee-engine/operations-importer-rdbms/templates/deployment.yaml +++ b/helm/ph-ee-engine/operations-importer-rdbms/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that operationsmysql service is up and running before starting this pod + - name: check-operationsmysql-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz operationsmysql 3306; do echo "Waiting for operationsmysql service"; sleep 2; done;' ] containers: - name: ph-ee-importer-rdbms image: "{{ .Values.image }}" diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index b03a7d58c..bc93fbe35 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -173,11 +173,11 @@ elasticsearch: initialDelaySeconds: 180 resources: limits: - cpu: 500m - memory: 512M + cpu: "1000m" + memory: "1024M" requests: - cpu: 300m - memory: 512M + cpu: "100m" + memory: "786M" kibana: @@ -399,13 +399,12 @@ ph_ee_connector_ams_mifos: securityContext: runAsUser: 0 privileged: false - resources: - limits: - memory: "384M" - cpu: "100m" - requests: - memory: "256M" - cpu: "100m" + limits: + memory: "384M" + cpu: "150m" + requests: + memory: "256M" + cpu: "100m" # Enabling this will publicly expose your ams-mifos instance. # Only enable this if you have security enabled on your cluster ingress: @@ -502,7 +501,7 @@ ph_ee_connector_mojaloop: privileged: false limits: memory: "384M" - cpu: "100m" + cpu: "150m" requests: memory: "256M" cpu: "100m" @@ -594,7 +593,7 @@ operations_app: privileged: false limits: memory: "384M" - cpu: "100m" + cpu: "200m" requests: memory: "256M" cpu: "100m" @@ -816,13 +815,13 @@ mpesa: securityContext: runAsUser: 0 privileged: false - resources: + resources: limits: memory: "512M" cpu: "150m" requests: memory: "512M" - cpu: "100m" + cpu: "100m" # Enabling this will publicly expose your mpesa instance. # Only enable this if you have security enabled on your cluster ingress: @@ -908,13 +907,13 @@ roster_connector: securityContext: runAsUser: 0 privileged: false - resources: + resources: limits: memory: "512M" cpu: "150m" requests: memory: "512M" - cpu: "100m" + cpu: "100m" deployment: annotations: {} affinity: {} @@ -1272,10 +1271,10 @@ zeebe_ops: privileged: false limits: memory: "384M" - cpu: "100m" + cpu: "300m" requests: memory: "384M" - cpu: "100m" + cpu: "150m" # Enabling this will publicly expose your zeebe_ops instance. # Only enable this if you have security enabled on your cluster ingress: @@ -1400,7 +1399,7 @@ importer_es: privileged: false limits: memory: "512M" - cpu: "150m" + cpu: "400m" requests: memory: "512M" cpu: "100m" @@ -1418,15 +1417,16 @@ mockpayment: percentage: "0" limits: memory: "512M" - cpu: "100m" + cpu: "250m" requests: memory: "256M" - cpu: "100m" + cpu: "150m" + livenessProbe: + initialDelaySeconds: 180 readinessProbe: initialDelaySeconds: 180 deployment: annotations: {} - initialDelaySeconds: 180 kafka: @@ -1445,14 +1445,14 @@ kafka: persistence: size: "1Gi" readinessProbe: - initialDelaySeconds: 180 - resources: - limits: - memory: "1400Mi" - cpu: "300m" - requests: - memory: "512Mi" - cpu: "250m" + initialDelaySeconds: 5 +# resources: +# limits: +# memory: "1400Mi" +# cpu: "1400Mi" +# requests: +# memory: "512Mi" +# cpu: "350m" listeners: client: @@ -1534,13 +1534,12 @@ importer_rdbms: securityContext: runAsUser: 0 privileged: false - resources: - limits: - memory: "512M" - cpu: "100m" - requests: - memory: "512M" - cpu: "100m" + limits: + memory: "384M" + cpu: "250m" + requests: + memory: "256M" + cpu: "150m" deployment: annotations: {} affinity: {} @@ -1559,7 +1558,7 @@ importer_rdbms: resources: limits: memory: "512M" - cpu: "150m" + cpu: "200m" requests: memory: "512M" cpu: "100m" @@ -1652,13 +1651,12 @@ connector_bulk: securityContext: runAsUser: 0 privileged: false - resources: - limits: - memory: "512M" - cpu: "150m" - requests: - memory: "512M" - cpu: "100m" + limits: + memory: "384M" + cpu: "150m" + requests: + memory: "256M" + cpu: "100m" service: annotations: {} # Enabling this will publicly expose your connector_bulk instance. @@ -1724,7 +1722,7 @@ ph_ee_connector_gsma: privileged: false limits: memory: "256M" - cpu: "100m" + cpu: "150m" requests: memory: "256M" cpu: "100m" @@ -1972,8 +1970,6 @@ redis: readinessProbe: initialDelaySeconds: 180 replica: - persistence: - size: "1Gi" replicaCount: 0 volumeClaimTemplate: storageClassName: "gp2" @@ -2065,10 +2061,10 @@ vouchers: replicas: 1 image: docker.io/openmf/ph-ee-vouchers:v1.1.0 limits: - cpu: "150m" + cpu: "250m" memory: "384M" requests: - cpu: "100m" + cpu: "150m" memory: "384M" ingress: enabled: true @@ -2157,7 +2153,7 @@ billPay: privileged: false limits: memory: "256M" - cpu: "100m" + cpu: "150m" requests: memory: "256M" cpu: "100m" @@ -2227,7 +2223,7 @@ crm: limits: memory: "256M" - cpu: "100m" + cpu: "150m" requests: memory: "256M" cpu: "100m" diff --git a/helm/ph-ee-engine/vouchers/templates/deployment.yaml b/helm/ph-ee-engine/vouchers/templates/deployment.yaml index 8f95edb54..94a7ffbe0 100644 --- a/helm/ph-ee-engine/vouchers/templates/deployment.yaml +++ b/helm/ph-ee-engine/vouchers/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] containers: - name: ph-ee-vouchers image: "{{ .Values.image }}" diff --git a/helm/ph-ee-engine/zeebe-ops/templates/deployment.yaml b/helm/ph-ee-engine/zeebe-ops/templates/deployment.yaml index b42a8610c..7e808030f 100644 --- a/helm/ph-ee-engine/zeebe-ops/templates/deployment.yaml +++ b/helm/ph-ee-engine/zeebe-ops/templates/deployment.yaml @@ -20,6 +20,11 @@ spec: {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: + initContainers: + #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod + - name: check-zeebe-gateway-ready + image: busybox:latest + command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ] containers: - name: ph-ee-zeebe-ops image: "{{ .Values.image }}" From 54ac20c4e6911a426cd4c1fdec8b24720828b6f8 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 14 May 2024 13:04:07 +0530 Subject: [PATCH 37/85] test --- helm/ph-ee-engine/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index bc93fbe35..7a04d6510 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1929,11 +1929,11 @@ integration_test: imageTag: v1.4.0-rc.1 imagePullPolicy: "Never" limits: - cpu: "100m" - memory: "3Gi" + cpu: "200m" + memory: "512Gi" requests: cpu: "100m" - memory: "2Gi" + memory: "512Gi" operations_app: contactpoint: "http://ph-ee-operations-app:80" bulk_processor: From eed1a975a116e45d54dad87ed1d66c13ca95632b Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 14 May 2024 13:13:46 +0530 Subject: [PATCH 38/85] yse --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 831fac434..8200032b8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -282,7 +282,7 @@ jobs: curl -u minikube:minikube http://localhost:8080 curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok - ngrok config add-authtoken $AUTH_TOKEN + ngrok config add-authtoken 2Uer2m6U4JxqumrR8vz9KFa3AXT_4TkQEjFZzVk4VJ65j1V4U echo "web_addr: $LOCAL_PORT" >> /home/circleci/.config/ngrok/ngrok.yml ngrok http 8080 > /dev/null & From 1a205fb489a4b9538b804c6a18692ef0fa39b3bd Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 14 May 2024 13:33:04 +0530 Subject: [PATCH 39/85] test --- helm/g2p-sandbox/values.yaml | 2 +- helm/ph-ee-engine/values.yaml | 31 +++++++++++++++++++------------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index d09c7e52f..619c910e6 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -71,7 +71,7 @@ ph-ee-engine: storageClassName: "gp2" resources: requests: - storage: 1Gi + storage: 5Gi kibana: enabled: true diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 7a04d6510..10a4e4685 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -102,11 +102,11 @@ camunda-platform: replicationFactor: "1" cpuThreadCount: "2" ioThreadCount: "2" - pvcSize: "1Gi" + pvcSize: "5Gi" resources: limits: - cpu: "150m" + cpu: "250m" memory: "1000Mi" requests: cpu: "100m" @@ -348,7 +348,7 @@ operationsmysql: rootPassword: "4ET6ywqlGt" primary: persistence: - size: 1Gi + size: 3Gi readinessProbe: initialDelaySeconds: 180 initdbScripts: @@ -1443,16 +1443,16 @@ kafka: controller: replicaCount: 1 persistence: - size: "1Gi" + size: "4Gi" readinessProbe: initialDelaySeconds: 5 -# resources: -# limits: -# memory: "1400Mi" -# cpu: "1400Mi" -# requests: -# memory: "512Mi" -# cpu: "350m" + resources: + limits: + memory: "1000Mi" + cpu: "1400Mi" + requests: + memory: "512Mi" + cpu: "350m" listeners: client: @@ -1965,8 +1965,15 @@ integration_test: redis: enabled: true master: + resources: + limits: + cpu: "200m" + memory: "384M" + requests: + cpu: "100m" + memory: "384M" persistence: - size: "1Gi" + size: "3Gi" readinessProbe: initialDelaySeconds: 180 replica: From ba05f0cc08b22387711bf9fbd5d4d125b8723ddd Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 14 May 2024 15:41:23 +0530 Subject: [PATCH 40/85] TEST --- .circleci/config.yml | 2 +- helm/g2p-sandbox/values.yaml | 11 ++++++++++- helm/ph-ee-engine/values.yaml | 6 +++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8200032b8..a032528e5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,7 +230,7 @@ jobs: echo minikube waiting #minikube config set cpus 4 #minikube config set memory 15721 - minikube start --extra-config=kubelet.max-pods=60 + minikube start --extra-config=kubelet.max-pods=60 --cpus max --memory max --disk-size 50g echo "Minikube started-----------------------------------------------------" # To check the allocated values diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 619c910e6..fb2f4ce3a 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -569,9 +569,18 @@ ph-ee-engine: region: "ap-south-1" access_key: "aws-access-key" secret_key: "aws-secret-key" - hostname: "connector.sandbox.mifos.io" + hostname: "connector1.sandbox.mifos.io" ingress: enabled: true + hosts: + - host: connector1.sandbox.mifos.io + paths: + - path: "/" + backend: + service: + name: ph-ee-connector + port: + number: 80 annotations: nginx.ingress.kubernetes.io/access-control-allow-origin: 'true' nginx.ingress.kubernetes.io/cors-allow-methods: PUT, GET, POST, OPTIONS, DELETE diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 10a4e4685..50e6b9666 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1859,7 +1859,7 @@ ph-ee-connector: tls: - secretName: sandbox-secret hosts: - - host: connector.sandbox.mifos.io + - host: connector1.sandbox.mifos.io paths: - path: "/" backend: @@ -2259,11 +2259,11 @@ minio: fullnameOverride: "minio" resources: requests: - memory: 256Mi + memory: 150Mi replicas: 1 persistence: enabled: true - size: 1Gi + size: 512Mi mode: standalone rootUser: root rootPassword: password From e3100483decab98777bbc8d59b51a0b5e8578652 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 14 May 2024 16:00:20 +0530 Subject: [PATCH 41/85] test --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a032528e5..36be07e68 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -329,6 +329,8 @@ jobs: kubectl get secret kibana -n default -o yaml | sed 's/namespace: default/namespace: paymenthub/' | kubectl create -f - kubectl get secrets -n paymenthub echo ---------secrets created-------- + minikube ssh -- free -m + echo ------------MEMORY CHECK ----------- - run: name: fetch docker images and helm upgrade From deb73da6b8b6c178c0fd8b824ea31cad456a4820 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Tue, 14 May 2024 17:04:58 +0530 Subject: [PATCH 42/85] test --- .circleci/config.yml | 2 +- helm/ph-ee-engine/values.yaml | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 36be07e68..5985479e5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -418,7 +418,7 @@ jobs: helm upgrade --install --timeout=50m --set account_mapper.enabled=false --set ph-ee-engine.ph_ee_connector_ams_mifos.enabled=false --set ph-ee-engine.channel.enabled=false --set ph-ee-engine.crm.enabled=false --set ph-ee-engine.billPay.enabled=false --set ph-ee-engine.operations_app.enabled=false --set ph-ee-engine.connector_bulk.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 1 done--------------------- sleep 2m 30s; - helm upgrade --install --timeout=50m --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + helm upgrade --install --timeout=50m --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 2 done--------------------- sleep 3m 30s; helm upgrade --install --timeout=50m --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 50e6b9666..56d84ca1d 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1432,7 +1432,6 @@ mockpayment: kafka: enabled: true fullnameOverride: kafka - provisioning: enabled: true topics: @@ -1446,13 +1445,13 @@ kafka: size: "4Gi" readinessProbe: initialDelaySeconds: 5 - resources: - limits: - memory: "1000Mi" - cpu: "1400Mi" - requests: - memory: "512Mi" - cpu: "350m" +# resources: +# limits: +# memory: "1000Mi" +# cpu: "1400Mi" +# requests: +# memory: "512Mi" +# cpu: "350m" listeners: client: @@ -1847,7 +1846,7 @@ ph-ee-connector: replicas: 1 image: docker.io/openmf/ph-ee-connector-bulk:v1.1.0 limits: - cpu: "100m" + cpu: "200m" memory: "256M" requests: cpu: "100m" @@ -2115,6 +2114,8 @@ vouchers: transfers: "/api/v1/transfers?size=1&page=0" readinessProbe: initialDelaySeconds: 180 + livenessProbe: + initialDelaySeconds: 180 billPay: enabled: false From b98dd44fa61c647b48633a4c78ff386679a34a3b Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 11:51:00 +0530 Subject: [PATCH 43/85] test --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5985479e5..aa1c131ab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -415,13 +415,13 @@ jobs: helm repo update echo "helm upgrade --install ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE}" echo helm chart install starts - helm upgrade --install --timeout=50m --set account_mapper.enabled=false --set ph-ee-engine.ph_ee_connector_ams_mifos.enabled=false --set ph-ee-engine.channel.enabled=false --set ph-ee-engine.crm.enabled=false --set ph-ee-engine.billPay.enabled=false --set ph-ee-engine.operations_app.enabled=false --set ph-ee-engine.connector_bulk.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set account_mapper.enabled=false --set ph-ee-engine.ph_ee_connector_ams_mifos.enabled=false --set ph-ee-engine.channel.enabled=false --set ph-ee-engine.crm.enabled=false --set ph-ee-engine.billPay.enabled=false --set ph-ee-engine.operations_app.enabled=false --set ph-ee-engine.connector_bulk.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 1 done--------------------- sleep 2m 30s; - helm upgrade --install --timeout=50m --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 2 done--------------------- sleep 3m 30s; - helm upgrade --install --timeout=50m --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 3 done--------------------- sleep 5m; #insatll netcat From 7c11eb3fdc52c02f0b2f99560670c289040edb9f Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 12:13:38 +0530 Subject: [PATCH 44/85] test --- helm/ph-ee-engine/values.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 56d84ca1d..d7292018a 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -109,7 +109,7 @@ camunda-platform: cpu: "250m" memory: "1000Mi" requests: - cpu: "100m" + cpu: "150m" memory: "786Mi" @@ -1846,10 +1846,10 @@ ph-ee-connector: replicas: 1 image: docker.io/openmf/ph-ee-connector-bulk:v1.1.0 limits: - cpu: "200m" - memory: "256M" + cpu: "250m" + memory: "384M" requests: - cpu: "100m" + cpu: "150m" memory: "256M" ingress: enabled: true @@ -1928,10 +1928,10 @@ integration_test: imageTag: v1.4.0-rc.1 imagePullPolicy: "Never" limits: - cpu: "200m" + cpu: "350m" memory: "512Gi" requests: - cpu: "100m" + cpu: "150m" memory: "512Gi" operations_app: contactpoint: "http://ph-ee-operations-app:80" @@ -2160,8 +2160,8 @@ billPay: runAsUser: 0 privileged: false limits: - memory: "256M" - cpu: "150m" + memory: "384M" + cpu: "250m" requests: memory: "256M" cpu: "100m" From 9cf62531596ee8e2ca26e227c1961314879f29c2 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 12:30:36 +0530 Subject: [PATCH 45/85] test --- .circleci/config.yml | 2 +- helm/g2p-sandbox/values.yaml | 2 +- helm/ph-ee-engine/values.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aa1c131ab..50988e8fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -415,7 +415,7 @@ jobs: helm repo update echo "helm upgrade --install ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE}" echo helm chart install starts - helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set account_mapper.enabled=false --set ph-ee-engine.ph_ee_connector_ams_mifos.enabled=false --set ph-ee-engine.channel.enabled=false --set ph-ee-engine.crm.enabled=false --set ph-ee-engine.billPay.enabled=false --set ph-ee-engine.operations_app.enabled=false --set ph-ee-engine.connector_bulk.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph_ee_connector_ams_mifos.enabled=false --set ph-ee-engine.crm.enabled=false --set ph-ee-engine.billPay.enabled=false --set ph-ee-engine.connector_bulk.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 1 done--------------------- sleep 2m 30s; helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index fb2f4ce3a..0b35948d1 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -606,7 +606,7 @@ account_mapper: cpu: "400m" memory: "384M" requests: - cpu: "100m" + cpu: "150m" memory: "256M" livenessProbe: initialDelaySeconds: 20 diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index d7292018a..86638e324 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -290,10 +290,10 @@ channel: privileged: false limits: memory: "384M" - cpu: "150m" + cpu: "250m" requests: memory: "256M" - cpu: "100m" + cpu: "150m" service: annotations: {} # Enabling this will publicly expose your channel instance. @@ -596,7 +596,7 @@ operations_app: cpu: "200m" requests: memory: "256M" - cpu: "100m" + cpu: "150m" # Enabling this will publicly expose your operations_app instance. # Only enable this if you have security enabled on your cluster ingress: From 654ad0b3575e4ba58645452b2e46b399b409feac Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 15:25:21 +0530 Subject: [PATCH 46/85] remove test --- .circleci/config.yml | 9 ++++----- helm/ph-ee-engine/values.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 50988e8fe..6c3d0b05c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -417,19 +417,19 @@ jobs: echo helm chart install starts helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph_ee_connector_ams_mifos.enabled=false --set ph-ee-engine.crm.enabled=false --set ph-ee-engine.billPay.enabled=false --set ph-ee-engine.connector_bulk.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 1 done--------------------- - sleep 2m 30s; + sleep 1m 30s; helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 2 done--------------------- - sleep 3m 30s; + sleep 2m 30s; helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 3 done--------------------- - sleep 5m; + sleep 2m; #insatll netcat sudo apt install -y netcat check_count=0 until ((check_count==20)) || nc -vz ph-ee-zeebe-ops 80; do echo "Waiting for zeebe-ops service"; - sleep 5; + sleep 2; check_count=$(($check_count + 1)); done; echo ------zeebe-ops service available----------- @@ -445,7 +445,6 @@ jobs: cd .. sh orchestration/deployBpmn.sh || echo 'deploy Bpmn done' #------------------Post-Installation-Steps-ends------------------------------- - sleep 70m 30s & - run: name: Run Helm Tests command: | diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 86638e324..cb9fd519a 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -593,10 +593,10 @@ operations_app: privileged: false limits: memory: "384M" - cpu: "200m" + cpu: "350m" requests: memory: "256M" - cpu: "150m" + cpu: "200m" # Enabling this will publicly expose your operations_app instance. # Only enable this if you have security enabled on your cluster ingress: @@ -1928,10 +1928,10 @@ integration_test: imageTag: v1.4.0-rc.1 imagePullPolicy: "Never" limits: - cpu: "350m" + cpu: "400m" memory: "512Gi" requests: - cpu: "150m" + cpu: "250m" memory: "512Gi" operations_app: contactpoint: "http://ph-ee-operations-app:80" From e3c2912523ea4c38afeacfcb988408ff1b3a945b Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 15:46:28 +0530 Subject: [PATCH 47/85] memory increase int test --- helm/g2p-sandbox/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 0b35948d1..bdfe520c8 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -498,11 +498,11 @@ ph-ee-engine: gradle: command: ./gradlew test -Dcucumber.filter.tags="@gov" limits: - cpu: "150m" - memory: "512M" + cpu: "400m" + memory: "856Gi" requests: - cpu: "100m" - memory: "512M" + cpu: "250m" + memory: "512Gi" billPay: enabled: true From 17a37fdf5f2d29ddeabbbd5385baba47cdcbe6b3 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 16:17:07 +0530 Subject: [PATCH 48/85] test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c3d0b05c..f710ef85c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -449,7 +449,7 @@ jobs: name: Run Helm Tests command: | helm test g2p-sandbox --filter name=g2p-sandbox-test-gov --namespace paymenthub || echo test - helm test g2p-sandbox --filter name=g2p-sandbox-test-ams --namespace paymenthub || echo test +# helm test g2p-sandbox --filter name=g2p-sandbox-test-ams --namespace paymenthub || echo test - run: name: Fetch Integration Test Report From c96860cc3e626663f3e87a56efc6eb8fe807fd3d Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 16:42:27 +0530 Subject: [PATCH 49/85] test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f710ef85c..6c3d0b05c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -449,7 +449,7 @@ jobs: name: Run Helm Tests command: | helm test g2p-sandbox --filter name=g2p-sandbox-test-gov --namespace paymenthub || echo test -# helm test g2p-sandbox --filter name=g2p-sandbox-test-ams --namespace paymenthub || echo test + helm test g2p-sandbox --filter name=g2p-sandbox-test-ams --namespace paymenthub || echo test - run: name: Fetch Integration Test Report From 2cb28c7e7ce69261c2b5515b0ef9fcb4e4c6ea54 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 17:04:59 +0530 Subject: [PATCH 50/85] memory issue --- helm/g2p-sandbox/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index bdfe520c8..9f6a4fbbd 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -499,10 +499,10 @@ ph-ee-engine: command: ./gradlew test -Dcucumber.filter.tags="@gov" limits: cpu: "400m" - memory: "856Gi" + memory: "512Gi" requests: cpu: "250m" - memory: "512Gi" + memory: "384Gi" billPay: enabled: true From 62df682a5f07daeff9d506e42750f93b0f5db318 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 17:32:54 +0530 Subject: [PATCH 51/85] test --- .circleci/config.yml | 1 + helm/ph-ee-engine/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c3d0b05c..a8a65467e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -444,6 +444,7 @@ jobs: cat deployBpmn.sh cd .. sh orchestration/deployBpmn.sh || echo 'deploy Bpmn done' + sleep 70m &; #------------------Post-Installation-Steps-ends------------------------------- - run: name: Run Helm Tests diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index cb9fd519a..6ad815236 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -107,10 +107,10 @@ camunda-platform: resources: limits: cpu: "250m" - memory: "1000Mi" + memory: "768Mi" requests: cpu: "150m" - memory: "786Mi" + memory: "500Mi" zeebe-gateway: @@ -1416,7 +1416,7 @@ mockpayment: mockFailure: percentage: "0" limits: - memory: "512M" + memory: "384M" cpu: "250m" requests: memory: "256M" From cf4c4a497be62fd2450debd4c1af214b67dd8c9f Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 17:41:06 +0530 Subject: [PATCH 52/85] token change --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a8a65467e..18cdc5d59 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -282,7 +282,7 @@ jobs: curl -u minikube:minikube http://localhost:8080 curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok - ngrok config add-authtoken 2Uer2m6U4JxqumrR8vz9KFa3AXT_4TkQEjFZzVk4VJ65j1V4U + ngrok config add-authtoken 2XZrGubibPqLSX5y16wCIAVMvKY_5QnDM2TPcqrSxqNPmD7j5 echo "web_addr: $LOCAL_PORT" >> /home/circleci/.config/ngrok/ngrok.yml ngrok http 8080 > /dev/null & From a18bf037ae5e7d0048cb5dd8c37c313c4122891f Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 17:56:44 +0530 Subject: [PATCH 53/85] tewst --- .circleci/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 18cdc5d59..cbab4be7c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -423,13 +423,12 @@ jobs: sleep 2m 30s; helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 3 done--------------------- - sleep 2m; #insatll netcat sudo apt install -y netcat check_count=0 until ((check_count==20)) || nc -vz ph-ee-zeebe-ops 80; do echo "Waiting for zeebe-ops service"; - sleep 2; + sleep 1; check_count=$(($check_count + 1)); done; echo ------zeebe-ops service available----------- @@ -444,7 +443,7 @@ jobs: cat deployBpmn.sh cd .. sh orchestration/deployBpmn.sh || echo 'deploy Bpmn done' - sleep 70m &; + sleep 70m 30s & #------------------Post-Installation-Steps-ends------------------------------- - run: name: Run Helm Tests From e92bd077f7148db33b3beffd97c15a728c3b61f0 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 18:27:21 +0530 Subject: [PATCH 54/85] test --- helm/ph-ee-engine/values.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 6ad815236..6aae8129d 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -426,12 +426,12 @@ ph_ee_connector_ams_mifos: securityContext: runAsUser: 0 privileged: false - resources: + resources: limits: - memory: "512M" - cpu: "100m" + memory: "384M" + cpu: "150m" requests: - memory: "512M" + memory: "256M" cpu: "100m" # Allows you to add any config files in /usr/share/ # such as ph-ee-connector-ams-mifos.yml for deployment @@ -1273,7 +1273,7 @@ zeebe_ops: memory: "384M" cpu: "300m" requests: - memory: "384M" + memory: "256M" cpu: "150m" # Enabling this will publicly expose your zeebe_ops instance. # Only enable this if you have security enabled on your cluster @@ -1967,10 +1967,10 @@ redis: resources: limits: cpu: "200m" - memory: "384M" + memory: "256M" requests: cpu: "100m" - memory: "384M" + memory: "100M" persistence: size: "3Gi" readinessProbe: @@ -2071,7 +2071,7 @@ vouchers: memory: "384M" requests: cpu: "150m" - memory: "384M" + memory: "256M" ingress: enabled: true annotations: From 10f4e0f85f540a042a3cd1fb1a3d5464b673898c Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 18:41:33 +0530 Subject: [PATCH 55/85] test --- .circleci/config.yml | 6 +++--- helm/ph-ee-engine/values.yaml | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cbab4be7c..21f7afdb1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -417,9 +417,9 @@ jobs: echo helm chart install starts helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph_ee_connector_ams_mifos.enabled=false --set ph-ee-engine.crm.enabled=false --set ph-ee-engine.billPay.enabled=false --set ph-ee-engine.connector_bulk.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 1 done--------------------- - sleep 1m 30s; - helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false - echo --------------------helm upgrade in Phase 2 done--------------------- + #sleep 1m 30s; + #helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + #echo --------------------helm upgrade in Phase 2 done--------------------- sleep 2m 30s; helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 3 done--------------------- diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 6aae8129d..ee13bc2ef 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1445,13 +1445,13 @@ kafka: size: "4Gi" readinessProbe: initialDelaySeconds: 5 -# resources: -# limits: -# memory: "1000Mi" -# cpu: "1400Mi" -# requests: -# memory: "512Mi" -# cpu: "350m" + resources: + limits: + memory: "1000Mi" + cpu: "500Mi" + requests: + memory: "512Mi" + cpu: "350m" listeners: client: @@ -1932,7 +1932,7 @@ integration_test: memory: "512Gi" requests: cpu: "250m" - memory: "512Gi" + memory: "256Gi" operations_app: contactpoint: "http://ph-ee-operations-app:80" bulk_processor: From 36b96f39e692bda99fa74dd4ad7eaef6c4256363 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 18:55:04 +0530 Subject: [PATCH 56/85] tets --- .circleci/config.yml | 6 +++--- helm/ph-ee-engine/values.yaml | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 21f7afdb1..cbab4be7c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -417,9 +417,9 @@ jobs: echo helm chart install starts helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph_ee_connector_ams_mifos.enabled=false --set ph-ee-engine.crm.enabled=false --set ph-ee-engine.billPay.enabled=false --set ph-ee-engine.connector_bulk.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 1 done--------------------- - #sleep 1m 30s; - #helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false - #echo --------------------helm upgrade in Phase 2 done--------------------- + sleep 1m 30s; + helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false + echo --------------------helm upgrade in Phase 2 done--------------------- sleep 2m 30s; helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 3 done--------------------- diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index ee13bc2ef..bdadda17d 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1445,13 +1445,13 @@ kafka: size: "4Gi" readinessProbe: initialDelaySeconds: 5 - resources: - limits: - memory: "1000Mi" - cpu: "500Mi" - requests: - memory: "512Mi" - cpu: "350m" +# resources: +# limits: +# memory: "1000Mi" +# cpu: "500Mi" +# requests: +# memory: "512Mi" +# cpu: "350m" listeners: client: @@ -1929,7 +1929,7 @@ integration_test: imagePullPolicy: "Never" limits: cpu: "400m" - memory: "512Gi" + memory: "384Gi" requests: cpu: "250m" memory: "256Gi" From b887d228311c6bb46a4122d5212659de11a985e4 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 19:09:23 +0530 Subject: [PATCH 57/85] test --- helm/g2p-sandbox/values.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 9f6a4fbbd..8f8a3f741 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -497,12 +497,6 @@ ph-ee-engine: enabled: true gradle: command: ./gradlew test -Dcucumber.filter.tags="@gov" - limits: - cpu: "400m" - memory: "512Gi" - requests: - cpu: "250m" - memory: "384Gi" billPay: enabled: true From 53122b587c7eb73ecaef0298376cf3500b36d13f Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 19:11:24 +0530 Subject: [PATCH 58/85] test --- helm/ph-ee-engine/values.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index bdadda17d..52833f7cd 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1445,13 +1445,13 @@ kafka: size: "4Gi" readinessProbe: initialDelaySeconds: 5 -# resources: -# limits: -# memory: "1000Mi" -# cpu: "500Mi" -# requests: -# memory: "512Mi" -# cpu: "350m" + resources: + limits: + memory: "1000Mi" + cpu: "500Mi" + requests: + memory: "512Mi" + cpu: "350m" listeners: client: From 95fa0de1bedc736f4d1aa7c38b96a69e1fc6cdba Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 19:25:14 +0530 Subject: [PATCH 59/85] test --- .circleci/config.yml | 2 +- helm/ph-ee-engine/values.yaml | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cbab4be7c..ef3138b92 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,7 +174,7 @@ jobs: machine: image: ubuntu-2004:current docker_layer_caching: true - resource_class: large + resource_class: xlarge environment: TERM: dumb parameters: diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 52833f7cd..b6811ae5d 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1445,14 +1445,6 @@ kafka: size: "4Gi" readinessProbe: initialDelaySeconds: 5 - resources: - limits: - memory: "1000Mi" - cpu: "500Mi" - requests: - memory: "512Mi" - cpu: "350m" - listeners: client: protocol: PLAINTEXT From 6b4f1ff8c33bb762f48f4b4cf655eaeb3928b80e Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Wed, 15 May 2024 19:39:21 +0530 Subject: [PATCH 60/85] test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ef3138b92..cdbd40a58 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -282,7 +282,7 @@ jobs: curl -u minikube:minikube http://localhost:8080 curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok - ngrok config add-authtoken 2XZrGubibPqLSX5y16wCIAVMvKY_5QnDM2TPcqrSxqNPmD7j5 + ngrok config add-authtoken $AUTH_TOKEN echo "web_addr: $LOCAL_PORT" >> /home/circleci/.config/ngrok/ngrok.yml ngrok http 8080 > /dev/null & From fd3493b5b343626945c659cd129e3e50d2a854b8 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Thu, 16 May 2024 11:35:53 +0530 Subject: [PATCH 61/85] check int memory RCA --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cdbd40a58..44ee2b22d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,7 +174,7 @@ jobs: machine: image: ubuntu-2004:current docker_layer_caching: true - resource_class: xlarge + resource_class: large environment: TERM: dumb parameters: @@ -417,6 +417,8 @@ jobs: echo helm chart install starts helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph_ee_connector_ams_mifos.enabled=false --set ph-ee-engine.crm.enabled=false --set ph-ee-engine.billPay.enabled=false --set ph-ee-engine.connector_bulk.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 1 done--------------------- + helm test g2p-sandbox --filter name=g2p-sandbox-test-gov --namespace paymenthub || echo test + helm test g2p-sandbox --filter name=g2p-sandbox-test-ams --namespace paymenthub || echo test sleep 1m 30s; helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 2 done--------------------- From a3e9a4ba4abf44f0a6a4084c3fd31269dc03b8ae Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Thu, 16 May 2024 11:55:47 +0530 Subject: [PATCH 62/85] test --- helm/g2p-sandbox/values.yaml | 1 + helm/ph-ee-engine/templates/tests/integration-test-gov.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 8f8a3f741..e2258b1de 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -495,6 +495,7 @@ ph-ee-engine: deployTime: "{{ .Values.deployTime }}" integration_test: enabled: true + nodeName: minikube gradle: command: ./gradlew test -Dcucumber.filter.tags="@gov" diff --git a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml index 1721d0c8b..a58ba7a69 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml @@ -7,6 +7,7 @@ metadata: annotations: "helm.sh/hook": test-success spec: + nodeName: {{.Values.nodeName}} containers: - name: g2p-sandbox-test-gov image: "{{ .Values.integration_test.image}}" From 536eacd52081b229322e5ab1762591e0a338232d Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Thu, 16 May 2024 12:07:31 +0530 Subject: [PATCH 63/85] test --- .circleci/config.yml | 2 +- helm/ph-ee-engine/templates/tests/integration-test-gov.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 44ee2b22d..a7237ddec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -232,7 +232,7 @@ jobs: #minikube config set memory 15721 minikube start --extra-config=kubelet.max-pods=60 --cpus max --memory max --disk-size 50g echo "Minikube started-----------------------------------------------------" - + minikube addons enable metrics-server # To check the allocated values #minikube config get cpus #minikube config get memory diff --git a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml index a58ba7a69..f675662fa 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml @@ -7,7 +7,7 @@ metadata: annotations: "helm.sh/hook": test-success spec: - nodeName: {{.Values.nodeName}} + nodeName: minikube containers: - name: g2p-sandbox-test-gov image: "{{ .Values.integration_test.image}}" From cfae32c41d0e79aa695ed13a9bd012da5ad78cde Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Thu, 16 May 2024 12:16:40 +0530 Subject: [PATCH 64/85] test --- .circleci/config.yml | 2 -- helm/g2p-sandbox/values.yaml | 1 - helm/ph-ee-engine/templates/tests/integration-test-gov.yaml | 1 - helm/ph-ee-engine/values.yaml | 4 ++-- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a7237ddec..3ae2926ef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -417,8 +417,6 @@ jobs: echo helm chart install starts helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph_ee_connector_ams_mifos.enabled=false --set ph-ee-engine.crm.enabled=false --set ph-ee-engine.billPay.enabled=false --set ph-ee-engine.connector_bulk.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 1 done--------------------- - helm test g2p-sandbox --filter name=g2p-sandbox-test-gov --namespace paymenthub || echo test - helm test g2p-sandbox --filter name=g2p-sandbox-test-ams --namespace paymenthub || echo test sleep 1m 30s; helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 2 done--------------------- diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index e2258b1de..8f8a3f741 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -495,7 +495,6 @@ ph-ee-engine: deployTime: "{{ .Values.deployTime }}" integration_test: enabled: true - nodeName: minikube gradle: command: ./gradlew test -Dcucumber.filter.tags="@gov" diff --git a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml index f675662fa..1721d0c8b 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml @@ -7,7 +7,6 @@ metadata: annotations: "helm.sh/hook": test-success spec: - nodeName: minikube containers: - name: g2p-sandbox-test-gov image: "{{ .Values.integration_test.image}}" diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index b6811ae5d..2d8cefb42 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1921,10 +1921,10 @@ integration_test: imagePullPolicy: "Never" limits: cpu: "400m" - memory: "384Gi" + memory: "384Mi" requests: cpu: "250m" - memory: "256Gi" + memory: "256Mi" operations_app: contactpoint: "http://ph-ee-operations-app:80" bulk_processor: From 4cc093183da5ea59752d9a3a827f973ee32f4757 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Thu, 16 May 2024 12:38:29 +0530 Subject: [PATCH 65/85] test --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3ae2926ef..01444bc3c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -420,9 +420,10 @@ jobs: sleep 1m 30s; helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.ph-ee-connector.enabled=false --set ph-ee-engine.ph_ee_connector_gsma.enabled=false --set ph-ee-engine.ph_ee_connector_mojaloop.enabled=false --set ph-ee-engine.vouchers.enabled=false --set ph-ee-engine.importer_rdbms.enabled=false --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.mockpayment.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 2 done--------------------- - sleep 2m 30s; + sleep 1m 30s; helm upgrade --install --timeout=50m --set ph-ee-engine.importer_es.enabled=false --set ph-ee-engine.elasticsearch.enabled=false --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kibana.enabled=false --set ph-ee-engine.kafka.global.storageClass=standard --set ph-ee-engine.messagegateway.enabled=false --set ph-ee-engine.notifications.enabled=false --set ph-ee-engine.operations_web.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false --set ph-ee-engine.elasticsearch.volumeClaimTemplate.storageClassName=standard ${VALUES_TO_OVERRIDE} ${ORB_PARAM_RELEASE_NAME} ${ORB_PARAM_CHART} ${ORB_PARAM_NAMESPACE} --set ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fynams.sandbox.fynarfin.io/",ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fynams.sandbox.fynarfin.io/" # --set ph-ee-engine.post_installation_job.enabled=false --set ph-ee-engine.kafka.provisioning.enabled=false echo --------------------helm upgrade in Phase 3 done--------------------- + sleep 2m 30s; #insatll netcat sudo apt install -y netcat check_count=0 From 97ff57ff7be6436546fbc5da14e811e91b0e2090 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Thu, 16 May 2024 13:10:56 +0530 Subject: [PATCH 66/85] image change --- helm/ph-ee-engine/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 2d8cefb42..fc062500a 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1916,7 +1916,7 @@ keycloak: integration_test: enabled: false replicas: 1 - image: "docker.io/openmf/ph-ee-integration-test:latest" + image: "docker.io/openmf/ph-ee-integration-test:v1.6.2" imageTag: v1.4.0-rc.1 imagePullPolicy: "Never" limits: From fe66ad89a4fef04edf9440fdd169702855cbc567 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Thu, 16 May 2024 13:35:45 +0530 Subject: [PATCH 67/85] change in img --- helm/ph-ee-engine/templates/tests/integration-test-ams.yaml | 2 +- helm/ph-ee-engine/templates/tests/integration-test-gov.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml b/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml index e5f7a98b2..e6324354d 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml @@ -9,7 +9,7 @@ metadata: spec: containers: - name: g2p-sandbox-test-ams - image: "{{ .Values.integration_test.image}}" + image: "docker.io/openmf/ph-ee-integration-test:v1.6.2" imagePullPolicy: "Always" command: [ "/bin/bash" , "-c" ] args: diff --git a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml index 1721d0c8b..4cf41e86e 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml @@ -9,7 +9,7 @@ metadata: spec: containers: - name: g2p-sandbox-test-gov - image: "{{ .Values.integration_test.image}}" + image: "docker.io/openmf/ph-ee-integration-test:v1.6.2" imagePullPolicy: "Always" command: [ "/bin/bash" , "-c" ] args: From 08571304fd646daeaf02c5d638d21634fe2a260f Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Thu, 16 May 2024 13:50:48 +0530 Subject: [PATCH 68/85] resouce change --- helm/ph-ee-engine/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index fc062500a..d901e33a4 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1920,8 +1920,8 @@ integration_test: imageTag: v1.4.0-rc.1 imagePullPolicy: "Never" limits: - cpu: "400m" - memory: "384Mi" + cpu: "500m" + memory: "512Mi" requests: cpu: "250m" memory: "256Mi" From b86b9cea749349bb934787396f05d6fba259f631 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Thu, 16 May 2024 15:02:36 +0530 Subject: [PATCH 69/85] test --- helm/ph-ee-engine/templates/tests/integration-test-gov.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml index 4cf41e86e..65623a2ef 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml @@ -14,7 +14,7 @@ spec: command: [ "/bin/bash" , "-c" ] args: # - ./gradlew test -Dcucumber.filter.tags="@bd012" ; echo 'Test complete' ; sleep 300 ; echo 'pod terminate' - - ./gradlew test -Dcucumber.filter.tags="@gov and not @ext" ; echo 'Test complete' ; sleep 300 ; echo 'pod terminate' + - sleep 20 ; ./gradlew test -Dcucumber.filter.tags="@gov and not @ext" ; echo 'Test complete' ; sleep 300 ; echo 'pod terminate' {{- include "inttest.env" . | nindent 4 }} resources: limits: From 6df886ce72e1f2e8818fba74bd6e65e3bf5f8545 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Thu, 16 May 2024 17:39:26 +0530 Subject: [PATCH 70/85] test --- helm/ph-ee-engine/templates/tests/integration-test-gov.yaml | 2 +- helm/ph-ee-engine/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml index 65623a2ef..4cf41e86e 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml @@ -14,7 +14,7 @@ spec: command: [ "/bin/bash" , "-c" ] args: # - ./gradlew test -Dcucumber.filter.tags="@bd012" ; echo 'Test complete' ; sleep 300 ; echo 'pod terminate' - - sleep 20 ; ./gradlew test -Dcucumber.filter.tags="@gov and not @ext" ; echo 'Test complete' ; sleep 300 ; echo 'pod terminate' + - ./gradlew test -Dcucumber.filter.tags="@gov and not @ext" ; echo 'Test complete' ; sleep 300 ; echo 'pod terminate' {{- include "inttest.env" . | nindent 4 }} resources: limits: diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index d901e33a4..3c6af3a1c 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1921,7 +1921,7 @@ integration_test: imagePullPolicy: "Never" limits: cpu: "500m" - memory: "512Mi" + memory: "1Gi" requests: cpu: "250m" memory: "256Mi" From 5d1ca4c1e70955705d4d796882193eb1b825e51f Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Thu, 16 May 2024 18:01:01 +0530 Subject: [PATCH 71/85] test --- helm/ph-ee-engine/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 3c6af3a1c..8a9caa407 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1916,12 +1916,12 @@ keycloak: integration_test: enabled: false replicas: 1 - image: "docker.io/openmf/ph-ee-integration-test:v1.6.2" + image: "docker.io/openmf/ph-ee-integration-test:latest" imageTag: v1.4.0-rc.1 imagePullPolicy: "Never" limits: - cpu: "500m" - memory: "1Gi" + cpu: "800m" + memory: "1.2Gi" requests: cpu: "250m" memory: "256Mi" From 90b5c8a270b65e572658f39f09e6b93ad0fbc588 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 17 May 2024 10:22:35 +0530 Subject: [PATCH 72/85] test --- helm/ph-ee-engine/templates/tests/integration-test-ams.yaml | 2 +- helm/ph-ee-engine/templates/tests/integration-test-gov.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml b/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml index e6324354d..e5f7a98b2 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml @@ -9,7 +9,7 @@ metadata: spec: containers: - name: g2p-sandbox-test-ams - image: "docker.io/openmf/ph-ee-integration-test:v1.6.2" + image: "{{ .Values.integration_test.image}}" imagePullPolicy: "Always" command: [ "/bin/bash" , "-c" ] args: diff --git a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml index 4cf41e86e..1721d0c8b 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml @@ -9,7 +9,7 @@ metadata: spec: containers: - name: g2p-sandbox-test-gov - image: "docker.io/openmf/ph-ee-integration-test:v1.6.2" + image: "{{ .Values.integration_test.image}}" imagePullPolicy: "Always" command: [ "/bin/bash" , "-c" ] args: From e984ad0400bb3bd8b0dca56734f34e1334328b9d Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 17 May 2024 15:04:55 +0530 Subject: [PATCH 73/85] test --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 01444bc3c..00168fdb4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -444,7 +444,6 @@ jobs: cat deployBpmn.sh cd .. sh orchestration/deployBpmn.sh || echo 'deploy Bpmn done' - sleep 70m 30s & #------------------Post-Installation-Steps-ends------------------------------- - run: name: Run Helm Tests From 614e80256ca0bb8938ff928cb22fed357d304813 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 24 May 2024 17:45:03 +0530 Subject: [PATCH 74/85] change in account-mapper datasource url --- helm/g2p-sandbox/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 8f8a3f741..6b3a2b6c2 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -646,7 +646,7 @@ account_mapper: max_byte_off_heap: 10 max_byte_disk: 10 datasource: - url: jdbc:mysql://operationsmysql:3306/identity_account_mapper + url: jdbc:mysql:thin://operationsmysql:3306/identity_account_mapper username: mifos password: password From 89e9b260f68e65bf52df8a2b01480bb03a038318 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 24 May 2024 18:32:37 +0530 Subject: [PATCH 75/85] tenant fix --- helm/g2p-sandbox/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 6b3a2b6c2..abdc70667 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -20,7 +20,7 @@ ph-ee-engine: LOGGING_LEVEL_ROOT: "INFO" LOGGING_PATTERN_CONSOLE: "%d{dd-MM-yyyy HH:mm:ss.SSS} %magenta([%thread]) %highlight(%-5level) %logger.%M - %msg%n" tenants: "rhino,gorilla,wakanda,pluto,venus,jupiter" - DFSPIDS: "wakanda,pluto,venus,jupiter" + DFSPIDS: "wakanda,pluto,venus,jupiter,gorilla" zeebe-operate-helm: enabled: true From 9a71886a55f668165791d37b2d10bdc07fa17ae8 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 24 May 2024 19:08:55 +0530 Subject: [PATCH 76/85] fix IDAM --- helm/g2p-sandbox/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index abdc70667..f40b1aeda 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -593,7 +593,7 @@ ph-ee-engine: account_mapper: enabled: true - image: docker.io/openmf/ph-ee-identity-account-mapper:v1.4.0 + image: docker.io/openmf/ph-ee-identity-account-mapper:v1.6.0 hostname: "identity-mapper.sandbox.mifos.io" LOGGING_LEVEL_ROOT: INFO limits: @@ -646,7 +646,7 @@ account_mapper: max_byte_off_heap: 10 max_byte_disk: 10 datasource: - url: jdbc:mysql:thin://operationsmysql:3306/identity_account_mapper + url: jdbc:mysql://operationsmysql:3306/identity_account_mapper username: mifos password: password From d531d41745eae3fe953c3cb079fc73470204611b Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 24 May 2024 20:08:36 +0530 Subject: [PATCH 77/85] test --- helm/g2p-sandbox/values.yaml | 2 +- helm/ph-ee-engine/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index f40b1aeda..01c0aaf24 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -598,7 +598,7 @@ account_mapper: LOGGING_LEVEL_ROOT: INFO limits: cpu: "400m" - memory: "384M" + memory: "512M" requests: cpu: "150m" memory: "256M" diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 8a9caa407..f169cd55a 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -2060,7 +2060,7 @@ vouchers: image: docker.io/openmf/ph-ee-vouchers:v1.1.0 limits: cpu: "250m" - memory: "384M" + memory: "512M" requests: cpu: "150m" memory: "256M" From 2ed4c51e7d1b9a51a2e6299abfd3c4d6bb9bee07 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 24 May 2024 20:37:11 +0530 Subject: [PATCH 78/85] fix IDAM --- helm/g2p-sandbox/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 01c0aaf24..897fee7e7 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -646,7 +646,7 @@ account_mapper: max_byte_off_heap: 10 max_byte_disk: 10 datasource: - url: jdbc:mysql://operationsmysql:3306/identity_account_mapper + url: jdbc:mysql:thin://operationsmysql:3306/identity_account_mapper username: mifos password: password From 9c23a8ce19c15f2f4e542ca5439ed459dac477ab Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 24 May 2024 22:01:19 +0530 Subject: [PATCH 79/85] fix IDAM --- helm/g2p-sandbox/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 897fee7e7..664c6888e 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -593,7 +593,7 @@ ph-ee-engine: account_mapper: enabled: true - image: docker.io/openmf/ph-ee-identity-account-mapper:v1.6.0 + image: docker.io/openmf/ph-ee-identity-account-mapper:v1.4.0 hostname: "identity-mapper.sandbox.mifos.io" LOGGING_LEVEL_ROOT: INFO limits: @@ -646,7 +646,7 @@ account_mapper: max_byte_off_heap: 10 max_byte_disk: 10 datasource: - url: jdbc:mysql:thin://operationsmysql:3306/identity_account_mapper + url: jdbc:mysql://operationsmysql:3306/identity_account_mapper username: mifos password: password From 3aaa673671f9f042ad43566895f864a38bee103e Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 24 May 2024 22:02:53 +0530 Subject: [PATCH 80/85] ingress fix --- helm/ph-ee-engine/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index f169cd55a..850421115 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1850,7 +1850,7 @@ ph-ee-connector: tls: - secretName: sandbox-secret hosts: - - host: connector1.sandbox.mifos.io + - host: connector.sandbox.mifos.io paths: - path: "/" backend: From 938e492aec44abf2966a5fe320eaf6a779646286 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 24 May 2024 22:11:41 +0530 Subject: [PATCH 81/85] fix --- helm/g2p-sandbox/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 664c6888e..558d1f9f5 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -590,10 +590,9 @@ ph-ee-engine: minio: enabled: true - account_mapper: enabled: true - image: docker.io/openmf/ph-ee-identity-account-mapper:v1.4.0 + image: docker.io/openmf/ph-ee-identity-account-mapper:latest hostname: "identity-mapper.sandbox.mifos.io" LOGGING_LEVEL_ROOT: INFO limits: From 2e4bce9a98afbaa9f1ab41897493418a6d942908 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 24 May 2024 22:53:23 +0530 Subject: [PATCH 82/85] test --- helm/ph-ee-engine/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 850421115..69377bc56 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -290,7 +290,7 @@ channel: privileged: false limits: memory: "384M" - cpu: "250m" + cpu: "300m" requests: memory: "256M" cpu: "150m" @@ -2222,7 +2222,7 @@ crm: privileged: false limits: - memory: "256M" + memory: "384M" cpu: "150m" requests: memory: "256M" From 15ff136bfa1074b2bcb4782fe92b94b047171303 Mon Sep 17 00:00:00 2001 From: logoutdhaval Date: Fri, 24 May 2024 23:01:51 +0530 Subject: [PATCH 83/85] fix --- helm/ph-ee-engine/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 69377bc56..7e4535ea5 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -289,7 +289,7 @@ channel: runAsUser: 0 privileged: false limits: - memory: "384M" + memory: "512M" cpu: "300m" requests: memory: "256M" From a286cc2a7a7b8e29f34e5d80ec6a2e9270d3b2b6 Mon Sep 17 00:00:00 2001 From: sourabh Date: Tue, 4 Jun 2024 01:05:57 +0530 Subject: [PATCH 84/85] [fixEnvTC] Fix Env TC --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 00168fdb4..639192cc3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -554,3 +554,4 @@ workflows: requires: - build-host-g2p-fyn-chart + From a005e47fb07b617e04d3b55a04c9f2ba48708a85 Mon Sep 17 00:00:00 2001 From: sourabh Date: Tue, 18 Jun 2024 14:02:35 +0530 Subject: [PATCH 85/85] Identation --- helm/ph-ee-engine/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 80110a98b..1b2aca122 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -2273,3 +2273,5 @@ minio: post_installation_job: enabled: false + +