SONAR-21728 add elasticsearch kernel requirements

resolve comment and run linter add elasticsearch parameters to schema.yaml
SonarSource · Feb 27, 2024 · 362205d · 362205d
1 parent 9d42eb5
commit 362205d
Show file tree

Hide file tree

Showing 7 changed files with 109 additions and 96 deletions.
diff --git 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 nginx-ingress-controller dependency to version 4.9.1
 * Fix the ingress.ingressClassName not being evaluated
 * Fix searchNodes.securityContext and ApplicationNodes.securityContext not being evaluated
+* Add `gcp_marketplace` value, implementing compatibility with google cloud marketplace app
 
 ## [10.4.0]
 * Upgrade SonarQube to 10.4.0

diff --git a/charts/sonarqube-dce/Chart.yaml b/charts/sonarqube-dce/Chart.yaml
@@ -35,6 +35,8 @@ annotations:
       description: "Fix the ingress.ingressClassName not being evaluated"
     - kind: fixed
       description: "Fix searchNodes.securityContext and ApplicationNodes.securityContext not being evaluated"
+    - kind: added
+      description: "Add `gcp_marketplace` value, implementing compatibility with google cloud marketplace app"
   artifacthub.io/links: |
     - name: support
       url: https://community.sonarsource.com/

diff --git a/charts/sonarqube-dce/README.md b/charts/sonarqube-dce/README.md
diff --git a/charts/sonarqube-dce/templates/application.yml b/charts/sonarqube-dce/templates/application.yml
@@ -19,7 +19,7 @@ spec:
         As a core element of our [Sonar solution](https://www.sonarsource.com/), SonarQube integrates into your existing workflow and detects issues in your code to help you perform continuous code inspections of your projects.
         The product analyses [30+ different programming languages](https://rules.sonarsource.com/) and integrates into your [Continuous Integration (CI)](https://docs.sonarsource.com/sonarqube/latest/analyzing-source-code/ci-integration/) pipeline of [DevOps platforms](https://docs.sonarsource.com/sonarqube/latest/devops-platform-integration/github-integration/) to ensure that your code meets high-quality standards.
     maintainers:
-    - name: SonarSourceSA
+    - name: SonarSource SA
       url: https://github.com/SonarSource/helm-chart-sonarqube/blob/master/charts/sonarqube-dce/Chart.yaml
     links:
     - description: 'User Guide: main SonarQube documentation'

diff --git a/google-cloud-marketplace-k8s-app/README.md b/google-cloud-marketplace-k8s-app/README.md
@@ -25,8 +25,6 @@ With the deployer being built, one can deploy the app as is, with
 
 ```shell
 # make sure the namespace has been created already.
-export JWT_SECRET=$(echo -n "your_secret" | openssl dgst -sha256 -hmac "your_key" -binary | base64)
-
 mpdev install \
   --deployer=$REGISTRY/$APP_NAME/deployer:$MINOR_VERSION \
   --parameters='{"name": "sonarqube-dce-gcapp-test", "namespace": "test-ns","ApplicationNodes.jwtSecret": "dZ0EB0KxnF++nr5+4vfTCaun/eWbv6gOoXodiAMqcFo=", "postgresql.enabled": true, "jdbcOverwrite.enable": false }'

diff --git a/google-cloud-marketplace-k8s-app/schema.yaml b/google-cloud-marketplace-k8s-app/schema.yaml
@@ -7,7 +7,8 @@ x-google-marketplace:
   publishedVersion: '10.4.0'
   publishedVersionMetadata:
     releaseNote: >-
-      A first release.
+      Releasing SonarQube 10.4.x as a google cloud k8s marketplace application
+      Please find the release note here: https://www.sonarsource.com/blog/sonarqube-10-4-release-announcement
   images:
     '':
       properties:
@@ -70,6 +71,16 @@ properties:
     description: The password to connect to the database
     type: string
     default: ''
+  initSysctl.enabled:
+    title: Enable initSysctl privileged initContainer to setup elasticearch kernel parameters.
+    description: please read our doc here https://github.com/SonarSource/helm-chart-sonarqube/blob/master/charts/sonarqube-dce/README.md#elasticsearch-prerequisites, this should be disabled and setup by your cluster admin
+    type: boolean
+    default: true
+  initFs.enabled:
+    title: Enable initFs root initContainer to setup filesystem parameters.
+    description: please read our doc here https://github.com/SonarSource/helm-chart-sonarqube/blob/master/charts/sonarqube-dce/README.md#production-use-case, this should not be required on google kubernetes clusters
+    type: boolean
+    default: false
   gcp_marketplace:
     title: GCP Marketplace enabled
     description: this flag indicate to the chart that it runs as a gcp marketplace application

diff --git a/tests/unit-compatibility-test/sonarqube-dce/application-values.yaml b/tests/unit-compatibility-test/sonarqube-dce/application-values.yaml
@@ -1,2 +1,2 @@
-#placeholder value to trigger the creation of the application (related to google cloud marketplace k8s app
+#placeholder value to trigger the creation of the application (related to google cloud marketplace k8s app)
 gcp_marketplace: true