Merge pull request #46 from lalithkota/1.4

Reorged bgtasks reporting and landing

charts/openg2p-social-registry-p2/Chart.yaml

@@ -22,10 +22,6 @@ dependencies:
   version: 1.4.1
   repository: https://openg2p.github.io/openg2p-helm
   condition: esignet.enabled
-- name: openg2p-sr-bg-tasks
-  version: 1.0.0
-  repository: https://openg2p.github.io/openg2p-helm
-  condition: openg2p-sr-bg-tasks.enabled
 icon: https://openg2p.github.io/openg2p-helm/openg2p-logo.png
 annotations:
   catalog.cattle.io/display-name: "OpenG2P Social Registry - Part 2"

charts/openg2p-social-registry-p2/questions.yaml

@@ -174,39 +174,3 @@ questions:
   label: Spring Config application properties.
   group: Mock Identity System Settings
   show_if: "esignet.enabled=true&&esignet.mock-identity-system.enabled=true&&esignet.mock-identity-system.springConfig.gitRepo.enabled=false"
-
-- variable: sr-bg-tasks.openg2p-sr-bg-tasks-celery-workers.envVars.SR_CELERY_WORKERS_AUTH_CLIENT_ID
-  description: KeyCloak Client ID
-  type: string
-  label: KeyCloak Client ID
-  group: SR BG Tasks Settings
-
-- variable: sr-bg-tasks.openg2p-sr-bg-tasks-celery-workers.envVars.SR_CELERY_WORKERS_AUTH_CLIENT_SECRET
-  description: KeyCloak Client Secret for SR Celery Worker
-  type: string
-  label: KeyCloak Client Secret
-  group: SR BG Tasks Settings
-
-- variable: sr-bg-tasks.openg2p-sr-bg-tasks-celery-beat-producers.envVars.SR_CELERY_BEAT_MAX_ID_GENERATION_REQUEST_ATTEMPTS
-  description: Max Id Generation Request Attempts
-  type: string
-  label: Max Id Generation Request Attempts
-  group: SR BG Tasks Settings
-
-- variable: sr-bg-tasks.openg2p-sr-bg-tasks-celery-beat-producers.envVars.SR_CELERY_BEAT_MAX_ID_GENERATION_UPDATE_ATTEMPTS
-  description: Max Id Update Request Attempts
-  type: string
-  label: Max Id Update Request Attempts
-  group: SR BG Tasks Settings
-
-- variable: sr-bg-tasks.openg2p-sr-bg-tasks-celery-beat-producers.envVars.SR_CELERY_BEAT_RES_PARTNER_ID_GENERATION_FREQUENCY
-  description: Res Partner Id Generation Frequency
-  type: string
-  label: Res Partner Id Generation Frequency
-  group: SR BG Tasks Settings
-
-- variable: sr-bg-tasks.openg2p-sr-bg-tasks-celery-beat-producers.envVars.SR_CELERY_BEAT_RES_PARTNER_ID_UPDATE_FREQUENCY
-  description: Res Partner Id Generation Update Frequency
-  type: string
-  label: Res Partner Id Generation Update Frequency
-  group: SR BG Tasks Settings

charts/openg2p-social-registry-p2/values.yaml

@@ -1,7 +1,6 @@
 global:
   keycloakBaseUrl: https://keycloak.openg2p.sandbox.net
   keycloakIssuerUrl: '{{ tpl .Values.global.keycloakBaseUrl $ }}/realms/master'
-  idgeneratorBaseUrl: https://idgenerator.openg2p.sandbox.net
 
 nameOverride: openg2p-social-registry
 
@@ -183,48 +182,3 @@ esignet:
       repoUrl: https://github.com/openg2p/mosip-config
       branch: master
     rawConfig: ""
