Skip to content

Commit 11fefb5

Browse files
leo-geoffroy-sonarsourceleo-geoffroy-sonarsource
authored
REL-2377 Revert and upgrade for release
1 parent 2a3bed2 commit 11fefb5

File tree

15 files changed

+56
-121
lines changed

15 files changed

+56
-121
lines changed

‎charts/sonarqube-dce/CHANGELOG.md‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
11
# SonarQube Chart Changelog
22
All changes to this chart will be documented in this file.
33

4-
## [4.0.5]
5-
* Add the possibility of using a secret for customizing the admin password
6-
7-
## [4.0.4]
8-
* Remove unreachable condition and fix the right values for sonarProperties and sonarSecretProperties
9-
10-
## [4.0.3]
11-
* Bump apiVersion to v2
12-
13-
## [4.0.2]
14-
* Add documentation for ApplicationNodes.jwtSecret
15-
16-
## [4.0.1]
17-
* Add documentation for ingress tls
4+
## [4.0.6]
5+
* Updated SonarQube to 9.6.1
186

197
## [4.0.0]
208
* Updated SonarQube to 9.6.0

‎charts/sonarqube-dce/Chart.yaml‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
apiVersion: v2
1+
apiVersion: v1
22
name: sonarqube-dce
33
description: SonarQube offers Code Quality and Code Security analysis for up to 27 languages. Find Bugs, Vulnerabilities, Security Hotspots and Code Smells throughout your workflow.
4-
type: application
5-
version: 4.0.5
6-
appVersion: 9.6.0
4+
version: 4.0.6
5+
appVersion: 9.6.1
76
keywords:
87
- coverage
98
- security
@@ -26,19 +25,10 @@ annotations:
2625
url: https://github.com/SonarSource/helm-chart-sonarqube/tree/master/charts/sonarqube-dce
2726
artifacthub.io/changes: |
2827
- kind: changed
29-
description: "Updated SonarQube to 9.6.0"
28+
description: "Updated SonarQube to 9.6.1"
3029
artifacthub.io/containsSecurityUpdates: "false"
3130
artifacthub.io/images: |
3231
- name: sonarqube-app
33-
image: sonarqube:9.6.0-datacenter-app
32+
image: sonarqube:9.6.1-datacenter-app
3433
- name: sonarqube-search
35-
image: sonarqube:9.6.0-datacenter-search
36-
dependencies:
37-
- name: postgresql
38-
version: 10.15.0
39-
repository: https://charts.bitnami.com/bitnami
40-
condition: postgresql.enabled
41-
- name: ingress-nginx
42-
version: 4.0.13
43-
repository: https://kubernetes.github.io/ingress-nginx
44-
condition: nginx.enabled
34+
image: sonarqube:9.6.1-datacenter-search

‎charts/sonarqube-dce/README.md‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@ Please note that this chart does NOT support SonarQube Community, Developer, and
1616

1717
## Installing the chart
1818

