From 97af834e6762057ab852a2ae5a612e1da9c67d7e Mon Sep 17 00:00:00 2001
From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Mon, 31 Jan 2022 14:05:10 +0100
Subject: [PATCH] REL-2147 DOCKER-42 Update SonarQube to 9.3.0; officially
 support DCE Chart

---
 charts/sonarqube-dce/CHANGELOG.md |  5 +++++
 charts/sonarqube-dce/Chart.yaml   | 10 ++++++----
 charts/sonarqube-dce/values.yaml  |  4 ++--
 charts/sonarqube/CHANGELOG.md     |  6 ++++++
 charts/sonarqube/Chart.yaml       |  8 +++++---
 charts/sonarqube/values.yaml      |  2 +-
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/charts/sonarqube-dce/CHANGELOG.md b/charts/sonarqube-dce/CHANGELOG.md
index 7931a8d26..800ca3a5f 100644
--- a/charts/sonarqube-dce/CHANGELOG.md
+++ b/charts/sonarqube-dce/CHANGELOG.md
@@ -1,8 +1,13 @@
 # SonarQube Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [1.0.0]
+* updated SonarQube to 9.3.0
+* officially support SonarQube DCE
+
 ## [0.6.5]
 * name of elasticsearch keystore password secret is now aligned with the rest of the chart
+
 ## [0.6.4]
 * properties are now correctly set
 
diff --git a/charts/sonarqube-dce/Chart.yaml b/charts/sonarqube-dce/Chart.yaml
index 6307fee59..dca4dd033 100644
--- a/charts/sonarqube-dce/Chart.yaml
+++ b/charts/sonarqube-dce/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: sonarqube-dce
 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.
-version: 0.6.5
-appVersion: 9.2.4
+version: 1.0.0
+appVersion: 9.3.0
 keywords:
   - coverage
   - security
@@ -51,9 +51,11 @@ annotations:
       description: "properties are now correctly set"
     - kind: changed
       description: "name of elasticsearch keystore password secret is now aligned with the rest of the chart"
+    - kind: changed
+      description: "updated SonarQube to 9.3.0"
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/images: |
     - name: sonarqube-app
-      image: sonarqube:9.2.4-datacenter-app
+      image: sonarqube:9.3.0-datacenter-app
     - name: sonarqube-search
-      image: sonarqube:9.2.4-datacenter-app
+      image: sonarqube:9.3.0-datacenter-app
diff --git a/charts/sonarqube-dce/values.yaml b/charts/sonarqube-dce/values.yaml
index 6b8dcecbb..23e02d36c 100644
--- a/charts/sonarqube-dce/values.yaml
+++ b/charts/sonarqube-dce/values.yaml
@@ -5,7 +5,7 @@
 searchNodes:
   image:
     repository: sonarqube
-    tag: 9.2.4-datacenter-search
+    tag: 9.3.0-datacenter-search
     pullPolicy: IfNotPresent
     # If using a private repository, the imagePullSecrets to use
     # pullSecrets:
@@ -110,7 +110,7 @@ searchNodes:
 ApplicationNodes:
   image:
     repository: sonarqube
-    tag: 9.2.4-datacenter-app
+    tag: 9.3.0-datacenter-app
     pullPolicy: IfNotPresent
     # If using a private repository, the imagePullSecrets to use
     # pullSecrets:
diff --git a/charts/sonarqube/CHANGELOG.md b/charts/sonarqube/CHANGELOG.md
index c4557f69b..8e9a2c5c1 100644
--- a/charts/sonarqube/CHANGELOG.md
+++ b/charts/sonarqube/CHANGELOG.md
@@ -1,6 +1,12 @@
 # SonarQube Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [2.0.0]
+* updated SonarQube to 9.3.0
+
+## [1.6.5]
+* add securitycontext to wait-for-db and change-password hook
+
 ## [1.6.4]
 * properties are now correctly set
 
diff --git a/charts/sonarqube/Chart.yaml b/charts/sonarqube/Chart.yaml
index 9b70c70d7..f091ecccf 100644
--- a/charts/sonarqube/Chart.yaml
+++ b/charts/sonarqube/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: sonarqube
 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.
-version: 1.6.5
-appVersion: 9.2.4
+version: 2.0.0
+appVersion: 9.3.0
 keywords:
   - coverage
   - security
@@ -51,7 +51,9 @@ annotations:
       description: "properties are now correctly set"
     - kind: fixed
       description: "add securitycontext to wait-for-db and change-password hook"
+    - kind: changed
+      description: "updated SonarQube to 9.3.0"
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/images: |
     - name: sonarqube
-      image: sonarqube:9.2.4-community
+      image: sonarqube:9.3.0-community
diff --git a/charts/sonarqube/values.yaml b/charts/sonarqube/values.yaml
index ba5c4c02a..43646ea85 100644
--- a/charts/sonarqube/values.yaml
+++ b/charts/sonarqube/values.yaml
@@ -27,7 +27,7 @@ edition: "community"
 
 image:
   repository: sonarqube
-  tag: 9.2.4-{{ .Values.edition }}
+  tag: 9.3.0-{{ .Values.edition }}
   pullPolicy: IfNotPresent
   # If using a private repository, the imagePullSecrets to use
   # pullSecrets: