diff --git a/charts/reports-server/README.md b/charts/reports-server/README.md index ce9f146..483ad64 100644 --- a/charts/reports-server/README.md +++ b/charts/reports-server/README.md @@ -67,6 +67,8 @@ helm install reports-server --namespace reports-server --create-namespace report | config.db.secretName | string | `""` | If set, database connection information will be read from the Secret with this name. Overrides `db.host`, `db.name`, `db.user`, and `db.password`. | | config.db.host | string | `""` | Database host | | config.db.hostSecretKeyName | string | `"host"` | The database host will be read from this `key` in the specified Secret, when `db.secretName` is set. | +| config.db.port | int | `5432` | Database port | +| config.db.portSecretKeyName | string | `"port"` | The database port will be read from this `key` in the specified Secret, when `db.secretName` is set. | | config.db.name | string | `"reportsdb"` | Database name | | config.db.dbNameSecretKeyName | string | `"dbname"` | The database name will be read from this `key` in the specified Secret, when `db.secretName` is set. | | config.db.user | string | `"postgres"` | Database user | diff --git a/charts/reports-server/templates/_helpers.tpl b/charts/reports-server/templates/_helpers.tpl index fd74989..ab0085b 100644 --- a/charts/reports-server/templates/_helpers.tpl +++ b/charts/reports-server/templates/_helpers.tpl @@ -72,6 +72,14 @@ Database config is injected into the environment, if a secret ref is set. Otherw {{- end }} {{- end }} +{{- define "reports-server.dbPort" -}} +{{- if .Values.config.db.secretName }} +{{- printf "%s" "$(DB_PORT)" }} +{{- else }} +{{- .Values.config.db.port }} +{{- end }} +{{- end }} + {{- define "reports-server.dbName" -}} {{- if .Values.config.db.secretName }} {{- printf "%s" "$(DB_DATABASE)" }} diff --git a/charts/reports-server/templates/deployment.yaml b/charts/reports-server/templates/deployment.yaml index 5e68bc2..ebdd41a 100644 --- a/charts/reports-server/templates/deployment.yaml +++ b/charts/reports-server/templates/deployment.yaml @@ -41,9 +41,10 @@ spec: - --debug {{- else }} - --dbhost={{ include "reports-server.dbHost" . }} - - --dbname={{ include "reports-server.dbName" . }} + - --dbport={{ include "reports-server.dbPort" . }} - --dbuser={{ include "reports-server.dbUser" . }} - --dbpassword={{ include "reports-server.dbPassword" . }} + - --dbname={{ include "reports-server.dbName" . }} - --dbsslmode={{ .Values.config.db.sslmode }} - --dbsslrootcert={{ .Values.config.db.sslrootcert }} - --dbsslkey={{ .Values.config.db.sslkey }} @@ -61,6 +62,11 @@ spec: secretKeyRef: key: {{ .Values.config.db.hostSecretKeyName }} name: {{ .Values.config.db.secretName }} + - name: DB_PORT + valueFrom: + secretKeyRef: + key: {{ .Values.config.db.portSecretKeyName }} + name: {{ .Values.config.db.secretName }} - name: DB_DATABASE valueFrom: secretKeyRef: diff --git a/charts/reports-server/values.yaml b/charts/reports-server/values.yaml index 4a2c052..3e83362 100644 --- a/charts/reports-server/values.yaml +++ b/charts/reports-server/values.yaml @@ -182,6 +182,11 @@ config: # -- The database host will be read from this `key` in the specified Secret, when `db.secretName` is set. hostSecretKeyName: "host" + # -- Database port + port: 5432 + # -- The database port will be read from this `key` in the specified Secret, when `db.secretName` is set. + portSecretKeyName: "port" + # -- Database name name: reportsdb # -- The database name will be read from this `key` in the specified Secret, when `db.secretName` is set. diff --git a/config/install.yaml b/config/install.yaml index 0bf845b..42317e7 100644 --- a/config/install.yaml +++ b/config/install.yaml @@ -258,9 +258,10 @@ spec: - name: reports-server args: - --dbhost=reports-server-postgresql.reports-server - - --dbname=reportsdb + - --dbport=5432 - --dbuser=postgres - --dbpassword=reports + - --dbname=reportsdb - --dbsslmode=disable - --dbsslrootcert= - --dbsslkey=