From 77820fc0f910b079e42e5a5a5b44b885fba0b038 Mon Sep 17 00:00:00 2001
From: jeremy cotineau <jeremy.cotineau@sonarsource.com>
Date: Wed, 8 Jan 2025 17:03:06 +0100
Subject: [PATCH] SONAR-24105 remove postgresql.postgresqlServer

---
 charts/sonarqube-dce/CHANGELOG.md                               | 2 +-
 charts/sonarqube-dce/Chart.yaml                                 | 2 +-
 charts/sonarqube-dce/templates/_helpers.tpl                     | 2 --
 charts/sonarqube/CHANGELOG.md                                   | 2 +-
 charts/sonarqube/Chart.yaml                                     | 2 +-
 charts/sonarqube/README.md                                      | 1 -
 charts/sonarqube/templates/_helpers.tpl                         | 2 --
 .../fixtures/sonarqube-dce/secret-values.yaml                   | 2 +-
 .../fixtures/sonarqube/secret-values.yaml                       | 2 +-
 9 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/charts/sonarqube-dce/CHANGELOG.md b/charts/sonarqube-dce/CHANGELOG.md
index 30f72f95b..2039ff768 100644
--- a/charts/sonarqube-dce/CHANGELOG.md
+++ b/charts/sonarqube-dce/CHANGELOG.md
@@ -6,7 +6,7 @@ All changes to this chart will be documented in this file.
 * Update ingress-nginx subchart to 4.11.3
 * Support Kubernetes v1.32
 * Remove the default passcode provided with `monitoringPasscode`
-* Remove deprecated `ApplicationNodes.image.pullSecret` and `searchNodes.image.pullSecret`
+* Remove deprecated `ApplicationNodes.image.pullSecret`, `searchNodes.image.pullSecret` and `postgresql.postgresqlServer`
 
 ## [10.8.1]
 * Update Chart's version to 10.8.1
diff --git a/charts/sonarqube-dce/Chart.yaml b/charts/sonarqube-dce/Chart.yaml
index 4d3e8da9b..ca2cd43fb 100644
--- a/charts/sonarqube-dce/Chart.yaml
+++ b/charts/sonarqube-dce/Chart.yaml
@@ -34,7 +34,7 @@ annotations:
     - kind: changed
       description: "Remove the default passcode provided with 'monitoringPasscode'"
     - kind: removed
-      description: "Remove deprecated `ApplicationNodes.image.pullSecret` and `searchNodes.image.pullSecret`"
+      description: "Remove deprecated `ApplicationNodes.image.pullSecret`, `searchNodes.image.pullSecret` and `postgresql.postgresqlServer`"
   artifacthub.io/links: |
     - name: support
       url: https://community.sonarsource.com/
