From a0bcc12c849471a2aafd0277345e971969aa93b9 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Tue, 3 Jan 2023 22:34:25 +0100 Subject: [PATCH] feat: update postgresql to v12 --- Chart.lock | 8 ++++---- Chart.yaml | 4 ++-- README.md | 17 +++++++++-------- templates/_helpers.tpl | 8 ++++---- values.yaml | 30 +++++++++++++++++------------- 5 files changed, 36 insertions(+), 31 deletions(-) diff --git a/Chart.lock b/Chart.lock index 57006b7..9a23a6b 100644 --- a/Chart.lock +++ b/Chart.lock @@ -6,10 +6,10 @@ dependencies: repository: https://charts.bitnami.com/bitnami version: 9.4.5 - name: postgresql - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami - version: 10.3.17 + repository: https://charts.bitnami.com/bitnami + version: 12.1.6 - name: mariadb repository: https://charts.bitnami.com/bitnami version: 11.4.2 -digest: sha256:6200d37686cc99137552a08e744535c86f613fe54e1a4ff9e5da932dbb2184ee -generated: "2023-01-03T22:26:33.482759+01:00" +digest: sha256:8c97e0ac0bb5ba63e51eeb9fb252a1a069f75d9e3e052bbbff36e555accfbede +generated: "2023-01-03T22:28:03.2673227+01:00" diff --git a/Chart.yaml b/Chart.yaml index 8670211..69d1213 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -33,8 +33,8 @@ dependencies: version: 9.4.5 condition: mysql.enabled - name: postgresql - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami - version: 10.3.17 + repository: https://charts.bitnami.com/bitnami + version: 12.1.6 condition: postgresql.enabled - name: mariadb repository: https://charts.bitnami.com/bitnami diff --git a/README.md b/README.md index 8c6ddea..bf95c14 100644 --- a/README.md +++ b/README.md @@ -736,14 +736,15 @@ gitea: ### PostgreSQL -| Name | Description | Value | -| ------------------------------------------------- | -------------------------------------------------------- | ------- | -| `postgresql.enabled` | Enable PostgreSQL | `true` | -| `postgresql.global.postgresql.postgresqlDatabase` | PostgreSQL database (overrides postgresqlDatabase) | `gitea` | -| `postgresql.global.postgresql.postgresqlUsername` | PostgreSQL username (overrides postgresqlUsername) | `gitea` | -| `postgresql.global.postgresql.postgresqlPassword` | PostgreSQL admin password (overrides postgresqlPassword) | `gitea` | -| `postgresql.global.postgresql.servicePort` | PostgreSQL port (overrides service.port) | `5432` | -| `postgresql.persistence.size` | PVC Storage Request for PostgreSQL volume | `10Gi` | +| Name | Description | Value | +| --------------------------------------------- | ----------------------------------------- | ------- | +| `postgresql.enabled` | Enable PostgreSQL | `true` | +| `postgresql.auth.database` | PostgreSQL database | `gitea` | +| `postgresql.auth.username` | PostgreSQL username | `gitea` | +| `postgresql.auth.password` | PostgreSQL username | `gitea` | +| `postgresql.auth.postgresPassword` | PostgreSQL admin password | `gitea` | +| `postgresql.primary.service.ports.postgresql` | Port to connect to PostgreSQL service | `5432` | +| `postgresql.primary.persistence.size` | PVC Storage Request for PostgreSQL volume | `10Gi` | ### MySQL diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 0d5f618..441491b 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -92,7 +92,7 @@ app.kubernetes.io/instance: {{ .Release.Name }} {{- end -}} {{- define "postgresql.dns" -}} -{{- printf "%s-postgresql.%s.svc.%s:%g" .Release.Name .Release.Namespace .Values.clusterDomain .Values.postgresql.global.postgresql.servicePort -}} +{{- printf "%s-postgresql.%s.svc.%s:%g" .Release.Name .Release.Namespace .Values.clusterDomain .Values.postgresql.primary.service.ports.postgresql -}} {{- end -}} {{- define "mysql.dns" -}} @@ -292,9 +292,9 @@ https {{- if not (.Values.gitea.config.database.HOST) -}} {{- $_ := set .Values.gitea.config.database "HOST" (include "postgresql.dns" .) -}} {{- end -}} - {{- $_ := set .Values.gitea.config.database "NAME" .Values.postgresql.global.postgresql.postgresqlDatabase -}} - {{- $_ := set .Values.gitea.config.database "USER" .Values.postgresql.global.postgresql.postgresqlUsername -}} - {{- $_ := set .Values.gitea.config.database "PASSWD" .Values.postgresql.global.postgresql.postgresqlPassword -}} + {{- $_ := set .Values.gitea.config.database "NAME" .Values.postgresql.auth.database -}} + {{- $_ := set .Values.gitea.config.database "USER" .Values.postgresql.auth.username -}} + {{- $_ := set .Values.gitea.config.database "PASSWD" .Values.postgresql.auth.password -}} {{- else if .Values.mysql.enabled -}} {{- $_ := set .Values.gitea.config.database "DB_TYPE" "mysql" -}} {{- if not (.Values.gitea.config.database.HOST) -}} diff --git a/values.yaml b/values.yaml index a8817be..c3b33c7 100644 --- a/values.yaml +++ b/values.yaml @@ -407,21 +407,25 @@ memcached: ## @section PostgreSQL # ## @param postgresql.enabled Enable PostgreSQL -## @param postgresql.global.postgresql.postgresqlDatabase PostgreSQL database (overrides postgresqlDatabase) -## @param postgresql.global.postgresql.postgresqlUsername PostgreSQL username (overrides postgresqlUsername) -## @param postgresql.global.postgresql.postgresqlPassword PostgreSQL admin password (overrides postgresqlPassword) -## @param postgresql.global.postgresql.servicePort PostgreSQL port (overrides service.port) -## @param postgresql.persistence.size PVC Storage Request for PostgreSQL volume +## @param postgresql.auth.database PostgreSQL database +## @param postgresql.auth.username PostgreSQL username +## @param postgresql.auth.password PostgreSQL username +## @param postgresql.auth.postgresPassword PostgreSQL admin password +## @param postgresql.primary.service.ports.postgresql Port to connect to PostgreSQL service +## @param postgresql.primary.persistence.size PVC Storage Request for PostgreSQL volume postgresql: enabled: true - global: - postgresql: - postgresqlDatabase: gitea - postgresqlUsername: gitea - postgresqlPassword: gitea - servicePort: 5432 - persistence: - size: 10Gi + auth: + database: gitea + username: gitea + password: gitea + postgresPassword: gitea + primary: + service: + ports: + postgresql: 5432 + persistence: + size: 10Gi ## @section MySQL #