diff --git a/deploy/install.sh b/deploy/install.sh index e5e1962a5da..c25e650bc3b 100755 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=regclient -CHART_VERSION=12.0.2-develop +CHART_VERSION=12.0.3-develop echo Create $NS namespace kubectl create ns $NS @@ -17,6 +17,12 @@ function installing_regclient() { kubectl label ns $NS istio-injection=enabled --overwrite helm repo update + read -p "Is values.yaml for regclinet chart set correctly as part of Pre-requisites?(Y/n) " yn + if [[ "$yn" != "Y" ]]; then + echo "ERROR: values.yaml not set correctly; EXITING." + exit 1 + fi + echo Copy configmaps sed -i 's/\r$//' copy_cm.sh ./copy_cm.sh @@ -26,7 +32,7 @@ function installing_regclient() { HEALTH_URL=https://$INTERNAL_HOST/v1/syncdata/actuator/health echo Installing reg client downloader. This may take a few minutes .. - helm -n $NS install regclient mosip/regclient \ + helm -n $NS install regclient mosip/regclient -f values.yaml \ --set regclient.upgradeServerUrl=https://$REGCLIENT_HOST \ --set regclient.healthCheckUrl=$HEALTH_URL \ --set regclient.hostName=$INTERNAL_HOST \ diff --git a/deploy/values.yaml b/deploy/values.yaml index 832ea02b49a..ff7735dc3b4 100644 --- a/deploy/values.yaml +++ b/deploy/values.yaml @@ -1,24 +1,6 @@ +regclient: + version: 1.2.0.3-SNAPSHOT image: registry: docker.io - repository: mosipqa/registration-client - tag: 1.2.0.1 - ## Specify a imagePullPolicy - ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' - ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images - ## - pullPolicy: Always - ## Optionally specify an array of imagePullSecrets. - ## Secrets must be manually created in the namespace. - ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - ## - # pullSecrets: - # - myRegistryKeySecretName - -regclient: - version: 1.2.0.1-SNAPSHOT - mountDir: /home/mosip/build_files/ - ## Currently this is hardcoded. Will change in the future - cryptoKey: bBQX230Wskq6XpoZ1c+Ep1D+znxfT89NxLQ7P4KFkc4= - upgradeServerUrl: https://regclient.sandbox.xzy.net - ## Here we check the health of syncdata service. The service must be accessible over internal channel. - healthCheckUrl: http://api-internal.sandbox.v3box1.net/v1/syncdata/actuator/health + repository: mosipdev/registration-client + tag: 1.2.0.x diff --git a/helm/regclient/Chart.yaml b/helm/regclient/Chart.yaml index 99f297e9fd4..55b15261117 100644 --- a/helm/regclient/Chart.yaml +++ b/helm/regclient/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: regclient description: A Helm chart to installed Downloader for Regstration Client Application type: application -version: 12.0.2-develop +version: 12.0.3-develop appVersion: "" dependencies: - name: common diff --git a/helm/regclient/values.yaml b/helm/regclient/values.yaml index d7f91545880..4aa397da1c6 100644 --- a/helm/regclient/values.yaml +++ b/helm/regclient/values.yaml @@ -51,8 +51,8 @@ service: image: registry: docker.io - repository: mosipid/registration-client - tag: 1.2.0.2 + repository: mosipqa/registration-client + tag: 1.2.0.x ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -67,14 +67,14 @@ image: job: name: keystorejob registry: docker.io - image: mosipdev/regclient-keystore + image: mosipqa/regclient-keystore tag: 1.2.0.x pullPolicy: Always rolename: keystorerole rolebindingname: keystorerolebinding regclient: - version: 1.2.0.2 + version: 1.2.0.3-SNAPSHOT mountDir: /home/mosip/build_files/ upgradeServerUrl: https://regclient.sandbox.xzy.net hostName: https://api-internal.sandbox.mosip.net diff --git a/registration/pom.xml b/registration/pom.xml index 44a492bdc6e..8123d993e8a 100644 --- a/registration/pom.xml +++ b/registration/pom.xml @@ -7,11 +7,11 @@ io.mosip.registration - 1.2.0.2 + 1.2.0.3-SNAPSHOT registration-client-parent pom MOSIP Registration Client @@ -629,3 +629,4 @@ + diff --git a/registration/registration-test/pom.xml b/registration/registration-test/pom.xml index 4ae36d84cf6..b516248b006 100644 --- a/registration/registration-test/pom.xml +++ b/registration/registration-test/pom.xml @@ -3,12 +3,12 @@ io.mosip.registration registration-client-parent - 1.2.0.2 + 1.2.0.3-SNAPSHOT registration-test registration-test Maven project of MOSIP Registration Test - 1.2.0.2 + 1.2.0.3-SNAPSHOT 11 @@ -66,7 +66,7 @@ io.mosip.registration registration-client - 1.2.0.2 + 1.2.0.3-SNAPSHOT provided