Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 0 additions & 95 deletions deployment/charts/openg2p-pbms-platform/questions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,101 +111,6 @@ questions:
group: Portal API Settings
show_if: "benePortalApi.enabled=true"

# Registry settings
- variable: global.registryConnector
description: How PBMS reads the registry. db queries the registry database. dci calls the registry partner API POST /dci/sync/search.
type: enum
options:
- db
- dci
default: db
label: Registry Connector
group: Registry

- variable: global.registryDB
description: Name of the Registry DB in PostgreSQL. Used when the connector is db.
type: string
label: Registry DB
group: Registry
show_if: "global.registryConnector=db"

- variable: global.registryDBUser
description: Name of the Registry DB User in PostgreSQL. Used when the connector is db.
type: string
label: Registry DB User
group: Registry
show_if: "global.registryConnector=db"

- variable: global.registryDBSecret
description: Name of the Registry DB Secret that contains the user password. Used when the connector is db.
type: string
label: Registry DB Secret with User Password
group: Registry
show_if: "global.registryConnector=db"

- variable: global.registryDBUserPasswordKey
description: Key inside the Registry DB Secret that contains the user password. Used when the connector is db.
type: string
label: Registry DB Secret Key with User Password
group: Registry
show_if: "global.registryConnector=db"

- variable: global.registryPartnerApiUrl
description: Origin of the registry partner API, with no path. PBMS calls {url}/dci/sync/search. Used when the connector is dci.
type: string
default: http://registry-partner-api
label: Registry Partner API URL
group: Registry
show_if: "global.registryConnector=dci"

- variable: global.registryPartnerApiTimeout
description: Seconds to wait for one registry partner API call. Used when the connector is dci.
type: int
default: 30
label: Registry Partner API Timeout
group: Registry
show_if: "global.registryConnector=dci"

- variable: global.registryPartnerApiSslVerify
description: Verify the registry partner API TLS certificate. Used when the connector is dci.
type: boolean
default: true
label: Registry Partner API TLS Verify
group: Registry
show_if: "global.registryConnector=dci"

- variable: global.farmerRegType
description: DCI search reg_type for farmers. Must match the register mnemonic on the registry.
type: string
default: Farmer
label: Farmer Register Type
group: Registry
show_if: "global.registryConnector=dci"

- variable: global.householdRegType
description: DCI search reg_type for households. Must match the register mnemonic on the registry.
type: string
default: Household
label: Household Register Type
group: Registry
show_if: "global.registryConnector=dci"

- variable: global.farmerRegRecordType
description: DCI reg_record_type sent with a farmer search.
type: string
default: Farmer
label: Farmer Record Type
group: Registry
show_if: "global.registryConnector=dci"

- variable: global.householdRegRecordType
description: DCI reg_record_type sent with a household search.
type: string
default: Household
label: Household Record Type
group: Registry
show_if: "global.registryConnector=dci"



# End of main PBMS/values.yaml-driven questions.
56 changes: 0 additions & 56 deletions deployment/charts/openg2p-pbms-platform/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,6 @@ global:
# Note underscore doesn't work here for Kubernetes secret, hence hyphen in the name
pbmsBgTaskDBSecret: '{{ .Release.Name }}-bgtask'
pbmsBgTaskDBUserPasswordKey: '{{ .Release.Name }}-bgtask-db-user'

# Social Registry (NSR) DB that PBMS reads. Defaults match what openg2p-nsr
# provisions when installed with release name 'registry' (its DB/user/secret
# are derived from the release name). Override via questions.yaml if NSR was
# installed under a different release name.
registryDB: 'registry'
registryDBUser: 'registry_user'
registryDBSecret: 'registry'
registryDBUserPasswordKey: 'registry-db-user'
# db uses the registry database. dci calls the registry partner API.
registryConnector: db
registryPartnerApiUrl: http://registry-partner-api
registryPartnerApiTimeout: 30
registryPartnerApiSslVerify: true
farmerRegType: Farmer
householdRegType: Household
farmerRegRecordType: Farmer
householdRegRecordType: Household

mailInstallationName: commons-mail

sysAdminEmail: admin@openg2p.sandbox.net
Expand Down Expand Up @@ -383,21 +364,6 @@ celeryWorkers:
BG_TASK_CELERY_WORKERS_DB_DBNAME: '{{ tpl .Values.global.pbmsBgTaskDB $ }}'
BG_TASK_CELERY_WORKERS_DB_USERNAME: '{{ tpl .Values.global.pbmsBgTaskDBUser $ }}'

