diff --git a/.github/workflows/chart-lint-publish.yml b/.github/workflows/chart-lint-publish.yml index 878861a9..c8d6ba3b 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 ed5e8d6f..92a2db2d 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=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 deleted file mode 100755 index 7b225948..00000000 --- a/deploy/copy_cm_func.sh +++ /dev/null @@ -1,33 +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/deploy/copy_secrets.sh b/deploy/copy_secrets.sh index 38a3e0ae..0496d42f 100755 --- 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/install.sh b/deploy/install.sh index 20581706..1b489710 100755 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=resident -RESIDENT_UI_CHART_VERSION=0.9.0 +RESIDENT_UI_CHART_VERSION=0.9.0-develop echo Create $NS namespace kubectl create ns $NS diff --git a/helm/resident-ui/.gitignore b/helm/resident-ui/.gitignore new file mode 100644 index 00000000..e508fa59 --- /dev/null +++ b/helm/resident-ui/.gitignore @@ -0,0 +1,2 @@ +chart/ +Chart.lock diff --git a/helm/resident-ui/Chart.yaml b/helm/resident-ui/Chart.yaml index bc21faa7..e0bff322 100644 --- a/helm/resident-ui/Chart.yaml +++ b/helm/resident-ui/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: resident-ui description: A Helm chart for resident-ui type: application -version: 0.9.0 +version: 0.9.0-develop appVersion: "" dependencies: - name: common