diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2022-02-22 16:06:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-02-22 16:06:06 +0000 |
| commit | d31034561756f46d3ebb6318c92ae59a385c465f (patch) | |
| tree | a5e499c8e86c0acb9cb34758f4da18e90ffea72b /kubernetes/cps/components/cps-core | |
| parent | c7da566a122b31a5f049a74338d91d6b67612ef9 (diff) | |
| parent | 9b91aef5f2150c21b55fbeead8c3005576214f4f (diff) | |
Merge "[CPS] Database port made configurable"
Diffstat (limited to 'kubernetes/cps/components/cps-core')
| -rw-r--r-- | kubernetes/cps/components/cps-core/resources/config/application-helm.yml | 4 | ||||
| -rw-r--r-- | kubernetes/cps/components/cps-core/values.yaml | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml index 8f904efeae..e9958f1114 100644 --- a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml +++ b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml @@ -20,9 +20,9 @@ spring: datasource: {{- if .Values.global.postgres.localCluster }} - url: jdbc:postgresql://{{ .Values.postgres.service.name2 }}:5432/{{ .Values.postgres.config.pgDatabase }} + url: jdbc:postgresql://{{ .Values.postgres.service.name2 }}:{{ .Values.postgres.service.externalPort2 }}/{{ .Values.postgres.config.pgDatabase }} {{- else }} - url: jdbc:postgresql://{{ .Values.global.postgres.service.name2 }}:5432/{{ .Values.postgres.config.pgDatabase }} + url: jdbc:postgresql://{{ .Values.global.postgres.service.name2 }}:{{ .Values.global.postgres.service.externalPort2 }}/{{ .Values.postgres.config.pgDatabase }} {{- end }} username: ${DB_USERNAME} password: ${DB_PASSWORD} diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml index a482152582..e67cfb250a 100644 --- a/kubernetes/cps/components/cps-core/values.yaml +++ b/kubernetes/cps/components/cps-core/values.yaml @@ -58,8 +58,11 @@ global: localCluster: false service: name: pgset + externalPort: 5432 name2: tcp-pgset-primary + externalPort2: 5432 name3: tcp-pgset-replica + externalPort3: 5432 container: name: postgres @@ -200,8 +203,11 @@ postgres: nameOverride: &postgresName cps-core-postgres service: name: *postgresName + externalPort: 5432 name2: cps-core-pg-primary + externalPort2: 5432 name3: cps-core-pg-replica + externalPort3: 5432 container: name: primary: cps-core-pg-primary |