-
-openg2p-sr-bg-tasks:
-  enabled: true
-
-  openg2p-sr-bg-tasks-celery-beat-producers:
-    enabled: true
-    envVars:
-      SR_CELERY_BEAT_DB_DBNAME: socialregistrydb
-      SR_CELERY_BEAT_DB_PORT: 5432
-      SR_CELERY_BEAT_DB_USERNAME: sruser
-      SR_CELERY_BEAT_DB_HOSTNAME: '{{ .Release.Name }}-postgresql'
-      SR_CELERY_BEAT_CELERY_BROKER_URL: redis://{{ .Release.Name }}-redis-master:6379/0
-      SR_CELERY_BEAT_CELERY_BACKEND_URL: redis://{{ .Release.Name }}-redis-master:6379/0
-      SR_CELERY_BEAT_MAX_ID_GENERATION_REQUEST_ATTEMPTS: 3
-      SR_CELERY_BEAT_MAX_ID_GENERATION_UPDATE_ATTEMPTS: 3
-      SR_CELERY_BEAT_RES_PARTNER_ID_GENERATION_FREQUENCY: 60
-      SR_CELERY_BEAT_RES_PARTNER_ID_UPDATE_FREQUENCY: 60
-
-    envVarsFrom:
-      SR_CELERY_BEAT_DB_PASSWORD:
-        secretKeyRef:
-          name: '{{ .Release.Name }}-postgresql'
-          key: password
-
-  openg2p-sr-bg-tasks-celery-workers:
-    enabled: true
-    envVars:
-      SR_CELERY_WORKERS_DB_DBNAME: socialregistrydb
-      SR_CELERY_WORKERS_DB_USERNAME: sruser
-      SR_CELERY_WORKERS_DB_HOSTNAME: '{{ .Release.Name }}-postgresql'
-      SR_CELERY_WORKERS_DB_PORT: 5432
-      SR_CELERY_WORKERS_CELERY_BROKER_URL: redis://{{ .Release.Name }}-redis-master:6379/0
-      SR_CELERY_WORKERS_CELERY_BACKEND_URL: redis://{{ .Release.Name }}-redis-master:6379/0
-      SR_CELERY_WORKERS_AUTH_URL: '{{ tpl .Values.global.keycloakIssuerUrl $ }}/protocol/openid-connect/token'
-      SR_CELERY_WORKERS_AUTH_CLIENT_ID: 'openg2p-sr-bg-tasks-{{ .Release.Namespace }}'
-      SR_CELERY_WORKERS_AUTH_CLIENT_SECRET: ''
-      SR_CELERY_WORKERS_AUTH_GRANT_TYPE: client_credentials
-      SR_CELERY_WORKERS_MOSIP_GET_UIN_URL: '{{ tpl .Values.global.keycloakIssuerUrl $ }}/v1/idgenerator/uin'
-      SR_CELERY_WORKERS_MOSIP_UPDATE_UIN_URL: '{{ tpl .Values.global.keycloakIssuerUrl $ }}/v1/idgenerator/uin'
-
-    envVarsFrom:
-      SR_CELERY_WORKERS_DB_PASSWORD:
-        secretKeyRef:
-          name: '{{ .Release.Name }}-postgresql'
-          key: password

charts/openg2p-social-registry/.gitignore