19-
> **_NOTE:_** Please refer to [the official page](https://docs.sonarqube.org/latest/setup/sonarqube-cluster-on-kubernetes/) for further information on how to install and tune the helm chart specifications.
20-
21-
Prior to installing the chart, please ensure that the `ApplicationNodes.jwtSecret` value is set properly with a HS256 key encoded with base64. In the following, an example on how to generate this key on a Unix system:
22-
```bash
23-
echo -n "your_secret" | openssl dgst -sha256 -hmac "your_key" -binary | base64
24-
```
19+
Please ensure that the value for `ApplicationNodes.jwtSecret` is set with something like `echo -n "your_secret" | openssl dgst -sha256 -hmac "your_key" -binary | base64` and persist this in your `values.yaml`.
2520

2621
To install the chart:
2722

@@ -166,8 +161,8 @@ The following table lists the configurable parameters of the Sonarqube chart and
166161
| `ApplicationNodes.image.pullSecret` | (DEPRECATED) app imagePullSecret to use for private repository | `nil` |
167162
| `ApplicationNodes.image.pullSecrets` | app imagePullSecrets to use for private repository | `nil` |
168163
| `ApplicationNodes.env` | Environment variables to attach to the app pods | `nil` |
169-
| `ApplicationNodes.sonarProperties` | Custom `sonar.properties` key-value pairs for App Nodes (e.g., "ApplicationNodes.sonarProperties.sonar.forceAuthentication=true") | `None` |
170-
| `ApplicationNodes.sonarSecretProperties` | Additional `sonar.properties` key-value pairs for App Nodes to load from a secret | `None` |
164+
| `ApplicationNodes.sonarProperties` | Custom `sonar.properties` file for App Nodes | `None` |
165+
| `ApplicationNodes.sonarSecretProperties` | Additional `sonar.properties` file for App Nodes to load from a secret | `None` |
171166
| `ApplicationNodes.sonarSecretKey` | Name of existing secret used for settings encryption | `None` |
172167
| `ApplicationNodes.replicaCount` | Replica count of the app Nodes | `2` |
173168
| `ApplicationNodes.podDistributionBudget` | PodDisctributionBudget for the App Nodes | `minAvailable: "50%"` |
@@ -214,7 +209,7 @@ The following table lists the configurable parameters of the Sonarqube chart and
214209
| `ApplicationNodes.plugins.securityContext` | Security context for the container to download plugins | see `values.yaml |
215210
| `ApplicationNodes.jvmOpts` | Values to add to SONARQUBE_WEB_JVM_OPTS | `""` |
216211
| `ApplicationNodes.jvmCeOpts` | Values to add to SONAR_CE_JAVAOPTS | `""` |
217-
| `ApplicationNodes.jwtSecret` | A HS256 key encoded with base64 (*This value must be set before installing the chart, see [the documentation](https://docs.sonarqube.org/latest/setup/sonarqube-cluster-on-kubernetes/)*) | `""` |
212+
| `ApplicationNodes.jwtSecret` | A HS256 key encoded with base64 | `""` |
218213
| `ApplicationNodes.existingJwtSecret` | secret that contains the `jwtSecret` | `nil` |
219214
| `ApplicationNodes.resources.requests.memory` | memory request for app Nodes | `2Gi` |
220215
| `ApplicationNodes.resources.requests.cpu` | cpu request for app Nodes | `400m` |
@@ -396,7 +391,6 @@ The following table lists the configurable parameters of the Sonarqube chart and
396391
| `logging.jsonOutput` | Enable/Disable logging in JSON format | `false` |
397392
| `account.adminPassword` | Custom new admin password | `admin` |
398393
| `account.currentAdminPassword` | Current admin password | `admin` |
399-
| `account.adminPasswordSecretName` | Secret containing `password` (custom password) and `currentPassword` (current password) keys for admin | `None` |
400394
| `account.resources.requests.memory` | Memory request for Admin hook | `128Mi` |
401395
| `account.resources.requests.cpu` | CPU request for Admin hook | `100m` |
402396
| `account.resources.limits.memory` | Memory limit for Admin hook | `128Mi` |

‎charts/sonarqube-dce/requirements.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
dependencies:
2+
- name: postgresql
3+
version: 10.15.0
4+
repository: https://charts.bitnami.com/bitnami
5+
condition: postgresql.enabled
6+
- name: ingress-nginx
7+
version: 4.0.13
8+
repository: https://kubernetes.github.io/ingress-nginx
9+
condition: nginx.enabled

‎charts/sonarqube-dce/templates/change-admin-password-hook.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if .Values.account }}
2-
{{- if or .Values.account.adminPassword .Values.account.adminPasswordSecretName}}
2+
{{- if .Values.account.adminPassword }}
33
apiVersion: batch/v1
44
kind: Job
55
metadata:
@@ -57,20 +57,12 @@ spec:
5757
- name: ADMIN_PASSWORD
5858
valueFrom:
5959
secretKeyRef:
60-
{{- if .Values.account.adminPassword }}
6160
name: {{ template "sonarqube.fullname" . }}-admin-password
62-
{{- else }}
63-
name: {{ .Values.account.adminPasswordSecretName }}
64-
{{- end }}
6561
key: password
6662
- name: CURRENT_ADMIN_PASSWORD
6763
valueFrom:
6864
secretKeyRef:
69-
{{- if .Values.account.adminPassword }}
7065
name: {{ template "sonarqube.fullname" . }}-admin-password
71-
{{- else }}
72-
name: {{ .Values.account.adminPasswordSecretName }}
73-
{{- end }}
7466
key: currentPassword
7567
resources:
7668
{{ toYaml (default .Values.resources .Values.account.resources) | indent 10 }}

‎charts/sonarqube-dce/templates/sonarqube-application.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,14 @@ spec:
315315
{{- toYaml .Values.containerSecurityContext | nindent 12 }}
316316
{{- end }}
317317
volumeMounts:
318-
{{- if or .Values.ApplicationNodes.sonarProperties .Values.ApplicationNodes.sonarSecretProperties }}
318+
{{- if or .Values.sonarProperties .Values.sonarSecretProperties }}
319319
- mountPath: {{ .Values.sonarqubeFolder }}/conf/sonar.properties
320320
subPath: sonar.properties
321321
name: concat-dir
322+
{{- else if .Values.sonarProperties }}
323+
- mountPath: {{ .Values.sonarqubeFolder }}/conf/sonar.properties
324+
subPath: sonar.properties
325+
name: config
322326
{{- end }}
323327
{{- if .Values.sonarSecretKey }}
324328
- mountPath: {{ .Values.sonarqubeFolder }}/secret/

‎charts/sonarqube-dce/values.yaml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
searchNodes:
66
image:
77
repository: sonarqube
8-
tag: 9.6.0-datacenter-search
8+
tag: 9.6.1-datacenter-search
99
pullPolicy: IfNotPresent
1010
# If using a private repository, the imagePullSecrets to use
1111
# pullSecrets:
@@ -242,7 +242,7 @@ ApplicationNodes:
242242
## Values to add to SONAR_CE_JAVAOPTS
243243
jvmCeOpts: ""
244244

245-
# Set this value with a HS256 key encoded with base64. You can generate a key using the following command on a Unix system: echo -n "your_secret" | openssl dgst -sha256 -hmac "your_key" -binary | base64
245+
# SONAR_AUTH_JWTBASE64HS256SECRET
246246
jwtSecret: ""
247247
# can use existing secret with SONAR_AUTH_JWTBASE64HS256SECRET as key
248248
# existingJwtSecret: ""
@@ -311,7 +311,7 @@ ingress:
311311
# traffic-type: external
312312
# traffic-type: internal
313313
tls: []
314-
# Secrets must be manually created in the namespace. To generate a self-signed certificate (and private key) and then create the secret in the cluster please refer to official documentation available at https://kubernetes.github.io/ingress-nginx/user-guide/tls/#tls-secrets
314+
# Secrets must be manually created in the namespace.
315315
# - secretName: chart-example-tls
316316
# hosts:
317317
# - chart-example.local
@@ -549,12 +549,8 @@ extraConfig:
549549
configmaps: []
550550

551551
# account:
552-
# The values can be set to define the current and the (new) custom admin passwords at the startup (the username will remain "admin")
553552
# adminPassword: admin
554553
# currentAdminPassword: admin
555-
# The above values can be also provided by a secret that contains "password" and "currentPassword" as keys. You can generate such a secret in your cluster
556-
# using "kubectl create secret generic admin-password-secret-name --from-literal=password=admin --from-literal=currentPassword=admin"
557-
# adminPasswordSecretName: ""
558554
# resources:
559555
# limits:
560556
# cpu: 100m

‎charts/sonarqube/CHANGELOG.md‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
11
# SonarQube Chart Changelog
22
All changes to this chart will be documented in this file.
33

4-
## [5.0.5]
5-
* Add the possibility of using a secret for customizing the admin password
6-
7-
## [5.0.4]
8-
* Add documentation for sonarProperties and sonarSecretProperties
9-
10-
## [5.0.3]
11-
* Bump apiVersion to v2
12-
13-
## [5.0.2]
14-
* Set the number of allowed replicas to 0 and 1
15-
16-
## [5.0.1]
17-
* Add documentation for ingress tls
4+
## [5.0.6]
5+
* Updated SonarQube to 9.6.1
186

197
## [5.0.0]
208
* Updated SonarQube to 9.6.0

‎charts/sonarqube/Chart.yaml‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
apiVersion: v2
1+
apiVersion: v1
22
name: sonarqube
33
description: SonarQube offers Code Quality and Code Security analysis for up to 27 languages. Find Bugs, Vulnerabilities, Security Hotspots and Code Smells throughout your workflow.
4-
type: application
5-
version: 5.0.5
6-
appVersion: 9.6.0
4+
version: 5.0.6
5+
appVersion: 9.6.1
76
keywords:
87
- coverage
98
- security
@@ -26,17 +25,8 @@ annotations:
2625
url: https://github.com/SonarSource/helm-chart-sonarqube/tree/master/charts/sonarqube
2726
artifacthub.io/changes: |
2827
- kind: changed
29-
description: "Updated SonarQube to 9.6.0"
28+
description: "Updated SonarQube to 9.6.1"
3029
artifacthub.io/containsSecurityUpdates: "false"
3130
artifacthub.io/images: |
3231
- name: sonarqube
33-
image: sonarqube:9.6.0-community
34-
dependencies:
35-
- name: postgresql
36-
version: 10.15.0
37-
repository: https://charts.bitnami.com/bitnami
38-
condition: postgresql.enabled
39-
- name: ingress-nginx
40-
version: 4.0.13
41-
repository: https://kubernetes.github.io/ingress-nginx
42-
condition: nginx.enabled
32+
image: sonarqube:9.6.1-community

‎charts/sonarqube/README.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ The following table lists the configurable parameters of the Sonarqube chart and
118118
| Parameter | Description | Default |
119119
| --------- | ----------- | ------- |
120120
| `deploymentType` | Deployment Type (supported values are `StatefulSet` or `Deployment`) | `StatefulSet` |
121-
| `replicaCount` | Number of replicas deployed (supported values are 0 and 1) | `1` |
121+
| `replicaCount` | Number of replicas deployed | `1` |
122122
| `deploymentStrategy` | Deployment strategy | `{}` |
123123
| `priorityClassName` | Schedule pods on priority (e.g. `high-priority`) | `None` |
124124
| `schedulerName` | Kubernetes scheduler name | `None` |
@@ -287,8 +287,8 @@ The following table lists the configurable parameters of the Sonarqube chart and
287287
| `jvmOpts` | Values to add to SONARQUBE_WEB_JVM_OPTS | `""` |
288288
| `jvmCeOpts` | Values to add to SONAR_CE_JAVAOPTS | `""` |
289289
| `sonarqubeFolder` | Directory name of Sonarqube | `/opt/sonarqube` |
290-
| `sonarProperties` | Custom `sonar.properties` key-value pairs (e.g., "sonarProperties.sonar.forceAuthentication=true") | `None` |
291-
| `sonarSecretProperties` | Additional `sonar.properties` key-value pairs to load from a secret | `None` |
290+
| `sonarProperties` | Custom `sonar.properties` file | `None` |
291+
| `sonarSecretProperties` | Additional `sonar.properties` file to load from a secret | `None` |
292292
| `sonarSecretKey` | Name of existing secret used for settings encryption | `None` |
293293
| `monitoringPasscode` | Value for sonar.web.systemPasscode. needed for LivenessProbes | `define_it` |
294294
| `extraContainers` | Array of extra containers to run alongside the `sonarqube` container (aka. Sidecars) | `[]` |
@@ -384,7 +384,6 @@ The following table lists the configurable parameters of the Sonarqube chart and
384384
| --------- | ----------- | ------- |
385385
| `account.adminPassword` | Custom admin password | `admin` |
386386
| `account.currentAdminPassword` | Current admin password | `admin` |
387-
| `account.adminPasswordSecretName` | Secret containing `password` (custom password) and `currentPassword` (current password) keys for admin | `None` |
388387
| `account.resources.requests.memory` | Memory request for Admin hook | `128Mi` |
389388
| `account.resources.requests.cpu` | CPU request for Admin hook | `100m` |
390389
| `account.resources.limits.memory` | Memory limit for Admin hook | `128Mi` |

0 commit comments

Comments
 (0)