Develop (#1610)

* [MOSIP-37506] Deleted group1_values.yaml as we moved Completely from Longhorn Signed-off-by: VSIVAKALYAN <[email protected]> * [MOSIP-37506] Updated install.sh Signed-off-by: VSIVAKALYAN <[email protected]> * [DSD-6715] updated chart versions,READMEand installation scripts Signed-off-by: ckm007 <[email protected]> * [DSD-6715] updated README Signed-off-by: ckm007 <[email protected]> * [DSD-6715] updated installation script Signed-off-by: ckm007 <[email protected]> --------- Signed-off-by: VSIVAKALYAN <[email protected]> Signed-off-by: ckm007 <[email protected]> Co-authored-by: VSIVAKALYAN <[email protected]>
mosip · Dec 2, 2024 · 186c306 · 186c306
1 parent db7fb57
commit 186c306
Show file tree

Hide file tree

Showing 23 changed files with 36 additions and 34 deletions.
diff --git a/deployment/v3/external/all/install-all.sh b/deployment/v3/external/all/install-all.sh
@@ -47,9 +47,6 @@ function installing_all() {
   cd $ROOT_DIR/docker-secrets
   ./install.sh
 
-  cd $ROOT_DIR/conf-secrets
-  ./install.sh
-
   cd $ROOT_DIR/landing-page
 
   ./install.sh

diff --git a/deployment/v3/external/captcha/install.sh b/deployment/v3/external/captcha/install.sh
@@ -23,6 +23,7 @@ function secret_setup() {
         read -s PSITE_KEY
         echo Please enter the recaptcha admin secret key for domain $PREREG_HOST
         read -s PSECRET_KEY
+        break
       elif [ "$ans" = "N" ] || [ "$ans" = "n" ]; then
         exit 1
       else
@@ -40,6 +41,7 @@ function secret_setup() {
         read -s ASITE_KEY
         echo Please enter the recaptcha admin secret key for domain $ADMIN_HOST
         read -s ASECRET_KEY
+        break
       elif [ "$ans" = "N" ] || [ "$ans" = "n" ]; then
         exit 1
       else
@@ -57,6 +59,7 @@ function secret_setup() {
         read -s RSITE_KEY
         echo Please enter the recaptcha admin secret key for domain $RESIDENT_HOST
         read -s RSECRET_KEY
+        break
       elif [ "$ans" = "N" ] || [ "$ans" = "n" ]; then
         exit 1
       else
@@ -76,4 +79,4 @@ set -o errexit   ## set -e : exit the script if any statement returns a non-true
 set -o nounset   ## set -u : exit the script if you try to use an uninitialized variable
 set -o errtrace  # trace ERR through 'time command' and other functions
 set -o pipefail  # trace ERR through pipes
-secret_setup   # calling function
+secret_setup   # calling function
diff --git a/deployment/v3/external/istio-gateway/install.sh b/deployment/v3/external/istio-gateway/install.sh
@@ -43,7 +43,7 @@ if [[ -n "$public_exists" && -n "$internal_exists" ]]; then
 else
   helm -n $NS install istio-addons . \
     $gateway_option \
-    --set proxyProtocol.enabled=false
+    --set proxyProtocol.enabled=false \
     --wait
 fi
 

diff --git a/deployment/v3/external/postgres/values.yaml b/deployment/v3/external/postgres/values.yaml
@@ -5,7 +5,7 @@ primary:
     max_wal_senders=20
     max_replication_slots=10
   resources:
-    limits: {}
+    limits:
        cpu: 1500m
        memory: 2000Mi
     requests:

diff --git a/deployment/v3/mosip/README.md b/deployment/v3/mosip/README.md
@@ -12,9 +12,7 @@ The steps here install all MOSIP provided services - core and reference implemen
 
 ## Install
 Install in the following order:
-* [Landing page](landing-page/README.md)
-* [Docker secrets](docker-secrets/README.md)
-* [Prereg captcha](captcha/README.md)
+* [Conf Secrets](conf-secrets/README.md)
 * [Config Server](config-server/README.md)
 * [captcha](../mosip/captcha/README.md)
 * [Artifactory](artifactory/README.md)

diff --git a/deployment/v3/mosip/admin/install.sh b/deployment/v3/mosip/admin/install.sh
@@ -8,7 +8,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 NS=admin
-CHART_VERSION=12.0.1
+CHART_VERSION=0.0.1-develop
 
 echo Create $NS namespace
 kubectl create ns $NS

diff --git a/deployment/v3/mosip/all/install-all.sh b/deployment/v3/mosip/all/install-all.sh
@@ -13,6 +13,7 @@ function Installing_all() {
   declare -a module=("conf-secrets"
                      "config-server"
                      "artifactory"
+                     "captcha"
                      "keymanager"
                      "websub"
                      "mock-smtp"
@@ -30,11 +31,9 @@ function Installing_all() {
                      "admin"
                      "ida"
                      "print"
-                     "mosip-file-server"
                      "resident"
                      "partner-onboarder"
                      "mosip-file-server"
-                     "resident"
                      "regclient"
                      "restart-cron"
                      )

diff --git a/deployment/v3/mosip/captcha/install.sh b/deployment/v3/mosip/captcha/install.sh
@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 NS=captcha
-CHART_VERSION=0.1.0-develop
+CHART_VERSION=0.0.1-develop
 
 function installing_captcha() {
 

diff --git a/deployment/v3/mosip/config-server/install.sh b/deployment/v3/mosip/config-server/install.sh
@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 NS=config-server
-CHART_VERSION=0.0.2-develop
+CHART_VERSION=0.0.1-develop
 
 read -p "Is conf-secrets module installed?(Y/n) " conf_installed
 read -p "Do you want to enable config-server to pull configurations from multiple repositories?(Y/n)( Default: n )" comp_enabled

diff --git a/deployment/v3/mosip/datashare/install.sh b/deployment/v3/mosip/datashare/install.sh
@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 NS=datashare
-CHART_VERSION=12.0.1
+CHART_VERSION=0.0.1-develop
 echo Create $NS namespace
 kubectl create ns $NS 
 

diff --git a/deployment/v3/mosip/mock-abis/install.sh b/deployment/v3/mosip/mock-abis/install.sh
@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 NS=abis
-CHART_VERSION=12.0.x-develop
+CHART_VERSION=0.0.1-develop
 
 echo Create $NS namespace
 kubectl create ns $NS 

diff --git a/deployment/v3/mosip/mock-mv/install.sh b/deployment/v3/mosip/mock-mv/install.sh
@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 NS=abis
-CHART_VERSION=12.0.x-develop
+CHART_VERSION=0.0.1-develop
 
 echo Create $NS namespace
 kubectl create ns $NS

diff --git a/deployment/v3/mosip/mock-smtp/install.sh b/deployment/v3/mosip/mock-smtp/install.sh
@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 NS=mock-smtp
-CHART_VERSION=12.0.x-develop
+CHART_VERSION=0.0.1-develop
 
 echo Create $NS namespace
 kubectl create ns $NS

diff --git a/deployment/v3/mosip/packetmanager/install.sh b/deployment/v3/mosip/packetmanager/install.sh
@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 NS=packetmanager
-CHART_VERSION=12.0.1
+CHART_VERSION=0.0.1-develop
 
 echo Create $NS namespace
 kubectl create ns $NS 

diff --git a/deployment/v3/mosip/partner-onboarder/README.md b/deployment/v3/mosip/partner-onboarder/README.md
@@ -4,6 +4,18 @@
 Loads certs for default partners for sandbox. Refer [mosip-onboarding repo](https://github.com/mosip/mosip-onboarding).
 
 ## Install 
+* Create a directory for onboarder on the NFS server at `/srv/nfs/<sandbox>/onboarder/`:
+```
+mkdir -p /srv/nfs/mosip/<sandbox>/onboarder/
+```
+* Ensure the directory has 777 permissions:
+```
+chmod 777 /srv/nfs/mosip/<sandbox>/onboarder
+```
+* Add the following entry to the /etc/exports file:
+```
+/srv/nfs/mosip/<sandbox>/onboarder *(ro,sync,no_root_squash,no_all_squash,insecure,subtree_check)
+```
 * Set `values.yaml` to run onboarder for specific modules.
 * run `./install.sh`.
 ```

diff --git a/deployment/v3/mosip/partner-onboarder/install.sh b/deployment/v3/mosip/partner-onboarder/install.sh
@@ -70,7 +70,7 @@ function installing_onboarder() {
     done
 
   NS=onboarder
-  CHART_VERSION=1.5.0-es-develop
+  CHART_VERSION=0.0.1-develop
 
   echo "Do you have public domain & valid SSL? (Y/n) "
   echo "Y: if you have public domain & valid ssl certificate"

diff --git a/deployment/v3/mosip/partner-onboarder/values.yaml b/deployment/v3/mosip/partner-onboarder/values.yaml
@@ -1,7 +1,7 @@
 image:
   registry: docker.io
-  repository: mosipdev/partner-onboarder
-  tag: MOSIP-35987
+  repository: mosipqa/partner-onboarder
+  tag: develop
 
 onboarding:
   modules:
@@ -13,10 +13,6 @@ onboarding:
       enabled: true
     - name: resident
       enabled: true
-    - name: resident-oidc
-      enabled: true
-    - name: digitalcard
-      enabled: true
 #  configmaps:
 #    s3:
 #      s3-host: 'http://minio.minio:9000'

diff --git a/deployment/v3/mosip/prereg/install.sh b/deployment/v3/mosip/prereg/install.sh
@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 NS=prereg
-CHART_VERSION=12.0.1
+CHART_VERSION=0.0.1-develop
 
 echo Create $NS namespace
 kubectl create ns $NS

diff --git a/deployment/v3/mosip/print/install.sh b/deployment/v3/mosip/print/install.sh
@@ -8,7 +8,7 @@ fi
 
 
 NS=print
-CHART_VERSION=12.0.1
+CHART_VERSION=0.0.1-develop
 echo Create $NS namespace
 kubectl create ns $NS 
 

diff --git a/deployment/v3/mosip/regproc/group1_values.yaml b/deployment/v3/mosip/regproc/group1_values.yaml
diff --git a/deployment/v3/mosip/regproc/install.sh b/deployment/v3/mosip/regproc/install.sh
@@ -37,7 +37,7 @@ function installing_regproc() {
   helm -n $NS install regproc-pktserver mosip/regproc-pktserver --version $CHART_VERSION
 
   echo Installing group1
-  helm -n $NS install regproc-group1 mosip/regproc-group1 -f group1_values.yaml --version $CHART_VERSION
+  helm -n $NS install regproc-group1 mosip/regproc-group1 --version $CHART_VERSION
 
   echo Installing group2
   helm -n $NS install regproc-group2 mosip/regproc-group2  --version $CHART_VERSION

diff --git a/deployment/v3/mosip/websub/install.sh b/deployment/v3/mosip/websub/install.sh
@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 NS=websub
-CHART_VERSION=12.0.1
+CHART_VERSION=0.0.1-develop
 
 echo Create $NS namespace
 kubectl create ns $NS

diff --git a/deployment/v3/testrig/dslrig/install.sh b/deployment/v3/testrig/dslrig/install.sh
@@ -43,7 +43,7 @@ function installing_dslrig() {
     ENABLE_INSECURE='--set enable_insecure=true';
   fi
 
-  read -p "Please provide packet Utility Base URL (eg: https://<host>:<port>/v1/packetcreator) : " packetUtilityBaseUrl
+  read -p "Please provide packet Utility Base URL (eg: http://<host>:<port>/v1/packetcreator) : " packetUtilityBaseUrl
 
   if [ -z $packetUtilityBaseUrl ]; then
     echo "Packet utility Base URL not provided; EXITING;"