From a84ae594283cd8a98e3d3699cc3509a15d273b72 Mon Sep 17 00:00:00 2001 From: jeremy cotineau Date: Wed, 8 Jan 2025 11:33:16 +0100 Subject: [PATCH 1/3] SONAR-24105 remove 9.9 deprecated feature --- charts/sonarqube-dce/README.md | 2 +- charts/sonarqube/CHANGELOG.md | 1 + charts/sonarqube/Chart.yaml | 2 ++ charts/sonarqube/README.md | 5 ++--- charts/sonarqube/templates/_pod.tpl | 2 +- charts/sonarqube/values.yaml | 2 -- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/sonarqube-dce/README.md b/charts/sonarqube-dce/README.md index 94572cdd8..cf4f417ea 100644 --- a/charts/sonarqube-dce/README.md +++ b/charts/sonarqube-dce/README.md @@ -683,7 +683,7 @@ Since SonarQube needs Elasticsearch, some [bootstrap checks](https://www.elastic This chart offers the option to use an initContainer in privilaged mode to automatically set certain kernel settings on the kube worker. While this can ensure proper functionality of Elasticsearch, modifying the underlying kernel settings on the Kubernetes node can impact other users. It may be best to work with your cluster administrator to either provide specific nodes with the proper kernel settings, or ensure they are set cluster wide. -To enable auto-configuration of the kube worker node, set `elasticsearch.configureNode` to `true`. This is the default behavior, so you do not need to explicitly set this. +To enable auto-configuration of the kube worker node, set `initSysctl.enabled` to `true`. This is the default behavior, so you do not need to explicitly set this. This will run `sysctl -w vm.max_map_count=262144` on the worker where the sonarqube pod(s) get scheduled. This needs to be set to `262144` but normally defaults to `65530`. Other kernel settings are recommended by the [docker image](https://hub.docker.com/_/sonarqube/#requirements), but the defaults work fine in most cases. diff --git a/charts/sonarqube/CHANGELOG.md b/charts/sonarqube/CHANGELOG.md index 2079dfa7e..2e7315a47 100644 --- a/charts/sonarqube/CHANGELOG.md +++ b/charts/sonarqube/CHANGELOG.md @@ -6,6 +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` ## [10.8.1] * Update Chart's version to 10.8.1 diff --git a/charts/sonarqube/Chart.yaml b/charts/sonarqube/Chart.yaml index b413333d7..d044a1c7b 100644 --- a/charts/sonarqube/Chart.yaml +++ b/charts/sonarqube/Chart.yaml @@ -38,6 +38,8 @@ annotations: description: "Support Kubernetes v1.32" - kind: changed description: "Remove the default passcode provided with 'monitoringPasscode'" + - kind: removed + description: "Remove deprecated `elasticsearch.configureNode`" artifacthub.io/containsSecurityUpdates: "false" artifacthub.io/images: | - name: sonarqube diff --git a/charts/sonarqube/README.md b/charts/sonarqube/README.md index c626443ba..77a73977e 100644 --- a/charts/sonarqube/README.md +++ b/charts/sonarqube/README.md @@ -308,7 +308,6 @@ The following table lists the configurable parameters of the SonarQube chart and | Parameter | Description | Default | | ------------------------------- | ----------------------------------------------- | ------- | -| `elasticsearch.configureNode` | [DEPRECATED] Use initSysctl.enabled instead. | `false` | | `elasticsearch.bootstrapChecks` | Enables/disables Elasticsearch bootstrap checks | `true` | ### Service @@ -624,11 +623,11 @@ Since SonarQube comes bundled with an Elasticsearch instance, some [bootstrap ch This chart offers the option to use an initContainer in privileged mode to automatically set certain kernel settings on the kube worker. While this can ensure proper functionality of Elasticsearch, modifying the underlying kernel settings on the Kubernetes node can impact other users. It may be best to work with your cluster administrator to either provide specific nodes with the proper kernel settings, or ensure they are set cluster wide. -To enable auto-configuration of the kube worker node, set `elasticsearch.configureNode` to `true`. This is the default behavior, so you do not need to explicitly set this. +To enable auto-configuration of the kube worker node, set `initSysctl.enabled` to `true`. This is the default behavior, so you do not need to explicitly set this. This will run `sysctl -w vm.max_map_count=262144` on the worker where the sonarqube pod(s) get scheduled. This needs to be set to `262144` but normally defaults to `65530`. Other kernel settings are recommended by the [docker image](https://hub.docker.com/_/sonarqube/#requirements), but the defaults work fine in most cases. -To disable worker node configuration, set `elasticsearch.configureNode` to `false`. Note that if node configuration is not enabled, then you will likely need to also disable the Elasticsearch bootstrap checks. These can be explicitly disabled by setting `elasticsearch.bootstrapChecks` to `false`. +To disable worker node configuration, set `initSysctl.enabled` to `false`. Note that if node configuration is not enabled, then you will likely need to also disable the Elasticsearch bootstrap checks. These can be explicitly disabled by setting `elasticsearch.bootstrapChecks` to `false`. ### Extra Config diff --git a/charts/sonarqube/templates/_pod.tpl b/charts/sonarqube/templates/_pod.tpl index dc216a80b..1676fd928 100644 --- a/charts/sonarqube/templates/_pod.tpl +++ b/charts/sonarqube/templates/_pod.tpl @@ -77,7 +77,7 @@ spec: env: {{- (include "sonarqube.combined_env" . | fromJsonArray) | toYaml | trim | nindent 8 }} {{- end }} - {{- if and (or .Values.initSysctl.enabled .Values.elasticsearch.configureNode) (not .Values.OpenShift.enabled) }} + {{- if and .Values.initSysctl.enabled (not .Values.OpenShift.enabled) }} - name: init-sysctl image: {{ default (include "sonarqube.image" $) .Values.initSysctl.image }} imagePullPolicy: {{ .Values.image.pullPolicy }} diff --git a/charts/sonarqube/values.yaml b/charts/sonarqube/values.yaml index 7a13b3d45..671bffe7a 100644 --- a/charts/sonarqube/values.yaml +++ b/charts/sonarqube/values.yaml @@ -88,8 +88,6 @@ containerSecurityContext: # Settings to configure elasticsearch host requirements elasticsearch: - # (DEPRECATED) Use initSysctl.enabled instead - configureNode: false bootstrapChecks: true service: From b3fc8bebbe951bea89c9508c8ff78e0ff15f42c5 Mon Sep 17 00:00:00 2001 From: jeremy cotineau Date: Wed, 8 Jan 2025 16:50:36 +0100 Subject: [PATCH 2/3] SONAR-24105 remove deprecated pullSecret --- charts/sonarqube-dce/CHANGELOG.md | 1 + charts/sonarqube-dce/Chart.yaml | 2 ++ charts/sonarqube-dce/README.md | 2 -- .../sonarqube-dce/templates/change-admin-password-hook.yml | 7 +------ charts/sonarqube-dce/templates/sonarqube-application.yaml | 7 +------ charts/sonarqube-dce/templates/sonarqube-search.yaml | 7 +------ charts/sonarqube-dce/templates/tests/sonarqube-test.yaml | 7 +------ charts/sonarqube/CHANGELOG.md | 2 +- charts/sonarqube/Chart.yaml | 2 +- charts/sonarqube/README.md | 1 - charts/sonarqube/templates/_pod.tpl | 5 +---- charts/sonarqube/templates/change-admin-password-hook.yml | 5 +---- charts/sonarqube/templates/tests/sonarqube-test.yaml | 5 +---- .../fixtures/sonarqube-dce/custom-image-values.yaml | 6 ++++++ .../fixtures/sonarqube/custom-image-values.yaml | 4 ++++ .../sonarqube-dce/custom-image-values.yaml | 6 +++++- .../sonarqube/custom-image-values.yaml | 4 +++- 17 files changed, 30 insertions(+), 43 deletions(-) diff --git a/charts/sonarqube-dce/CHANGELOG.md b/charts/sonarqube-dce/CHANGELOG.md index dce2e63e1..30f72f95b 100644 --- a/charts/sonarqube-dce/CHANGELOG.md +++ b/charts/sonarqube-dce/CHANGELOG.md @@ -6,6 +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` ## [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 6ab45029a..4d3e8da9b 100644 --- a/charts/sonarqube-dce/Chart.yaml +++ b/charts/sonarqube-dce/Chart.yaml @@ -33,6 +33,8 @@ annotations: description: "Support Kubernetes v1.32" - kind: changed description: "Remove the default passcode provided with 'monitoringPasscode'" + - kind: removed + description: "Remove deprecated `ApplicationNodes.image.pullSecret` and `searchNodes.image.pullSecret`" artifacthub.io/links: | - name: support url: https://community.sonarsource.com/ diff --git a/charts/sonarqube-dce/README.md b/charts/sonarqube-dce/README.md index cf4f417ea..030fe4663 100644 --- a/charts/sonarqube-dce/README.md +++ b/charts/sonarqube-dce/README.md @@ -284,7 +284,6 @@ The following table lists the configurable parameters of the SonarQube chart and | `searchNodes.image.repository` | search image repository | `sonarqube` | | `searchNodes.image.tag` | search image tag | `10.8.1-datacenter-search` | | `searchNodes.image.pullPolicy` | search image pull policy | `IfNotPresent` | -| `searchNodes.image.pullSecret` | (DEPRECATED) search imagePullSecret to use for private repository | `nil` | | `searchNodes.image.pullSecrets` | search imagePullSecrets to use for private repository | `nil` | | `searchNodes.annotations` | Map of annotations to add to the search pods | `{}` | | `searchNodes.env` | Environment variables to attach to the search pods | `nil` | @@ -341,7 +340,6 @@ The following table lists the configurable parameters of the SonarQube chart and | `applicationNodes.image.repository` | app image repository | `sonarqube` | | `applicationNodes.image.tag` | app image tag | `10.8.1-datacenter-app` | | `applicationNodes.image.pullPolicy` | app image pull policy | `IfNotPresent` | -| `applicationNodes.image.pullSecret` | (DEPRECATED) app imagePullSecret to use for private repository | `nil` | | `applicationNodes.image.pullSecrets` | app imagePullSecrets to use for private repository | `nil` | | `applicationNodes.annotations` | Map of annotations to add to the app pods | `{}` | | `applicationNodes.env` | Environment variables to attach to the app pods | `nil` | diff --git a/charts/sonarqube-dce/templates/change-admin-password-hook.yml b/charts/sonarqube-dce/templates/change-admin-password-hook.yml index 7143ee14c..b9d42e887 100644 --- a/charts/sonarqube-dce/templates/change-admin-password-hook.yml +++ b/charts/sonarqube-dce/templates/change-admin-password-hook.yml @@ -35,14 +35,9 @@ spec: {{- end }} spec: restartPolicy: OnFailure - {{- if or .Values.ApplicationNodes.image.pullSecrets .Values.ApplicationNodes.image.pullSecret }} + {{- if .Values.ApplicationNodes.image.pullSecrets }} imagePullSecrets: - {{- if .Values.ApplicationNodes.image.pullSecret }} - - name: {{ .Values.ApplicationNodes.image.pullSecret }} - {{- end }} - {{- if .Values.ApplicationNodes.image.pullSecrets }} {{ toYaml .Values.ApplicationNodes.image.pullSecrets | indent 8 }} - {{- end }} {{- end }} serviceAccountName: {{ template "sonarqube.serviceAccountName" . }} {{- if .Values.tolerations }} diff --git a/charts/sonarqube-dce/templates/sonarqube-application.yaml b/charts/sonarqube-dce/templates/sonarqube-application.yaml index c25147d84..62bc3952e 100644 --- a/charts/sonarqube-dce/templates/sonarqube-application.yaml +++ b/charts/sonarqube-dce/templates/sonarqube-application.yaml @@ -55,14 +55,9 @@ spec: {{- end }} spec: automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }} - {{- if or .Values.ApplicationNodes.image.pullSecrets .Values.ApplicationNodes.image.pullSecret }} + {{- if .Values.ApplicationNodes.image.pullSecrets }} imagePullSecrets: - {{- if .Values.ApplicationNodes.image.pullSecret }} - - name: {{ .Values.ApplicationNodes.image.pullSecret }} - {{- end }} - {{- if .Values.ApplicationNodes.image.pullSecrets }} {{ toYaml .Values.ApplicationNodes.image.pullSecrets | indent 8 }} - {{- end }} {{- end }} initContainers: {{- if .Values.ApplicationNodes.extraInitContainers }} diff --git a/charts/sonarqube-dce/templates/sonarqube-search.yaml b/charts/sonarqube-dce/templates/sonarqube-search.yaml index 74eff1dda..1435cc70e 100644 --- a/charts/sonarqube-dce/templates/sonarqube-search.yaml +++ b/charts/sonarqube-dce/templates/sonarqube-search.yaml @@ -79,14 +79,9 @@ spec: {{- end }} spec: automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }} - {{- if or .Values.searchNodes.image.pullSecrets .Values.searchNodes.image.pullSecret }} + {{- if .Values.searchNodes.image.pullSecrets }} imagePullSecrets: - {{- if .Values.searchNodes.image.pullSecret }} - - name: {{ .Values.searchNodes.image.pullSecret }} - {{- end }} - {{- if .Values.searchNodes.image.pullSecrets }} {{ toYaml .Values.searchNodes.image.pullSecrets | indent 8 }} - {{- end }} {{- end }} initContainers: {{- if .Values.extraInitContainers }} diff --git a/charts/sonarqube-dce/templates/tests/sonarqube-test.yaml b/charts/sonarqube-dce/templates/tests/sonarqube-test.yaml index 8ab0ff997..cf5a55fe1 100644 --- a/charts/sonarqube-dce/templates/tests/sonarqube-test.yaml +++ b/charts/sonarqube-dce/templates/tests/sonarqube-test.yaml @@ -14,14 +14,9 @@ metadata: heritage: {{ .Release.Service }} spec: automountServiceAccountToken: false - {{- if or .Values.ApplicationNodes.image.pullSecrets .Values.ApplicationNodes.image.pullSecret }} + {{- if .Values.ApplicationNodes.image.pullSecrets }} imagePullSecrets: - {{- if .Values.ApplicationNodes.image.pullSecret }} - - name: {{ .Values.ApplicationNodes.image.pullSecret }} - {{- end }} - {{- if .Values.ApplicationNodes.image.pullSecrets }} {{ toYaml .Values.ApplicationNodes.image.pullSecrets | indent 4 }} - {{- end }} {{- end }} containers: - name: {{ .Release.Name }}-ui-test diff --git a/charts/sonarqube/CHANGELOG.md b/charts/sonarqube/CHANGELOG.md index 2e7315a47..b04ca71d6 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` +* Remove deprecated `elasticsearch.configureNode` and `image.pullSecret` ## [10.8.1] * Update Chart's version to 10.8.1 diff --git a/charts/sonarqube/Chart.yaml b/charts/sonarqube/Chart.yaml index d044a1c7b..cd9422741 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`" + description: "Remove deprecated `elasticsearch.configureNode` and `image.pullSecret`" artifacthub.io/containsSecurityUpdates: "false" artifacthub.io/images: | - name: sonarqube diff --git a/charts/sonarqube/README.md b/charts/sonarqube/README.md index 77a73977e..dc0572bce 100644 --- a/charts/sonarqube/README.md +++ b/charts/sonarqube/README.md @@ -294,7 +294,6 @@ The following table lists the configurable parameters of the SonarQube chart and | `image.repository` | image repository | `sonarqube` | | `image.tag` | `sonarqube` image tag. Please note that the default `10.8.1-{{ .Values.edition }}` is deprecated. | `10.8.1-{{ .Values.edition }}` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `image.pullSecret` | (DEPRECATED) imagePullSecret to use for private repository | `None` | | `image.pullSecrets` | imagePullSecrets to use for private repository | `None` | ### Security diff --git a/charts/sonarqube/templates/_pod.tpl b/charts/sonarqube/templates/_pod.tpl index 1676fd928..b0a03c692 100644 --- a/charts/sonarqube/templates/_pod.tpl +++ b/charts/sonarqube/templates/_pod.tpl @@ -30,11 +30,8 @@ spec: {{- with (include "sonarqube.securityContext" .) }} securityContext: {{- . | nindent 4 }} {{- end }} - {{- if or .Values.image.pullSecrets .Values.image.pullSecret }} + {{- if .Values.image.pullSecrets }} imagePullSecrets: - {{- if .Values.image.pullSecret }} - - name: {{ .Values.image.pullSecret }} - {{- end }} {{- with .Values.image.pullSecrets }} {{- toYaml . | nindent 4 }} {{- end }} diff --git a/charts/sonarqube/templates/change-admin-password-hook.yml b/charts/sonarqube/templates/change-admin-password-hook.yml index f557e321e..5c86fe3e0 100644 --- a/charts/sonarqube/templates/change-admin-password-hook.yml +++ b/charts/sonarqube/templates/change-admin-password-hook.yml @@ -20,11 +20,8 @@ spec: labels: {{- include "sonarqube.labels" . | nindent 8 }} spec: restartPolicy: OnFailure - {{- if or .Values.image.pullSecrets .Values.image.pullSecret }} + {{- if .Values.image.pullSecrets }} imagePullSecrets: - {{- if .Values.image.pullSecret }} - - name: {{ .Values.image.pullSecret }} - {{- end }} {{- with .Values.image.pullSecrets }} {{- toYaml . | nindent 8 }} {{- end }} diff --git a/charts/sonarqube/templates/tests/sonarqube-test.yaml b/charts/sonarqube/templates/tests/sonarqube-test.yaml index a47ff4808..62c9dcf96 100644 --- a/charts/sonarqube/templates/tests/sonarqube-test.yaml +++ b/charts/sonarqube/templates/tests/sonarqube-test.yaml @@ -8,11 +8,8 @@ metadata: labels: {{- include "sonarqube.labels" . | nindent 4 }} spec: automountServiceAccountToken: false - {{- if or .Values.image.pullSecrets .Values.image.pullSecret }} + {{- if .Values.image.pullSecrets }} imagePullSecrets: - {{- if .Values.image.pullSecret }} - - name: {{ .Values.image.pullSecret }} - {{- end }} {{- with .Values.image.pullSecrets }} {{- toYaml . | nindent 4 }} {{- end }} diff --git a/tests/unit-compatibility-test/fixtures/sonarqube-dce/custom-image-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube-dce/custom-image-values.yaml index 21b99450b..9300a8188 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube-dce/custom-image-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube-dce/custom-image-values.yaml @@ -405,6 +405,8 @@ spec: checksum/secret: c953abbc65dd935f1e5118b3efb1e082374ad203eba24a98829fead12e401630 spec: automountServiceAccountToken: false + imagePullSecrets: + - name: mypullsecret initContainers: - name: "wait-for-db" image: sonarqube:lts-community@sha256:3596d14feb065a31ce84cef60cc3ecfb7b47233ef860fd85c0d4e465f676c9f7 @@ -774,6 +776,8 @@ spec: checksum/secret: c953abbc65dd935f1e5118b3efb1e082374ad203eba24a98829fead12e401630 spec: automountServiceAccountToken: false + imagePullSecrets: + - name: mypullsecret initContainers: - name: init-sysctl image: sonarqube:lts-community@sha256:3596d14feb065a31ce84cef60cc3ecfb7b47233ef860fd85c0d4e465f676c9f7 @@ -972,6 +976,8 @@ metadata: heritage: Helm spec: automountServiceAccountToken: false + imagePullSecrets: + - name: mypullsecret containers: - name: custom-image-values.yaml-ui-test image: "sonarqube:lts-community@sha256:3596d14feb065a31ce84cef60cc3ecfb7b47233ef860fd85c0d4e465f676c9f7" diff --git a/tests/unit-compatibility-test/fixtures/sonarqube/custom-image-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/custom-image-values.yaml index d9c139617..cd670b36d 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/custom-image-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/custom-image-values.yaml @@ -411,6 +411,8 @@ spec: automountServiceAccountToken: false securityContext: fsGroup: 0 + imagePullSecrets: + - name: mypullsecret initContainers: - name: "wait-for-db" image: sonarqube:lts-community@sha256:3596d14feb065a31ce84cef60cc3ecfb7b47233ef860fd85c0d4e465f676c9f7 @@ -577,6 +579,8 @@ metadata: heritage: Helm spec: automountServiceAccountToken: false + imagePullSecrets: + - name: mypullsecret containers: - name: custom-image-values.yaml-ui-test image: "sonarqube:lts-community@sha256:3596d14feb065a31ce84cef60cc3ecfb7b47233ef860fd85c0d4e465f676c9f7" diff --git a/tests/unit-compatibility-test/sonarqube-dce/custom-image-values.yaml b/tests/unit-compatibility-test/sonarqube-dce/custom-image-values.yaml index 133b34dc2..2839f8f30 100644 --- a/tests/unit-compatibility-test/sonarqube-dce/custom-image-values.yaml +++ b/tests/unit-compatibility-test/sonarqube-dce/custom-image-values.yaml @@ -2,7 +2,11 @@ ApplicationNodes: image: #Value comming from the user issue tag: lts-community@sha256:3596d14feb065a31ce84cef60cc3ecfb7b47233ef860fd85c0d4e465f676c9f7 + pullSecrets: + - name: mypullsecret searchNodes: image: #Value comming from the user issue - tag: lts-community@sha256:3596d14feb065a31ce84cef60cc3ecfb7b47233ef860fd85c0d4e465f676c9f7 \ No newline at end of file + tag: lts-community@sha256:3596d14feb065a31ce84cef60cc3ecfb7b47233ef860fd85c0d4e465f676c9f7 + pullSecrets: + - name: mypullsecret \ No newline at end of file diff --git a/tests/unit-compatibility-test/sonarqube/custom-image-values.yaml b/tests/unit-compatibility-test/sonarqube/custom-image-values.yaml index 60c8883ee..81456134f 100644 --- a/tests/unit-compatibility-test/sonarqube/custom-image-values.yaml +++ b/tests/unit-compatibility-test/sonarqube/custom-image-values.yaml @@ -1,3 +1,5 @@ image: #Value comming from the user issue - tag: lts-community@sha256:3596d14feb065a31ce84cef60cc3ecfb7b47233ef860fd85c0d4e465f676c9f7 \ No newline at end of file + tag: lts-community@sha256:3596d14feb065a31ce84cef60cc3ecfb7b47233ef860fd85c0d4e465f676c9f7 + pullSecrets: + - name: mypullsecret \ No newline at end of file From 77820fc0f910b079e42e5a5a5b44b885fba0b038 Mon Sep 17 00:00:00 2001 From: jeremy cotineau Date: Wed, 8 Jan 2025 17:03:06 +0100 Subject: [PATCH 3/3] 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 ):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():5432/sonarDB" + SONAR_JDBC_URL: "jdbc:postgresql://:5432/sonarDB" --- # Source: sonarqube/templates/service.yaml apiVersion: v1