diff --git a/deployment/v3/mosip/captcha/copy_cm.sh b/deployment/v3/mosip/captcha/copy_cm.sh index a7c785c7e..e26965959 100755 --- a/deployment/v3/mosip/captcha/copy_cm.sh +++ b/deployment/v3/mosip/captcha/copy_cm.sh @@ -3,9 +3,11 @@ # DST_NS: Destination namespace function copying_cm() { - COPY_UTIL=./copy_cm_func.sh + COPY_UTIL=../../utils/copy_cm_func.sh + DST_NS=captcha # DST_NS: Destination namespace - $COPY_UTIL secret mosip-captcha captcha config-server + $COPY_UTIL configmap artifactory-share artifactory $DST_NS + $COPY_UTIL configmap config-server-share config-server $DST_NS return 0 } diff --git a/deployment/v3/mosip/captcha/copy_cm_func.sh b/deployment/v3/mosip/captcha/copy_cm_func.sh deleted file mode 100755 index 1bbad7126..000000000 --- a/deployment/v3/mosip/captcha/copy_cm_func.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# Copy configmap and secret from one namespace to another. -# ./copy_cm_func.sh [name] -# Parameters: -# resource: configmap|secret -# name: Optional new name of the configmap or secret in destination namespace. This may be needed if there is -# clash of names - -if [ $1 = "configmap" ] -then - RESOURCE=configmap -elif [ $1 = "secret" ] -then - RESOURCE=secret -else - echo "Incorrect resource $1. Exiting.." - exit 1 -fi - - -if [ $# -ge 5 ] -then - kubectl -n $4 delete --ignore-not-found=true $RESOURCE $5 - kubectl -n $3 get $RESOURCE $2 -o yaml | sed "s/namespace: $3/namespace: $4/g" | sed "s/name: $2/name: $5/g" | kubectl -n $4 create -f - -else - kubectl -n $4 delete --ignore-not-found=true $RESOURCE $2 - kubectl -n $3 get $RESOURCE $2 -o yaml | sed "s/namespace: $3/namespace: $4/g" | kubectl -n $4 create -f - -fi - - - - diff --git a/deployment/v3/mosip/captcha/install.sh b/deployment/v3/mosip/captcha/install.sh index 5787e1c3f..3cbcf222e 100755 --- a/deployment/v3/mosip/captcha/install.sh +++ b/deployment/v3/mosip/captcha/install.sh @@ -30,6 +30,10 @@ function installing_captcha() { kubectl label ns $NS istio-injection=disabled --overwrite helm repo update + echo Copy configmaps + sed -i 's/\r$//' copy_cm.sh + ./copy_cm.sh + while true; do read -p "Is Prometheus Service Monitor Operator deployed in the k8s cluster? (y/n): " response if [[ "$response" == "y" || "$response" == "Y" ]]; then diff --git a/deployment/v3/mosip/regclient/create-signing-certs.sh b/deployment/v3/mosip/regclient/create-signing-certs.sh old mode 100644 new mode 100755