@@ -1,2 +1,4 @@
-charts/
+charts/*
 Chart.lock
+
+!charts/sr-landing

charts/openg2p-social-registry/Chart.yaml

@@ -6,8 +6,7 @@ version: 1.4.0-develop
 dependencies:
 - name: sr-landing
   version: 1.4.0-develop
-  repository: https://openg2p.github.io/openg2p-helm
-  condition: odoo.enabled
+  condition: sr-landing.enabled
 - name: odoo
   version: 26.2.9
   repository: oci://registry-1.docker.io/bitnamicharts
@@ -34,13 +33,22 @@ dependencies:
   repository: https://openg2p.github.io/openg2p-helm
   condition: keymanager.enabled
 - name: reporting
-  version: 0.0.0-develop
+  version: 1.2.0-develop
   repository: https://openg2p.github.io/openg2p-helm
   condition: reporting.enabled
 - name: reporting-init
-  version: 0.0.0-develop
+  version: 1.2.0-develop
   repository: https://openg2p.github.io/openg2p-helm
   condition: reporting-init.enabled
+- name: redis
+  alias: bgTasksRedis
+  version: 19.x.x
+  repository: oci://registry-1.docker.io/bitnamicharts
+  condition: openg2p-sr-bg-tasks.enabled
+- name: openg2p-sr-bg-tasks
+  version: 1.0.0-develop
+  repository: https://openg2p.github.io/openg2p-helm
+  condition: openg2p-sr-bg-tasks.enabled
 icon: https://openg2p.github.io/openg2p-helm/openg2p-logo.png
 annotations:
   catalog.cattle.io/display-name: "OpenG2P Social Registry - Part 1"

charts/openg2p-social-registry/README.md

@@ -13,3 +13,4 @@ This is the first part. This contains the following components:
 - Keymanager
 - OpenSearch
 - Reporting (Reporting Framework + Reporting Init)
+- SR Background Tasks

charts/openg2p-social-registry/charts/sr-landing

@@ -0,0 +1 @@
+../../sr-landing

charts/openg2p-social-registry/questions.yaml

@@ -7,7 +7,7 @@ questions:
   group: General Settings
 
 - variable: hostname
-  description: Hostname to access Social Registry Admin 
+  description: Hostname to access Social Registry Admin
   type: string
   label: Hostname
   group: General Settings
@@ -357,3 +357,38 @@ questions:
   label: Git Config Repository Subdirectory
   group: Reporting Settings
   show_if: "reporting-init.enabled=true&&reporting-init.gitConfig.enabled=true"
+
+# OpenG2P SR BG Tasks
+- variable: openg2p-sr-bg-tasks.enabled
+  description: This installs SR BG Tasks.
+  type: boolean
+  label: Install SR BG Tasks?
+  group: SR BG Tasks Settings
+
+- variable: openg2p-sr-bg-tasks.openg2p-sr-bg-tasks-celery-beat-producers.envVars.SR_CELERY_BEAT_MAX_ID_GENERATION_REQUEST_ATTEMPTS
+  description: Max Id Generation Request Attempts
+  type: string
+  label: Max Id Generation Request Attempts
+  group: SR BG Tasks Settings
+  show_if: "openg2p-sr-bg-tasks.enabled=true"
+
+- variable: openg2p-sr-bg-tasks.openg2p-sr-bg-tasks-celery-beat-producers.envVars.SR_CELERY_BEAT_MAX_ID_GENERATION_UPDATE_ATTEMPTS
+  description: Max Id Update Request Attempts
+  type: string
+  label: Max Id Update Request Attempts
+  group: SR BG Tasks Settings
+  show_if: "openg2p-sr-bg-tasks.enabled=true"
+
+- variable: openg2p-sr-bg-tasks.openg2p-sr-bg-tasks-celery-beat-producers.envVars.SR_CELERY_BEAT_RES_PARTNER_ID_GENERATION_FREQUENCY
+  description: Res Partner Id Generation Frequency
+  type: string
+  label: Res Partner Id Generation Frequency
+  group: SR BG Tasks Settings
+  show_if: "openg2p-sr-bg-tasks.enabled=true"
+
+- variable: openg2p-sr-bg-tasks.openg2p-sr-bg-tasks-celery-beat-producers.envVars.SR_CELERY_BEAT_RES_PARTNER_ID_UPDATE_FREQUENCY
+  description: Res Partner Id Generation Update Frequency
+  type: string
+  label: Res Partner Id Generation Update Frequency
+  group: SR BG Tasks Settings
+  show_if: "openg2p-sr-bg-tasks.enabled=true"

charts/openg2p-social-registry/values.yaml

@@ -436,13 +436,52 @@ istio:
       credentialName: ""
 
 sr-landing:
-  enabled: false 
+  enabled: false
   landingPageHostname: socialregistry.explore.openg2p.org
-  envVars: 
+  envVars:
     SR_ADMIN_URL: 'https://{{ tpl .Values.hostname $ }}'
-    SR_REPORTING_URL: 'https://{{ tpl .Values.reporting.opensearch.hostname $ }}' 
-    SR_LOGGING_URL: 'https://{{ tpl .Values.loggingOpensearch.hostname $ }}' 
+    SR_REPORTING_URL: 'https://{{ tpl .Values.reporting.opensearch.hostname $ }}'
+    SR_LOGGING_URL: 'https://{{ tpl .Values.loggingOpensearch.hostname $ }}'
     SR_MINIO_URL: 'https://{{ tpl .Values.minio.hostname $ }}'
     SR_ODK_URL: 'https://{{ tpl .Values.odk-central.hostname $ }}'
-    SR_KAFKA_URL: 'https://{{ tpl .Values.reporting.kafkaUi.hostname $ }}' 
+    SR_KAFKA_URL: 'https://{{ tpl .Values.reporting.kafkaUi.hostname $ }}'
     SR_SUPERSET_URL: "https://superset-sr.explore.openg2p.org"
+
+bgTasksRedis:
+  nameOverride: bg-tasks-redis
+  architecture: standalone
+  auth:
+    enabled: false
+  master:
+    resourcesPreset: none
+    persistence:
+      enabled: false
+
+openg2p-sr-bg-tasks:
+  enabled: true
+  nameOverride: bg-tasks
+
+  openg2p-sr-bg-tasks-celery-beat-producers:
+    enabled: true
+    nameOverride: bg-tasks-producer
+
+    postgresqlInstallationName: '{{ .Release.Name }}-postgresql'
+    redisInstallationName: '{{ .Release.Name }}-bg-tasks-redis-master'
+
+    envVars:
+      SR_CELERY_BEAT_MAX_ID_GENERATION_REQUEST_ATTEMPTS: 3
+      SR_CELERY_BEAT_MAX_ID_GENERATION_UPDATE_ATTEMPTS: 3
+      SR_CELERY_BEAT_RES_PARTNER_ID_GENERATION_FREQUENCY: 60
+      SR_CELERY_BEAT_RES_PARTNER_ID_UPDATE_FREQUENCY: 60
+
+  openg2p-sr-bg-tasks-celery-workers:
+    enabled: true
+    nameOverride: bg-tasks-worker
+
+    postgresqlInstallationName: '{{ .Release.Name }}-postgresql'
+    redisInstallationName: '{{ .Release.Name }}-bg-tasks-redis-master'
+    idgeneratorInstallationName: 'idgenerator'
+
+    envVars:
+      SR_CELERY_WORKERS_AUTH_CLIENT_ID: '{{ tpl .Values.global.srOdooOidcClientId $ }}'
+      SR_CELERY_WORKERS_AUTH_CLIENT_SECRET: '{{ tpl .Values.global.srOdooOidcClientSecret $ }}'

charts/sr-landing/values.yaml

@@ -11,7 +11,7 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-envVars: 
+envVars:
   SR_ADMIN_URL: "https://admin.explore.openg2p.org"
   SR_REPORTING_URL: "https://reporting.explore.openg2p.org"
   SR_LOGGING_URL: "https://reporting.explore.openg2p.org"