From 4ccab7d549df423ca378516df229dd6456986941 Mon Sep 17 00:00:00 2001 From: Piyush7034 <47858366+Piyush7034@users.noreply.github.com> Date: Wed, 25 Sep 2024 14:52:57 +0530 Subject: [PATCH 1/3] Added upgrade db scripts sql for upgrade to 0.9.1 (#95) Signed-off-by: Harsh Vardhan --- db_upgrade_script/mosip_certify/sql/0.9.0_to_0.9.1_rollback.sql | 1 + db_upgrade_script/mosip_certify/sql/0.9.0_to_0.9.1_upgrade.sql | 1 + 2 files changed, 2 insertions(+) create mode 100644 db_upgrade_script/mosip_certify/sql/0.9.0_to_0.9.1_rollback.sql create mode 100644 db_upgrade_script/mosip_certify/sql/0.9.0_to_0.9.1_upgrade.sql diff --git a/db_upgrade_script/mosip_certify/sql/0.9.0_to_0.9.1_rollback.sql b/db_upgrade_script/mosip_certify/sql/0.9.0_to_0.9.1_rollback.sql new file mode 100644 index 00000000..1a2e0a41 --- /dev/null +++ b/db_upgrade_script/mosip_certify/sql/0.9.0_to_0.9.1_rollback.sql @@ -0,0 +1 @@ +\echo 'Rollback Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION' \ No newline at end of file diff --git a/db_upgrade_script/mosip_certify/sql/0.9.0_to_0.9.1_upgrade.sql b/db_upgrade_script/mosip_certify/sql/0.9.0_to_0.9.1_upgrade.sql new file mode 100644 index 00000000..381e2be1 --- /dev/null +++ b/db_upgrade_script/mosip_certify/sql/0.9.0_to_0.9.1_upgrade.sql @@ -0,0 +1 @@ +\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION' \ No newline at end of file From 7bef900c80a48e250002e448f76c82c21bc0fd6e Mon Sep 17 00:00:00 2001 From: Harsh Vardhan Date: Tue, 8 Oct 2024 14:44:51 +0530 Subject: [PATCH 2/3] [INJICERT-444] add DevOps specific release changes to develop Signed-off-by: Harsh Vardhan --- README.md | 2 +- helm/inji-certify/Chart.yaml | 2 +- helm/inji-certify/copy_cm.sh | 4 ++-- helm/inji-certify/install.sh | 8 ++++---- helm/inji-certify/values.yaml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index aebd148f..f1fe723d 100644 --- a/README.md +++ b/README.md @@ -208,4 +208,4 @@ Execute installation script * [Credential service, Credential schema service & Identity service](https://github.com/Sunbird-RC/devops/tree/main/deploy-as-code/helm/v2) * [Vault](https://github.com/challabeehyv/sunbird-devops/blob/main/deploy-as-code/helm/v2/README.md#vault-deployment) * [Esignet](https://github.com/mosip/esignet/tree/v1.4.1/helm) - * [Certify](https://github.com/mosip/inji-certify/tree/v0.9.0/helm/inji-certify) + * [Certify](https://github.com/mosip/inji-certify/tree/v0.9.1/helm/inji-certify) diff --git a/helm/inji-certify/Chart.yaml b/helm/inji-certify/Chart.yaml index 3804b499..d85424f6 100644 --- a/helm/inji-certify/Chart.yaml +++ b/helm/inji-certify/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: inji-certify description: A Helm chart for MOSIP inji-certify module type: application -version: 0.9.0-develop +version: 0.10.0-develop appVersion: "" dependencies: - name: common diff --git a/helm/inji-certify/copy_cm.sh b/helm/inji-certify/copy_cm.sh index 3b77f80f..2beacdec 100755 --- a/helm/inji-certify/copy_cm.sh +++ b/helm/inji-certify/copy_cm.sh @@ -8,7 +8,7 @@ function copying_cm() { $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 + $COPY_UTIL configmap inji-server-share config-server $DST_NS $COPY_UTIL configmap softhsm-certify-share softhsm $DST_NS return 0 } @@ -19,4 +19,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/helm/inji-certify/install.sh b/helm/inji-certify/install.sh index 57f2d695..04f15190 100755 --- a/helm/inji-certify/install.sh +++ b/helm/inji-certify/install.sh @@ -13,7 +13,7 @@ echo Create $SOFTHSM_NS namespace kubectl create ns $SOFTHSM_NS NS=inji-certify -CHART_VERSION=0.9.0-develop +CHART_VERSION=0.10.0-develop echo Create $NS namespace kubectl create ns $NS @@ -35,8 +35,8 @@ function installing_inji-certify() { echo Copy secrets ./copy_cm_func.sh secret softhsm-certify softhsm config-server - kubectl -n config-server set env --keys=mosip-injicertify-host --from configmap/global deployment/config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_ - kubectl -n config-server set env --keys=security-pin --from secret/softhsm-certify deployment/config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_SOFTHSM_CERTIFY_ + kubectl -n config-server set env --keys=mosip-injicertify-host --from configmap/global deployment/inji-config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_ + kubectl -n config-server set env --keys=security-pin --from secret/softhsm-certify deployment/inji-config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_SOFTHSM_CERTIFY_ kubectl -n config-server get deploy -o name | xargs -n1 -t kubectl -n config-server rollout status echo Copy configmaps @@ -59,7 +59,7 @@ function installing_inji-certify() { fi echo Running inji-certify - helm -n $NS install inji-certify mosip/inji-certify --set image.repository=mosipqa/inji-certify --set image.tag=0.9.x --set istio.hosts\[0\]=$INJICERTIFY_HOST --version $CHART_VERSION $ENABLE_INSECURE + helm -n $NS install inji-certify mosip/inji-certify --set istio.hosts\[0\]=$INJICERTIFY_HOST --version $CHART_VERSION $ENABLE_INSECURE kubectl -n $NS get deploy -o name | xargs -n1 -t kubectl -n $NS rollout status diff --git a/helm/inji-certify/values.yaml b/helm/inji-certify/values.yaml index 41429770..672e33eb 100644 --- a/helm/inji-certify/values.yaml +++ b/helm/inji-certify/values.yaml @@ -53,7 +53,7 @@ service: image: registry: docker.io repository: mosipid/inji-certify - tag: 0.9.0 + tag: 0.10.0 ## 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 @@ -248,7 +248,7 @@ extraEnvVarsCM: - global - inji-config-server-share - artifactory-share - - softhsm-certitfy-share + - softhsm-certify-share ## Secret with extra environment variables ## From 638dd956a802e389795b4b2bb353d643c9211044 Mon Sep 17 00:00:00 2001 From: Harsh Vardhan Date: Tue, 8 Oct 2024 14:45:42 +0530 Subject: [PATCH 3/3] [INJICERT-444] update artifacts to point to 0.10.0-SNAPSHOT for next release Signed-off-by: Harsh Vardhan --- certify-core/pom.xml | 2 +- certify-integration-api/pom.xml | 2 +- certify-service/pom.xml | 4 ++-- .../config/esignet-sunbird-insurance.properties | 1 + docker-compose/docker-compose-certify/docker-compose.yml | 4 ++-- pom.xml | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/certify-core/pom.xml b/certify-core/pom.xml index 65d1a509..93a6c4fb 100644 --- a/certify-core/pom.xml +++ b/certify-core/pom.xml @@ -10,7 +10,7 @@ io.mosip.certify certify-parent - 0.9.2-SNAPSHOT + 0.10.0-SNAPSHOT io.mosip.certify diff --git a/certify-integration-api/pom.xml b/certify-integration-api/pom.xml index c3f90618..ff6fcbde 100644 --- a/certify-integration-api/pom.xml +++ b/certify-integration-api/pom.xml @@ -6,7 +6,7 @@ io.mosip.certify certify-parent - 0.9.2-SNAPSHOT + 0.10.0-SNAPSHOT io.mosip.certify diff --git a/certify-service/pom.xml b/certify-service/pom.xml index 16285426..0314ef45 100644 --- a/certify-service/pom.xml +++ b/certify-service/pom.xml @@ -9,12 +9,12 @@ io.mosip.certify certify-parent - 0.9.2-SNAPSHOT + 0.10.0-SNAPSHOT io.mosip.certify certify-service - 0.9.2-SNAPSHOT + 0.10.0-SNAPSHOT certify-service certify vci service diff --git a/docker-compose/docker-compose-certify/config/esignet-sunbird-insurance.properties b/docker-compose/docker-compose-certify/config/esignet-sunbird-insurance.properties index 5821388c..0b5328bf 100644 --- a/docker-compose/docker-compose-certify/config/esignet-sunbird-insurance.properties +++ b/docker-compose/docker-compose-certify/config/esignet-sunbird-insurance.properties @@ -2,6 +2,7 @@ # ------------------------------------------- Integrations ------------------------------------------------------------ mosip.esignet.integration.scan-base-package=io.mosip.esignet.sunbirdrc.integration mosip.esignet.integration.authenticator=SunbirdRCAuthenticationService +# this is a temporary workaround to circumvent eSignet crash, will get removed once eSignet removes VCI mosip.esignet.integration.vci-plugin=MockVCIssuancePlugin mosip.esignet.integration.key-binder=MockKeyBindingWrapperService mosip.esignet.integration.audit-plugin=LoggerAuditService diff --git a/docker-compose/docker-compose-certify/docker-compose.yml b/docker-compose/docker-compose-certify/docker-compose.yml index 7ad339c1..78715926 100644 --- a/docker-compose/docker-compose-certify/docker-compose.yml +++ b/docker-compose/docker-compose-certify/docker-compose.yml @@ -15,7 +15,7 @@ services: networks: - network artifactory-server: - image: 'mosipqa/artifactory-server:0.9.1-INJI' + image: 'mosipid/artifactory-server:0.9.1-INJI' ports: - 8080:8080 networks: @@ -94,7 +94,7 @@ services: networks: - network certify: - image: mosipqa/inji-certify:0.9.x + image: mosipid/inji-certify:0.9.1 user: root ports: - 8090:8090 diff --git a/pom.xml b/pom.xml index 216d46d9..68c97a0e 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 4.0.0 io.mosip.certify certify-parent - 0.9.2-SNAPSHOT + 0.10.0-SNAPSHOT pom certify Parent project for MOSIP certify