Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MOSIP-34233] #1293

Merged
merged 3 commits into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/chart-lint-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,9 @@ on:
- 1.*
- 0.*
- develop
- MOSIP*
- release*
paths:
- './helm/**'
- 'helm/**'

jobs:
chart-lint-publish:
Expand All @@ -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 }}
3 changes: 3 additions & 0 deletions deploy/copy_cm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 0 additions & 33 deletions deploy/copy_cm_func.sh

This file was deleted.

3 changes: 3 additions & 0 deletions deploy/copy_secrets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 1 addition & 3 deletions deploy/delete.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions deploy/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions helm/resident/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
charts/
Charts.lock
2 changes: 1 addition & 1 deletion helm/resident/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading