diff --git a/.github/workflows/chart-lint-publish.yml b/.github/workflows/chart-lint-publish.yml index 878861a9d6..c8d6ba3bd3 100644 --- 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 index 5bd6f99acc..776a4376fd 100755 --- 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=pms + 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 @@ -18,4 +21,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 -copying_cm # calling function \ No newline at end of file +copying_cm # calling function diff --git a/deploy/copy_cm_func.sh b/deploy/copy_cm_func.sh deleted file mode 100755 index 185ae3e5f4..0000000000 --- a/deploy/copy_cm_func.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# 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/deploy/delete.sh b/deploy/delete.sh index 6d480a977d..46b445a595 100755 --- a/deploy/delete.sh +++ b/deploy/delete.sh @@ -14,7 +14,6 @@ function deleting_pms() { then helm -n $NS delete pms-partner helm -n $NS delete pms-policy - helm -n $NS delete pmp-ui break else break @@ -29,4 +28,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_pms # calling function \ No newline at end of file +deleting_pms # calling function diff --git a/deploy/install.sh b/deploy/install.sh index 29cbdff34c..ed465a88be 100755 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -7,8 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=pms -CHART_VERSION=12.1.0 -PMP_UI_CHART_VERSION=12.0.1 +CHART_VERSION=12.1.0-develop API_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-api-internal-host}) PMP_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-pmp-host}) @@ -34,14 +33,10 @@ function installing_pms() { echo Installing policy manager helm -n $NS install pms-policy mosip/pms-policy --set istio.corsPolicy.allowOrigins\[0\].prefix=https://$PMP_HOST --version $CHART_VERSION - echo Installing pmp-ui - helm -n $NS install pmp-ui mosip/pmp-ui --set pmp.apiUrl=https://$INTERNAL_API_HOST/ --set istio.hosts=["$PMP_HOST"] --version $PMP_UI_CHART_VERSION - kubectl -n $NS get deploy -o name | xargs -n1 -t kubectl -n $NS rollout status echo Installed pms services - echo "Admin portal URL: https://$PMP_HOST/pmp-ui/" return 0 } diff --git a/helm/pms-partner/.gitignore b/helm/pms-partner/.gitignore index ee3892e879..b3c94bf643 100644 --- a/helm/pms-partner/.gitignore +++ b/helm/pms-partner/.gitignore @@ -1 +1,2 @@ charts/ +Charts.lock diff --git a/helm/pms-partner/Chart.yaml b/helm/pms-partner/Chart.yaml index d007f8e974..5b902535bd 100644 --- a/helm/pms-partner/Chart.yaml +++ b/helm/pms-partner/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: pms-partner description: A Helm chart for MOSIP Partner Management Service Partner service type: application -version: 12.1.0 +version: 12.1.0-develop appVersion: "" dependencies: - name: common diff --git a/helm/pms-policy/.gitignore b/helm/pms-policy/.gitignore index ee3892e879..b3c94bf643 100644 --- a/helm/pms-policy/.gitignore +++ b/helm/pms-policy/.gitignore @@ -1 +1,2 @@ charts/ +Charts.lock diff --git a/helm/pms-policy/Chart.yaml b/helm/pms-policy/Chart.yaml index af803a9056..72479f4fcd 100644 --- a/helm/pms-policy/Chart.yaml +++ b/helm/pms-policy/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: pms-policy description: A Helm chart for MOSIP Packetmanager module type: application -version: 12.1.0 +version: 12.1.0-develop appVersion: "" dependencies: - name: common