Merge pull request #131 from syedsalman3753/develop

[MOSIP-29204] Fixed secret empty issue
mosip · Oct 11, 2023 · a1cac19 · a1cac19
2 parents 2631369 + 01d3ccc
commit a1cac19
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/helm/mimoto/install.sh b/helm/mimoto/install.sh
@@ -40,22 +40,19 @@ function installing_mimoto() {
     ENABLE_INSECURE='--set enable_insecure=true';
   fi
 
-  echo Setting up dummy values for Mimoto Wallet Binding api key and Mimoto OIDC Partner Client ID
-  kubectl -n $NS create secret generic mimoto-wallet-binding-partner-api-key --from-literal=mimoto-wallet-binding-partner-api-key='' --dry-run=client -o yaml | kubectl apply -f -
+  echo  "Copy secrets to config-server namespace"
   ./copy_cm_func.sh secret mimoto-wallet-binding-partner-api-key mimoto config-server
-  kubectl -n $NS create secret generic mimoto-oidc-partner-clientid --from-literal=mimoto-oidc-partner-clientid='' --dry-run=client -o yaml | kubectl apply -f -
   ./copy_cm_func.sh secret mimoto-oidc-partner-clientid mimoto config-server
 
   echo Updating mimoto-oidc-keystore-password value
-  kubectl -n $NS create secret generic mimoto-oidc-keystore-password --from-literal=mimoto-oidc-keystore-password='' --dry-run=client -o yaml | kubectl apply -f -
   ./copy_cm_func.sh secret mimoto-oidc-keystore-password mimoto config-server
 
   kubectl -n config-server set env --keys=mimoto-wallet-binding-partner-api-key --from secret/mimoto-wallet-binding-partner-api-key deployment/config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_
   kubectl -n config-server set env --keys=mimoto-oidc-partner-clientid --from secret/mimoto-oidc-partner-clientid deployment/config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_
   kubectl -n config-server set env --keys=mimoto-oidc-keystore-password --from secret/mimoto-oidc-keystore-password deployment/config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_
 
   kubectl -n config-server rollout restart deployment config-server
-  kubectl -n config-server get deploy -o name |  xargs -n1 -t  kubectl -n config-server rollout status
+  kubectl -n config-server rollout status deployment config-server
 
   echo Installing mimoto
   helm -n $NS install mimoto mosip/mimoto --version $MIMOTO_CHART_VERSION $ENABLE_INSECURE

diff --git a/partner-onboarder/delete.sh b/partner-onboarder/delete.sh
@@ -11,8 +11,8 @@ function deleting_onboarder() {
   while true; do
       read -p "Are you sure you want to delete all partner-onboarder ?(Y/n) " yn
       if [ $yn = "Y" ]; then
-        echo Deleting mimoto-keybinding-partner-onboarder helm
-        helm -n $NS delete mimoto-keybinding-partner-onboarder
+        echo Deleting mimoto-partner-onboarder helm
+        helm -n $NS delete mimoto-partner-onboarder
         break
       fi
   done

diff --git a/partner-onboarder/install.sh b/partner-onboarder/install.sh
@@ -88,10 +88,8 @@ function installing_onboarder() {
     kubectl -n config-server set env --keys=mimoto-oidc-partner-clientid --from secret/mimoto-oidc-partner-clientid deployment/config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_
     kubectl -n config-server set env --keys=mimoto-oidc-keystore-password --from secret/mimoto-oidc-keystore-password deployment/config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_
 
-    kubectl -n config-server get deploy -o name |  xargs -n1 -t  kubectl -n config-server rollout status
-
     kubectl -n config-server rollout restart deployment config-server
-    kubectl -n mimoto rollout restart deployment mimoto
+    kubectl -n config-server rollout status deployment config-server
 
     echo Reports are moved to S3 under onboarder bucket
     return 0