Skip to content

Commit

Permalink
Merge pull request #106 from vharsh/injicert-444
Browse files Browse the repository at this point in the history
[INJICERT-444] add pending devops specific changes & prep-up for 0.10.0 release
  • Loading branch information
jainhitesh9998 authored Oct 8, 2024
2 parents dc54da4 + 638dd95 commit 3efa557
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 17 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion certify-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.mosip.certify</groupId>
<artifactId>certify-parent</artifactId>
<version>0.9.2-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<groupId>io.mosip.certify</groupId>
Expand Down
2 changes: 1 addition & 1 deletion certify-integration-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.mosip.certify</groupId>
<artifactId>certify-parent</artifactId>
<version>0.9.2-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<groupId>io.mosip.certify</groupId>
Expand Down
4 changes: 2 additions & 2 deletions certify-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<parent>
<groupId>io.mosip.certify</groupId>
<artifactId>certify-parent</artifactId>
<version>0.9.2-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<groupId>io.mosip.certify</groupId>
<artifactId>certify-service</artifactId>
<version>0.9.2-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
<name>certify-service</name>
<description>certify vci service</description>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
\echo 'Rollback Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION'
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/docker-compose-certify/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm/inji-certify/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions helm/inji-certify/copy_cm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
copying_cm # calling function
8 changes: 4 additions & 4 deletions helm/inji-certify/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions helm/inji-certify/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -248,7 +248,7 @@ extraEnvVarsCM:
- global
- inji-config-server-share
- artifactory-share
- softhsm-certitfy-share
- softhsm-certify-share

## Secret with extra environment variables
##
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.mosip.certify</groupId>
<artifactId>certify-parent</artifactId>
<version>0.9.2-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>certify</name>
<description>Parent project for MOSIP certify</description>
Expand Down

0 comments on commit 3efa557

Please sign in to comment.