From ecf2d7c7c553cf4a0b68a4123086ff74917af728 Mon Sep 17 00:00:00 2001 From: Prafulrakhade <99539100+Prafulrakhade@users.noreply.github.com> Date: Fri, 31 Jan 2025 10:38:33 +0000 Subject: [PATCH 1/4] Updated chart versions, image and tag for release changes Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- deploy/chart/istio-addons/Chart.yaml | 2 +- helm/masterdata-loader/Chart.yaml | 2 +- helm/masterdata-loader/values.yaml | 52 ++++++++------------- helm/postgres-init/Chart.yaml | 2 +- helm/postgres-init/values.yaml | 69 ++++++++-------------------- helm/postgres-upgrade/Chart.yaml | 2 +- helm/postgres-upgrade/values.yaml | 52 ++++++++------------- 7 files changed, 64 insertions(+), 117 deletions(-) diff --git a/deploy/chart/istio-addons/Chart.yaml b/deploy/chart/istio-addons/Chart.yaml index 9dd1488..2d7c7cf 100644 --- a/deploy/chart/istio-addons/Chart.yaml +++ b/deploy/chart/istio-addons/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 12.0.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/helm/masterdata-loader/Chart.yaml b/helm/masterdata-loader/Chart.yaml index a1119bf..c085de1 100644 --- a/helm/masterdata-loader/Chart.yaml +++ b/helm/masterdata-loader/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: masterdata-loader description: A Helm chart to upload default masterdata to mosip_master DB. type: application -version: 12.0.1-develop +version: 12.0.2 appVersion: 1.2.0 dependencies: - name: common diff --git a/helm/masterdata-loader/values.yaml b/helm/masterdata-loader/values.yaml index c2e3cd7..18c56f3 100644 --- a/helm/masterdata-loader/values.yaml +++ b/helm/masterdata-loader/values.yaml @@ -3,17 +3,14 @@ # Declare variables to be passed into your templates. replicaCount: 1 - image: repository: mosipid/masterdata-loader pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: 1.2.0.1 - + tag: 1.2.0.2 imagePullSecrets: [] nameOverride: "" fullnameOverride: "" - serviceAccount: # Specifies whether a service account should be created create: true @@ -22,29 +19,26 @@ serviceAccount: # The name of the service account to use. # If not set and create is true, a name is generated using the fullname template name: "" - jobAnnotations: {} - jobSecurityContext: {} - # fsGroup: 2000 +# fsGroup: 2000 securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 +# capabilities: +# drop: +# - ALL +# readOnlyRootFilesystem: true +# runAsNonRoot: true +# runAsUser: 1000 service: type: ClusterIP port: 80 - ingress: enabled: false annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" hosts: - host: chart-example.local paths: [] @@ -52,29 +46,24 @@ ingress: # - secretName: chart-example-tls # hosts: # - chart-example.local - resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi +# We usually recommend not to specify default resources and to leave this as a conscious +# choice for the user. This also increases chances charts run on environments with little +# resources, such as Minikube. If you do want to specify resources, uncomment the following +# lines, adjust them as necessary, and remove the curly braces after 'resources:'. +# limits: +# cpu: 100m +# memory: 128Mi +# requests: +# cpu: 100m +# memory: 128Mi ## "backoff" strategy - It is used when dealing with resources that are retrying or recovering from failures. ## backoffLimit: 0 - nodeSelector: {} - tolerations: [] - affinity: {} - db: host: "postgres-postgresql.postgres" port: 5432 @@ -82,5 +71,4 @@ db: secret: name: db-common-secrets key: db-dbuser-password - mosipDataGithubBranch: 1.2.0.1-B1 diff --git a/helm/postgres-init/Chart.yaml b/helm/postgres-init/Chart.yaml index 98b1a0d..c40b5aa 100644 --- a/helm/postgres-init/Chart.yaml +++ b/helm/postgres-init/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: postgres-init description: A Helm chart for Kubernetes to initialize various Postgres DBs. type: application -version: 12.0.1-develop +version: 12.0.2 appVersion: 1.2.0 dependencies: - name: common diff --git a/helm/postgres-init/values.yaml b/helm/postgres-init/values.yaml index 190ad4a..e09ee20 100644 --- a/helm/postgres-init/values.yaml +++ b/helm/postgres-init/values.yaml @@ -3,17 +3,14 @@ # Declare variables to be passed into your templates. replicaCount: 1 - image: repository: mosipid/postgres-init pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: 1.2.0.1 - + tag: 1.2.0.2 imagePullSecrets: [] nameOverride: "" fullnameOverride: "" - serviceAccount: # Specifies whether a service account should be created create: true @@ -22,29 +19,26 @@ serviceAccount: # The name of the service account to use. # If not set and create is true, a name is generated using the fullname template name: "" - jobAnnotations: {} - jobSecurityContext: {} - # fsGroup: 2000 +# fsGroup: 2000 securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 +# capabilities: +# drop: +# - ALL +# readOnlyRootFilesystem: true +# runAsNonRoot: true +# runAsUser: 1000 service: type: ClusterIP port: 80 - ingress: enabled: false annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" hosts: - host: chart-example.local paths: [] @@ -52,34 +46,28 @@ ingress: # - secretName: chart-example-tls # hosts: # - chart-example.local - resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi +# We usually recommend not to specify default resources and to leave this as a conscious +# choice for the user. This also increases chances charts run on environments with little +# resources, such as Minikube. If you do want to specify resources, uncomment the following +# lines, adjust them as necessary, and remove the curly braces after 'resources:'. +# limits: +# cpu: 100m +# memory: 128Mi +# requests: +# cpu: 100m +# memory: 128Mi ## "backoff" strategy - It is used when dealing with resources that are retrying or recovering from failures. ## backoffLimit: 0 - nodeSelector: {} - tolerations: [] - affinity: {} - ## Some common set of users are created across all postgres servers with same password. TODO: change this later. ## These user names are currently hardcoded in the sql scripts, so can't change from here. dbUserPasswords: dbuserPassword: "" - ## Superuser secret is required to setup DB. It is assumed that the secret was created while creating ## DB server(s) and is available in the same namespace. ## host: It could be in-cluster service name of postgres if running as pods inside cluster. @@ -87,7 +75,6 @@ dbUserPasswords: ## su.secret.name: Default name 'postgres-postgresql' if you install bitnami postgres within cluster. ## su.secret.key: Default key 'postgres-password' if you install bitnami postgres within cluster. ## dml: whether dml is available to be loaded 0/1. Refer SQL scripts in module repos. - databases: mosip_master: enabled: false @@ -101,7 +88,6 @@ databases: dml: 0 repoUrl: https://github.com/mosip/admin-services.git branch: release-1.2.0.1 - mosip_audit: enabled: false host: "postgres-postgresql" @@ -114,7 +100,6 @@ databases: dml: 0 repoUrl: https://github.com/mosip/audit-manager.git branch: release-1.2.0.1 - mosip_keymgr: enabled: false host: "postgres-postgresql" @@ -127,7 +112,6 @@ databases: dml: 1 repoUrl: https://github.com/mosip/keymanager.git branch: release-1.2.0.1 - mosip_kernel: enabled: false host: "postgres-postgresql" @@ -140,7 +124,6 @@ databases: dml: 0 repoUrl: https://github.com/mosip/commons.git branch: release-1.2.0.1 - mosip_idmap: enabled: false host: "postgres-postgresql" @@ -153,7 +136,6 @@ databases: dml: 0 repoUrl: https://github.com/mosip/id-repository.git branch: release-1.2.0.1 - mosip_prereg: enabled: false host: "postgres-postgresql" @@ -166,7 +148,6 @@ databases: dml: 0 repoUrl: https://github.com/mosip/pre-registration.git branch: release-1.2.0.1 - mosip_idrepo: enabled: false host: "postgres-postgresql" @@ -179,7 +160,6 @@ databases: dml: 0 repoUrl: https://github.com/mosip/id-repository.git branch: release-1.2.0.1 - mosip_ida: enabled: false host: "postgres-postgresql" @@ -192,7 +172,6 @@ databases: dml: 1 repoUrl: https://github.com/mosip/id-authentication.git branch: release-1.2.0.1 - mosip_credential: enabled: false host: "postgres-postgresql" @@ -205,7 +184,6 @@ databases: dml: 0 repoUrl: https://github.com/mosip/id-repository.git branch: release-1.2.0.1 - mosip_regprc: enabled: false host: "postgres-postgresql" @@ -218,7 +196,6 @@ databases: dml: 1 repoUrl: https://github.com/mosip/registration.git branch: release-1.2.0.1 - mosip_pms: enabled: false host: "postgres-postgresql" @@ -234,7 +211,6 @@ databases: dml: 1 repoUrl: https://github.com/mosip/partner-management-services.git branch: release-1.2.0.1 - mosip_hotlist: enabled: false host: "postgres-postgresql" @@ -247,7 +223,6 @@ databases: dml: 0 repoUrl: https://github.com/mosip/admin-services.git branch: release-1.2.0.1 - mosip_resident: enabled: false host: "postgres-postgresql" @@ -260,7 +235,6 @@ databases: dml: 0 repoUrl: https://github.com/mosip/resident-services.git branch: 1.2.0.1-B2 - mosip_toolkit: enabled: false host: "postgres-postgresql" @@ -273,7 +247,6 @@ databases: dml: 0 repoUrl: https://github.com/mosip/mosip-compliance-toolkit.git branch: release-1.x.x - mosip_digitalcard: enabled: false host: "postgres-postgresql" @@ -286,7 +259,6 @@ databases: dml: 0 repoUrl: https://github.com/mosip/digital-card-service.git branch: develop - mosip_esignet: enabled: false host: "postgres-postgresql" @@ -299,7 +271,6 @@ databases: dml: 1 repoUrl: https://github.com/mosip/esignet.git branch: v1.0.0 - mosip_mockidentitysystem: enabled: false host: "postgres-postgresql" diff --git a/helm/postgres-upgrade/Chart.yaml b/helm/postgres-upgrade/Chart.yaml index 62057be..c9754ea 100644 --- a/helm/postgres-upgrade/Chart.yaml +++ b/helm/postgres-upgrade/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: postgres-upgrade description: A Helm chart for Kubernetes to Upgrade various Postgres DBs. type: application -version: 12.0.1-develop +version: 12.0.2 appVersion: "" dependencies: - name: common diff --git a/helm/postgres-upgrade/values.yaml b/helm/postgres-upgrade/values.yaml index ce56f15..e72a933 100644 --- a/helm/postgres-upgrade/values.yaml +++ b/helm/postgres-upgrade/values.yaml @@ -3,17 +3,14 @@ # Declare variables to be passed into your templates. replicaCount: 1 - image: repository: mosipid/postgres-upgrade pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: 1.2.0.1 - + tag: 1.2.0.2 imagePullSecrets: [] nameOverride: "" fullnameOverride: "" - serviceAccount: # Specifies whether a service account should be created create: true @@ -22,29 +19,26 @@ serviceAccount: # The name of the service account to use. # If not set and create is true, a name is generated using the fullname template name: "" - jobAnnotations: {} - jobSecurityContext: {} - # fsGroup: 2000 +# fsGroup: 2000 securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 +# capabilities: +# drop: +# - ALL +# readOnlyRootFilesystem: true +# runAsNonRoot: true +# runAsUser: 1000 service: type: ClusterIP port: 80 - ingress: enabled: false annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" hosts: - host: chart-example.local paths: [] @@ -52,30 +46,25 @@ ingress: # - secretName: chart-example-tls # hosts: # - chart-example.local - resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi +# We usually recommend not to specify default resources and to leave this as a conscious +# choice for the user. This also increases chances charts run on environments with little +# resources, such as Minikube. If you do want to specify resources, uncomment the following +# lines, adjust them as necessary, and remove the curly braces after 'resources:'. +# limits: +# cpu: 100m +# memory: 128Mi +# requests: +# cpu: 100m +# memory: 128Mi nodeSelector: {} - tolerations: [] - affinity: {} - ## Some common set of users are created across all postgres servers with same password. TODO: change this later. ## These user names are currently hardcoded in the sql scripts, so can't change from here. dbUserPasswords: dbuserPassword: "" - ## Superuser secret is required to setup DB. It is assumed that the secret was created while creating ## DB server(s) and is available in the same namespace. ## host: It could be in-cluster service name of postgres if running as pods inside cluster. @@ -83,7 +72,6 @@ dbUserPasswords: ## su.secret.name: Default name 'postgres-postgresql' if you install bitnami postgres within cluster. ## su.secret.key: Default key 'postgres-password' if you install bitnami postgres within cluster. ## dml: whether dml is available to be loaded 0/1. Refer SQL scripts in module repos. - database: enabled: true host: '' From 281b459a4c247879dff6463e9d8f7d749e2dcee6 Mon Sep 17 00:00:00 2001 From: techno-467 Date: Fri, 31 Jan 2025 16:49:41 +0530 Subject: [PATCH 2/4] [DSD-7170] resident portal 0.9.1 release --- deploy/chart/istio-addons/Chart.yaml | 2 +- deploy/masterdata-install.sh | 4 ++-- deploy/postgres-init-values.yaml | 36 +++++++++++++--------------- deploy/postgres-init.sh | 2 +- deploy/postgres-upgrade.csv | 6 +++++ helm/masterdata-loader/values.yaml | 2 +- 6 files changed, 27 insertions(+), 25 deletions(-) diff --git a/deploy/chart/istio-addons/Chart.yaml b/deploy/chart/istio-addons/Chart.yaml index 2d7c7cf..9dd1488 100644 --- a/deploy/chart/istio-addons/Chart.yaml +++ b/deploy/chart/istio-addons/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 12.0.2 +version: 0.1.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/deploy/masterdata-install.sh b/deploy/masterdata-install.sh index 1bbc6e3..7f81d3f 100755 --- a/deploy/masterdata-install.sh +++ b/deploy/masterdata-install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=masterdata-loader -CHART_VERSION=12.0.1-develop +CHART_VERSION=12.0.2 echo WARNING: This need to be executed only once at the begining for masterdata deployment. If reexecuted in a working env this will reset the whole master_data DB tables resulting in data loss. echo Please skip this if masterdata is already uploaded. read -p "CAUTION: Do you still want to continue(Y/n)" yn @@ -34,7 +34,7 @@ if [ $yn = "Y" ] echo Loading masterdata helm -n $NS install masterdata-loader mosip/masterdata-loader \ - --set mosipDataGithubBranch="develop" \ + --set mosipDataGithubBranch="v1.2.2.0" \ --set mosipDataGithubRepo="https://github.com/mosip/mosip-data" \ --set mosipDataXlsfolderPath="\/home/mosip/mosip-data/mosip_master/xlsx" \ --version $CHART_VERSION --wait --wait-for-jobs diff --git a/deploy/postgres-init-values.yaml b/deploy/postgres-init-values.yaml index 2ec0f86..b87c279 100644 --- a/deploy/postgres-init-values.yaml +++ b/deploy/postgres-init-values.yaml @@ -4,67 +4,63 @@ dbUserPasswords: databases: mosip_master: enabled: true - branch: develop + branch: v1.2.1.1 mosip_audit: enabled: true - branch: develop + branch: v1.2.0.1 mosip_keymgr: - enabled: true - branch: develop + enabled: true + branch: v1.2.0.1 mosip_kernel: enabled: true - branch: develop + branch: v1.2.0.1 mosip_idmap: enabled: true - branch: develop + branch: v1.2.0.1 mosip_prereg: enabled: true - branch: develop + branch: v1.2.0.1 mosip_idrepo: enabled: true - branch: develop + branch: v1.2.0.1 mosip_ida: enabled: true - branch: develop + branch: v1.2.0.1 mosip_credential: enabled: true - branch: develop + branch: v1.2.0.1 mosip_regprc: enabled: true - branch: develop + branch: v1.2.0.1 mosip_pms: enabled: true - branch: develop + branch: v1.2.0.1 mosip_hotlist: enabled: true - branch: develop + branch: v1.2.1.1 mosip_resident: enabled: true - branch: develop - - mosip_otp: - enabled: true - branch: develop + branch: v1.2.1.1 mosip_toolkit: enabled: false branch: v1.3.2 - + mosip_digitalcard: enabled: false - branch: develop + branch: v1.2.0.1 mosip_esignet: enabled: false diff --git a/deploy/postgres-init.sh b/deploy/postgres-init.sh index 3302348..5732fc0 100755 --- a/deploy/postgres-init.sh +++ b/deploy/postgres-init.sh @@ -8,7 +8,7 @@ fi function initialize_db() { NS=postgres - CHART_VERSION=12.0.1-develop + CHART_VERSION=12.0.2 helm repo update while true; do read -p "CAUTION: all existing data will be lost. Are you sure?(Y/n)" yn diff --git a/deploy/postgres-upgrade.csv b/deploy/postgres-upgrade.csv index b5dc007..9ea41a9 100644 --- a/deploy/postgres-upgrade.csv +++ b/deploy/postgres-upgrade.csv @@ -34,6 +34,8 @@ mosip_pms,1.2.0.1-B4,1.2.0.1,upgrade mosip_master,1.1.5.5,1.2.0.1-B1,upgrade mosip_master,1.2.0.1-B1,1.2.0.1-B2,upgrade mosip_master,1.2.0.1-B2,1.2.0.1,upgrade +mosip_master,1.2.0.1,1.2.1.0,upgrade +mosip_master,1.2.1.0,1.2.1.1,upgrade mosip_keymgr,1.1.5.5,1.2.0.1-B1,upgrade mosip_keymgr,1.2.0.1-B1,1.2.0.1-B2,upgrade mosip_keymgr,1.2.0.1-B2,1.2.0.1-B3,upgrade @@ -46,6 +48,10 @@ mosip_resident,1.1.5.5,1.2.0.1-B1,upgrade mosip_resident,1.2.0.1-B1,1.2.0.1-B2,upgrade mosip_resident,1.2.0.1-B2,1.2.0.1-B3,upgrade mosip_resident,1.2.0.1-B3,1.2.0.1,upgrade +mosip_resident,1.2.0.1,1.2.1.0,upgrade +mosip_resident,1.2.1.0,1.2.1.1,upgrade mosip_hotlist,1.1.5.5,1.2.0.1-B1,upgrade mosip_hotlist,1.2.0.1-B1,1.2.0.1-B2,upgrade mosip_hotlist,1.2.0.1-B2,1.2.0.1,upgrade +mosip_hotlist,1.2.0.1,1.2.1.0,upgrade +mosip_hotlist,1.2.1.0,1.2.1.1,upgrade \ No newline at end of file diff --git a/helm/masterdata-loader/values.yaml b/helm/masterdata-loader/values.yaml index 18c56f3..a237f5f 100644 --- a/helm/masterdata-loader/values.yaml +++ b/helm/masterdata-loader/values.yaml @@ -71,4 +71,4 @@ db: secret: name: db-common-secrets key: db-dbuser-password -mosipDataGithubBranch: 1.2.0.1-B1 +mosipDataGithubBranch: 1.2.2.0 From 25d6d4671c98f234e9abac020fa8a401094a2c39 Mon Sep 17 00:00:00 2001 From: PRAFUL RAKHADE <99539100+prafulrakhade@users.noreply.github.com> Date: Fri, 31 Jan 2025 17:01:05 +0530 Subject: [PATCH 3/4] [DSD-7170] resident portal 0.9.1 release Signed-off-by: techno-467 --- .github/workflows/push-trigger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 341cd11..564bb54 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -68,7 +68,7 @@ jobs: - name: Upload the upgrade scripts if: ${{ !contains(github.ref, 'master') || !contains(github.ref, 'main') }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.BUILD_ARTIFACT }} path: ${{ env.SERVICE_LOCATION }}/${{ env.BUILD_ARTIFACT }}.zip From 6dfbddad50da763a333021f2da850e4832605d54 Mon Sep 17 00:00:00 2001 From: techno-467 Date: Fri, 31 Jan 2025 17:02:56 +0530 Subject: [PATCH 4/4] [DSD-7170] resident portal 0.9.1 release Signed-off-by: techno-467 --- deploy/postgres-init-values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deploy/postgres-init-values.yaml b/deploy/postgres-init-values.yaml index b87c279..11107c1 100644 --- a/deploy/postgres-init-values.yaml +++ b/deploy/postgres-init-values.yaml @@ -54,6 +54,10 @@ databases: enabled: true branch: v1.2.1.1 + mosip_otp: + enabled: true + branch: v1.2.0.1 + mosip_toolkit: enabled: false branch: v1.3.2