diff --git a/charts/sonarqube-dce/templates/_helpers.tpl b/charts/sonarqube-dce/templates/_helpers.tpl
index c5478a14e..fbeb5ec76 100644
--- a/charts/sonarqube-dce/templates/_helpers.tpl
+++ b/charts/sonarqube-dce/templates/_helpers.tpl
@@ -106,8 +106,6 @@ Expand the Application Image name.
 {{- define "postgresql.hostname" -}}
 {{- if .Values.postgresql.enabled -}}
 {{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s" .Values.postgresql.postgresqlServer -}}
 {{- end -}}
 {{- end -}}
 
diff --git a/charts/sonarqube/CHANGELOG.md b/charts/sonarqube/CHANGELOG.md
index b04ca71d6..8fc6af8bc 100644
--- a/charts/sonarqube/CHANGELOG.md
+++ b/charts/sonarqube/CHANGELOG.md
@@ -6,7 +6,7 @@ All changes to this chart will be documented in this file.
 * Update ingress-nginx subchart to 4.11.3
 * Support Kubernetes v1.32
 * Remove the default passcode provided with `monitoringPasscode`
-* Remove deprecated `elasticsearch.configureNode` and `image.pullSecret`
+* Remove deprecated `elasticsearch.configureNode`, `image.pullSecret` and `postgresql.postgresqlServer`
 
 ## [10.8.1]
 * Update Chart's version to 10.8.1
diff --git a/charts/sonarqube/Chart.yaml b/charts/sonarqube/Chart.yaml
index cd9422741..c145bed2a 100644
--- a/charts/sonarqube/Chart.yaml
+++ b/charts/sonarqube/Chart.yaml
@@ -39,7 +39,7 @@ annotations:
     - kind: changed
       description: "Remove the default passcode provided with 'monitoringPasscode'"
     - kind: removed
-      description: "Remove deprecated `elasticsearch.configureNode` and `image.pullSecret`"
+      description: "Remove deprecated `elasticsearch.configureNode`, `image.pullSecret` and `postgresql.postgresqlServer`"
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/images: |
     - name: sonarqube
diff --git a/charts/sonarqube/README.md b/charts/sonarqube/README.md
index dc0572bce..c85a6a76d 100644
--- a/charts/sonarqube/README.md
+++ b/charts/sonarqube/README.md
@@ -504,7 +504,6 @@ The bundled PostgreSQL Chart is deprecated. Please see <https://artifacthub.io/p
 | -------------------------------------------------------- | ---------------------------------------------------------------------- | --------------- |
 | `postgresql.enabled`                                     | Set to `false` to use external server                                  | `true`          |
 | `postgresql.existingSecret`                              | existingSecret Name of existing secret to use for PostgreSQL passwords | `nil`           |
-| `postgresql.postgresqlServer`                            | (DEPRECATED) Hostname of the external PostgreSQL server                | `nil`           |
 | `postgresql.postgresqlUsername`                          | PostgreSQL database user                                               | `sonarUser`     |
 | `postgresql.postgresqlPassword`                          | PostgreSQL database password                                           | `sonarPass`     |
 | `postgresql.postgresqlDatabase`                          | PostgreSQL database name                                               | `sonarDB`       |
diff --git a/charts/sonarqube/templates/_helpers.tpl b/charts/sonarqube/templates/_helpers.tpl
index 971011f20..6b75a6c18 100644
--- a/charts/sonarqube/templates/_helpers.tpl
+++ b/charts/sonarqube/templates/_helpers.tpl
@@ -85,8 +85,6 @@ Expand the Application Image name.
 {{- define "postgresql.hostname" -}}
 {{- if .Values.postgresql.enabled -}}
 {{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s" .Values.postgresql.postgresqlServer -}}
 {{- end -}}
 {{- end -}}
 
diff --git a/tests/unit-compatibility-test/fixtures/sonarqube-dce/secret-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube-dce/secret-values.yaml
index 15b660966..39687f9ab 100644
--- a/tests/unit-compatibility-test/fixtures/sonarqube-dce/secret-values.yaml
+++ b/tests/unit-compatibility-test/fixtures/sonarqube-dce/secret-values.yaml
@@ -223,7 +223,7 @@ metadata:
     heritage: Helm
 data:
   SONAR_JDBC_USERNAME: sonarUser
-  SONAR_JDBC_URL: "jdbc:postgresql://%!s(<nil>):5432/sonarDB"
+  SONAR_JDBC_URL: "jdbc:postgresql://:5432/sonarDB"
 ---
 # Source: sonarqube-dce/templates/service.yaml
 apiVersion: v1
diff --git a/tests/unit-compatibility-test/fixtures/sonarqube/secret-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/secret-values.yaml
index 9df3093ff..08b2759d8 100644
--- a/tests/unit-compatibility-test/fixtures/sonarqube/secret-values.yaml
+++ b/tests/unit-compatibility-test/fixtures/sonarqube/secret-values.yaml
@@ -146,7 +146,7 @@ metadata:
     heritage: Helm
 data:
   SONAR_JDBC_USERNAME: sonarUser
-  SONAR_JDBC_URL: "jdbc:postgresql://%!s(<nil>):5432/sonarDB"
+  SONAR_JDBC_URL: "jdbc:postgresql://:5432/sonarDB"
 ---
 # Source: sonarqube/templates/service.yaml
 apiVersion: v1