# Registry adapter (db session or DCI partner API). Same values on the staff API.
REGISTRY_ADAPTERS_CONNECTOR: '{{ tpl .Values.global.registryConnector $ }}'
REGISTRY_ADAPTERS_DB_DRIVER: postgresql
REGISTRY_ADAPTERS_DB_HOSTNAME: '{{ tpl .Values.global.postgresqlHost $ }}'
REGISTRY_ADAPTERS_DB_PORT: 5432
REGISTRY_ADAPTERS_DB_DBNAME: '{{ tpl .Values.global.registryDB $ }}'
REGISTRY_ADAPTERS_DB_USERNAME: '{{ tpl .Values.global.registryDBUser $ }}'
REGISTRY_ADAPTERS_PARTNER_API_URL: '{{ tpl .Values.global.registryPartnerApiUrl $ }}'
REGISTRY_ADAPTERS_PARTNER_API_TIMEOUT: '{{ .Values.global.registryPartnerApiTimeout }}'
REGISTRY_ADAPTERS_PARTNER_API_SSL_VERIFY: '{{ .Values.global.registryPartnerApiSslVerify }}'
REGISTRY_ADAPTERS_FARMER_REG_TYPE: '{{ tpl .Values.global.farmerRegType $ }}'
REGISTRY_ADAPTERS_HOUSEHOLD_REG_TYPE: '{{ tpl .Values.global.householdRegType $ }}'
REGISTRY_ADAPTERS_FARMER_REG_RECORD_TYPE: '{{ tpl .Values.global.farmerRegRecordType $ }}'
REGISTRY_ADAPTERS_HOUSEHOLD_REG_RECORD_TYPE: '{{ tpl .Values.global.householdRegRecordType $ }}'

# PBMS Database
BG_TASK_CELERY_WORKERS_DB_HOSTNAME_PBMS: '{{ tpl .Values.global.postgresqlHost $ }}'
BG_TASK_CELERY_WORKERS_DB_PORT_PBMS: 5432
Expand Down Expand Up @@ -429,10 +395,6 @@ celeryWorkers:
secretKeyRef:
name: '{{ tpl .Values.global.pbmsBgTaskDBSecret $ }}'
key: '{{ tpl .Values.global.pbmsBgTaskDBUserPasswordKey $ }}'
REGISTRY_ADAPTERS_DB_PASSWORD:
secretKeyRef:
name: '{{ tpl .Values.global.registryDBSecret $ }}'
key: '{{ tpl .Values.global.registryDBUserPasswordKey $ }}'
BG_TASK_CELERY_WORKERS_DB_PASSWORD_PBMS:
secretKeyRef:
name: '{{ tpl .Values.global.pbmsDBSecret $ }}'
Expand Down Expand Up @@ -546,20 +508,6 @@ staffPortalApi:
runAsNonRoot: true

envVars:
REGISTRY_ADAPTERS_CONNECTOR: '{{ tpl .Values.global.registryConnector $ }}'
REGISTRY_ADAPTERS_DB_DRIVER: postgresql
REGISTRY_ADAPTERS_DB_HOSTNAME: '{{ tpl .Values.global.postgresqlHost $ }}'
REGISTRY_ADAPTERS_DB_PORT: 5432
REGISTRY_ADAPTERS_DB_DBNAME: '{{ tpl .Values.global.registryDB $ }}'
REGISTRY_ADAPTERS_DB_USERNAME: '{{ tpl .Values.global.registryDBUser $ }}'
REGISTRY_ADAPTERS_PARTNER_API_URL: '{{ tpl .Values.global.registryPartnerApiUrl $ }}'
REGISTRY_ADAPTERS_PARTNER_API_TIMEOUT: '{{ .Values.global.registryPartnerApiTimeout }}'
REGISTRY_ADAPTERS_PARTNER_API_SSL_VERIFY: '{{ .Values.global.registryPartnerApiSslVerify }}'
REGISTRY_ADAPTERS_FARMER_REG_TYPE: '{{ tpl .Values.global.farmerRegType $ }}'
REGISTRY_ADAPTERS_HOUSEHOLD_REG_TYPE: '{{ tpl .Values.global.householdRegType $ }}'
REGISTRY_ADAPTERS_FARMER_REG_RECORD_TYPE: '{{ tpl .Values.global.farmerRegRecordType $ }}'
REGISTRY_ADAPTERS_HOUSEHOLD_REG_RECORD_TYPE: '{{ tpl .Values.global.householdRegRecordType $ }}'

STAFF_PORTAL_API_OPENAPI_ROOT_PATH: "/"

STAFF_PORTAL_API_DB_HOSTNAME: '{{ tpl .Values.global.postgresqlHost $ }}'
Expand All @@ -572,10 +520,6 @@ staffPortalApi:
secretKeyRef:
name: '{{ tpl .Values.global.pbmsBgTaskDBSecret $ }}'
key: '{{ tpl .Values.global.pbmsBgTaskDBUserPasswordKey $ }}'
REGISTRY_ADAPTERS_DB_PASSWORD:
secretKeyRef:
name: '{{ tpl .Values.global.registryDBSecret $ }}'
key: '{{ tpl .Values.global.registryDBUserPasswordKey $ }}'

resources: {}

Expand Down
Loading