Merge pull request #1293 from ckm007/release-1.2.1.x

[MOSIP-34233]
mosip · Jul 18, 2024 · 5eaa496 · 5eaa496
2 parents 8ca4075 + 1fdfdf6
commit 5eaa496
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 41 deletions.
diff --git a/.github/workflows/chart-lint-publish.yml b/.github/workflows/chart-lint-publish.yml
@@ -37,10 +37,9 @@ on:
       - 1.*
       - 0.*
       - develop
-      - MOSIP*
       - release*
     paths:
-      - './helm/**'
+      - 'helm/**'
 
 jobs:
   chart-lint-publish:
@@ -57,6 +56,7 @@ jobs:
       LINTING_LINTCONF_YAML_URL: "https://raw.githubusercontent.com/mosip/kattu/master/.github/helm-lint-configs/lintconf.yaml"
       LINTING_CHART_TESTING_CONFIG_YAML_URL: "https://raw.githubusercontent.com/mosip/kattu/master/.github/helm-lint-configs/chart-testing-config.yaml"
       LINTING_HEALTH_CHECK_SCHEMA_YAML_URL: "https://raw.githubusercontent.com/mosip/kattu/master/.github/helm-lint-configs/health-check-schema.yaml"
+      DEPENDENCIES: "mosip,https://mosip.github.io/mosip-helm;"
     secrets:
       TOKEN: ${{ secrets.ACTION_PAT }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/deploy/copy_cm.sh b/deploy/copy_cm.sh
@@ -3,9 +3,12 @@
 # DST_NS: Destination namespace
 
 function copying_cm() {
+  UTIL_URL=https://github.com/mosip/mosip-infra/blob/master/deployment/v3/utils/copy_cm_func.sh
   COPY_UTIL=./copy_cm_func.sh
   DST_NS=resident
 
+  wget -q $UTIL_URL -O copy_cm_func.sh && chmod +x copy_cm_func.sh
+
   $COPY_UTIL configmap global default $DST_NS
   $COPY_UTIL configmap artifactory-share artifactory $DST_NS
   $COPY_UTIL configmap config-server-share config-server $DST_NS

diff --git a/deploy/copy_cm_func.sh b/deploy/copy_cm_func.sh
diff --git a/deploy/copy_secrets.sh b/deploy/copy_secrets.sh
@@ -3,9 +3,12 @@
 # DST_NS: Destination namespace
 
 function copying_secrets() {
+  UTIL_URL=https://github.com/mosip/mosip-infra/blob/master/deployment/v3/utils/copy_cm_func.sh
   COPY_UTIL=./copy_cm_func.sh
   DST_NS=resident
 
+  wget -q $UTIL_URL -O copy_cm_func.sh && chmod +x copy_cm_func.sh
+
   $COPY_UTIL secret keycloak-client-secrets keycloak $DST_NS
   return 0
 }

diff --git a/deploy/delete.sh b/deploy/delete.sh
@@ -8,8 +8,6 @@ function deleting_resident() {
       if [ $yn = "Y" ]
         then
           helm -n $NS delete resident
-          helm -n $NS delete mimoto
-          helm -n $NS delete resident-ui
           break
         else
           break
@@ -24,4 +22,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 uninitialised variable
 set -o errtrace  # trace ERR through 'time command' and other functions
 set -o pipefail  # trace ERR through pipes
-deleting_resident   # calling function
+deleting_resident   # calling function
diff --git a/deploy/install.sh b/deploy/install.sh
@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 NS=resident
-CHART_VERSION=12.1.0
+CHART_VERSION=12.1.0-develop
 
 echo Create $NS namespace
 kubectl create ns $NS
@@ -24,7 +24,7 @@ function installing_resident() {
   echo Copy secrets
   sed -i 's/\r$//' copy_secrets.sh
   ./copy_secrets.sh
-  
+
   echo Setting up dummy values for Resident OIDC Client ID
   kubectl create secret generic resident-oidc-onboarder-key -n $NS --from-literal=resident-oidc-clientid='' --dry-run=client -o yaml | kubectl apply -f -
   ./copy_cm_func.sh secret resident-oidc-onboarder-key resident config-server

diff --git a/helm/resident/.gitignore b/helm/resident/.gitignore
@@ -1 +1,2 @@
 charts/
+Charts.lock
diff --git a/helm/resident/Chart.yaml b/helm/resident/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: resident
 description: A Helm chart for MOSIP Resident service
 type: application
-version: 12.1.0
+version: 12.1.0-develop
 appVersion: ""
 dependencies:
   - name: common