fix

2024-05-12 12:03:32 +02:00
parent 599d175f82
commit 2890064fd4
191 changed files with 893 additions and 1068 deletions
--- a/apps/sonar/apps_v1_StatefulSet_sonar-sonarqube.yaml
+++ b/apps/sonar/apps_v1_StatefulSet_sonar-sonarqube.yaml
@@ -5,7 +5,7 @@ metadata:
  name: sonar-sonarqube
  labels:
    app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
    release: sonar
    heritage: Helm
    app.kubernetes.io/name: sonarqube-sonar-sonarqube
@@ -13,7 +13,7 @@ metadata:
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/part-of: sonarqube
    app.kubernetes.io/component: sonar-sonarqube
-    app.kubernetes.io/version: "10.4.0-community"
+    app.kubernetes.io/version: "10.5.1-community"
 spec:
  replicas: 1
  revisionHistoryLimit: 10
@@ -28,19 +28,20 @@ spec:
        app: sonarqube
        release: sonar
      annotations:
-        checksum/init-sysctl: a12e75ed1a8c3b06d9caf75f108948bde1e6cf6210bb3035994c8d4fdb9e1f39
-        checksum/init-fs: 36564fb78d2715ef7f589fd3df9b29b970835c4f265186a47fbb0f1f8ce35c7e
-        checksum/plugins: db3ffc7959ef0fc65edbd6803efe5cfa5bed57043487c5d29af43708459ce9fd
-        checksum/config: ead0105b73e0ab65eebc0f041f2c07af74aab9f4e121ada0b788b5e287bc1132
-        checksum/secret: 14fc9b43c5d5c61345694c7c8a2cab4fdee67d198dfec45498f58eb7a30b283d
-        checksum/prometheus-config: 79e17e350acb6b7a07c0204a52a6fe22bcb4c38b9f8339d15757f040698774dc
-        checksum/prometheus-ce-config: ef57c8341973db7eb712730278966b61b4aa23721f65f5e0e51a9012a6a7b28b
-    spec:      
+        checksum/init-sysctl: f024654d224568f7d00f522ab1f651e593efb55ee745e9624beec68996a4458d
+        checksum/init-fs: 4c8e59703fd03b0281f452e07eb3f3bdab1150a196f823234e641aaa2afb0253
+        checksum/plugins: 4e5baae46155e41236fcbdf85ea8b9ba3358994284bc26fb45d44a728d2b5c8e
+        checksum/config: 8dfa24e99816e4a8762c59197f8f41e53f8517b2f62d8839b7464952f77ad240
+        checksum/secret: 11c9bb7cdad024fc7971937b62d5245054c1091fc798528488974ef4bd5b7255
+        checksum/prometheus-config: 8b558b466ef4f60ab41a25ee83bb1cd6798a7c51aea6c557c75718f8b0527a61
+        checksum/prometheus-ce-config: 6af690da3580e26dbbfb7d1eea66284f1f52b2cff5db113b8acad5cdb87f4772
+    spec:
+      automountServiceAccountToken: false      
      securityContext:
        fsGroup: 0
      initContainers:
        - name: "wait-for-db"
-          image: sonarqube:10.4.0-community
+          image: sonarqube:10.5.1-community
          imagePullPolicy: IfNotPresent
          securityContext:
            allowPrivilegeEscalation: false
@@ -57,7 +58,7 @@ spec:
          command: ["/bin/bash", "-c"]
          args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/sonar-postgresql/5432) && exit 0; sleep 2;done; exit 1']
        - name: init-sysctl
-          image: sonarqube:10.4.0-community
+          image: sonarqube:10.5.1-community
          imagePullPolicy: IfNotPresent
          securityContext:
            privileged: true
@@ -70,8 +71,15 @@ spec:
          volumeMounts:
            - name: init-sysctl
              mountPath: /tmp/scripts/
+          env:
+            - name: SONAR_WEB_CONTEXT
+              value: /
+            - name: SONAR_WEB_JAVAOPTS
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8000:/opt/sonarqube/conf/prometheus-config.yaml
+            - name: SONAR_CE_JAVAOPTS
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml
        - name: inject-prometheus-exporter
-          image: sonarqube:10.4.0-community
+          image: sonarqube:10.5.1-community
          imagePullPolicy: IfNotPresent
          securityContext:
            allowPrivilegeEscalation: false
@@ -98,8 +106,14 @@ spec:
              value: 
            - name: no_proxy
              value: 
+            - name: SONAR_WEB_CONTEXT
+              value: /
+            - name: SONAR_WEB_JAVAOPTS
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8000:/opt/sonarqube/conf/prometheus-config.yaml
+            - name: SONAR_CE_JAVAOPTS
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml
        - name: install-plugins
-          image: sonarqube:10.4.0-community
+          image: sonarqube:10.5.1-community
          imagePullPolicy: IfNotPresent
          command: ["sh",
            "-e",
@@ -129,9 +143,15 @@ spec:
              value: 
            - name: no_proxy
              value: 
+            - name: SONAR_WEB_CONTEXT
+              value: /
+            - name: SONAR_WEB_JAVAOPTS
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8000:/opt/sonarqube/conf/prometheus-config.yaml
+            - name: SONAR_CE_JAVAOPTS
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml
      containers:
        - name: sonarqube
-          image: sonarqube:10.4.0-community
+          image: sonarqube:10.5.1-community
          imagePullPolicy: IfNotPresent
          ports:
            - name: http
@@ -146,19 +166,21 @@ spec:
          resources:
            limits:
              cpu: 800m
-              memory: 4Gi
+              ephemeral-storage: 512000M
+              memory: 6144M
            requests:
              cpu: 400m
-              memory: 2Gi
+              ephemeral-storage: 1536M
+              memory: 2048M
          env:
-            - name: SONAR_HELM_CHART_VERSION
-              value: 10.4.0_2288
-            - name: SONAR_WEB_JAVAOPTS
-              value: "-javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8000:/opt/sonarqube/conf/prometheus-config.yaml"
            - name: SONAR_WEB_CONTEXT
              value: /
+            - name: SONAR_WEB_JAVAOPTS
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8000:/opt/sonarqube/conf/prometheus-config.yaml
            - name: SONAR_CE_JAVAOPTS
-              value: "-javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml"
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml
+            - name: SONAR_HELM_CHART_VERSION
+              value: 10.5.1_2816
            - name: SONAR_JDBC_PASSWORD
              valueFrom:
                secretKeyRef:
@@ -178,8 +200,7 @@ spec:
              - sh
              - -c
              - |
-                host="$(hostname -i || echo '127.0.0.1')"
-                wget --no-proxy --quiet -O /dev/null --timeout=1 --header="X-Sonar-Passcode: $SONAR_WEB_SYSTEMPASSCODE" "http://${host}:9000/api/system/liveness"
+                wget --no-proxy --quiet -O /dev/null --timeout=1 --header="X-Sonar-Passcode: $SONAR_WEB_SYSTEMPASSCODE" "http://localhost:9000/api/system/liveness"
            initialDelaySeconds: 60
            periodSeconds: 30
            failureThreshold: 6
@@ -193,8 +214,7 @@ spec:
                #!/bin/bash
                # A Sonarqube container is considered ready if the status is UP, DB_MIGRATION_NEEDED or DB_MIGRATION_RUNNING
                # status about migration are added to prevent the node to be kill while sonarqube is upgrading the database.
-                host="$(hostname -i || echo '127.0.0.1')"
-                if wget --no-proxy -qO- http://${host}:9000/api/system/status | grep -q -e '"status":"UP"' -e '"status":"DB_MIGRATION_NEEDED"' -e '"status":"DB_MIGRATION_RUNNING"'; then
+                if wget --no-proxy -qO- http://localhost:9000/api/system/status | grep -q -e '"status":"UP"' -e '"status":"DB_MIGRATION_NEEDED"' -e '"status":"DB_MIGRATION_RUNNING"'; then
                	exit 0
                fi
                exit 1
--- a/apps/sonar/index.yaml
+++ b/apps/sonar/index.yaml
@@ -6,33 +6,15 @@ metadata:
  name: sonar
  description: The code quality tool for better code
 options:
-  issuer:
-    default: letsencrypt-prod
+  domain:
+    default: your-company
    examples:
-    - letsencrypt-prod
+    - your-company
    type: string
-  plugins:
-    default:
-    - https://github.com/vaulttec/sonar-auth-oidc/releases/download/v2.1.1/sonar-auth-oidc-plugin-2.1.1.jar
-    - https://github.com/jycr/sonar-l10n-fr/releases/download/9.9.0/sonar-l10n-fr-plugin-9.9.0.jar
-    - https://github.com/sbaudoin/sonar-yaml/releases/download/v1.7.0/sonar-yaml-plugin-1.7.0.jar
-    - https://github.com/sbaudoin/sonar-shellcheck/releases/download/v2.5.0/sonar-shellcheck-plugin-2.5.0.jar
-    - https://github.com/cnescatlab/sonar-hadolint-plugin/releases/download/1.1.0/sonar-hadolint-plugin-1.1.0.jar
-    - https://github.com/sbaudoin/sonar-ansible/releases/download/v2.5.1/sonar-ansible-extras-plugin-2.5.1.jar
+  domain_name:
+    default: your_company.com
    examples:
-    - - https://github.com/vaulttec/sonar-auth-oidc/releases/download/v2.1.1/sonar-auth-oidc-plugin-2.1.1.jar
-      - https://github.com/jycr/sonar-l10n-fr/releases/download/9.9.0/sonar-l10n-fr-plugin-9.9.0.jar
-      - https://github.com/sbaudoin/sonar-yaml/releases/download/v1.7.0/sonar-yaml-plugin-1.7.0.jar
-      - https://github.com/sbaudoin/sonar-shellcheck/releases/download/v2.5.0/sonar-shellcheck-plugin-2.5.0.jar
-      - https://github.com/cnescatlab/sonar-hadolint-plugin/releases/download/1.1.0/sonar-hadolint-plugin-1.1.0.jar
-      - https://github.com/sbaudoin/sonar-ansible/releases/download/v2.5.1/sonar-ansible-extras-plugin-2.5.1.jar
-    items:
-      type: string
-    type: array
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
+    - your_company.com
    type: string
  images:
    default:
@@ -73,21 +55,39 @@ options:
            type: string
        type: object
    type: object
-  domain_name:
-    default: your_company.com
+  ingress_class:
+    default: traefik
    examples:
-    - your_company.com
+    - traefik
    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  plugins:
+    default:
+    - https://github.com/vaulttec/sonar-auth-oidc/releases/download/v2.1.1/sonar-auth-oidc-plugin-2.1.1.jar
+    - https://github.com/jycr/sonar-l10n-fr/releases/download/9.9.0/sonar-l10n-fr-plugin-9.9.0.jar
+    - https://github.com/sbaudoin/sonar-yaml/releases/download/v1.7.0/sonar-yaml-plugin-1.7.0.jar
+    - https://github.com/sbaudoin/sonar-shellcheck/releases/download/v2.5.0/sonar-shellcheck-plugin-2.5.0.jar
+    - https://github.com/cnescatlab/sonar-hadolint-plugin/releases/download/1.1.0/sonar-hadolint-plugin-1.1.0.jar
+    - https://github.com/sbaudoin/sonar-ansible/releases/download/v2.5.1/sonar-ansible-extras-plugin-2.5.1.jar
+    examples:
+    - - https://github.com/vaulttec/sonar-auth-oidc/releases/download/v2.1.1/sonar-auth-oidc-plugin-2.1.1.jar
+      - https://github.com/jycr/sonar-l10n-fr/releases/download/9.9.0/sonar-l10n-fr-plugin-9.9.0.jar
+      - https://github.com/sbaudoin/sonar-yaml/releases/download/v1.7.0/sonar-yaml-plugin-1.7.0.jar
+      - https://github.com/sbaudoin/sonar-shellcheck/releases/download/v2.5.0/sonar-shellcheck-plugin-2.5.0.jar
+      - https://github.com/cnescatlab/sonar-hadolint-plugin/releases/download/1.1.0/sonar-hadolint-plugin-1.1.0.jar
+      - https://github.com/sbaudoin/sonar-ansible/releases/download/v2.5.1/sonar-ansible-extras-plugin-2.5.1.jar
+    items:
+      type: string
+    type: array
  sub_domain:
    default: sonar
    examples:
    - sonar
    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
 dependencies: []
 providers:
  kubernetes: true
--- a/apps/sonar/v1_ConfigMap_sonar-sonarqube-config.yaml
+++ b/apps/sonar/v1_ConfigMap_sonar-sonarqube-config.yaml
@@ -5,7 +5,7 @@ metadata:
  name: sonar-sonarqube-config
  labels:
    app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
    release: sonar
    heritage: Helm
 data:
--- a/apps/sonar/v1_ConfigMap_sonar-sonarqube-init-fs.yaml
+++ b/apps/sonar/v1_ConfigMap_sonar-sonarqube-init-fs.yaml
@@ -5,7 +5,7 @@ metadata:
  name: sonar-sonarqube-init-fs
  labels:
    app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
    release: sonar
    heritage: Helm
 data:
--- a/apps/sonar/v1_ConfigMap_sonar-sonarqube-init-sysctl.yaml
+++ b/apps/sonar/v1_ConfigMap_sonar-sonarqube-init-sysctl.yaml
@@ -5,7 +5,7 @@ metadata:
  name: sonar-sonarqube-init-sysctl
  labels:
    app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
    release: sonar
    heritage: Helm
 data:
--- a/apps/sonar/v1_ConfigMap_sonar-sonarqube-install-plugins.yaml
+++ b/apps/sonar/v1_ConfigMap_sonar-sonarqube-install-plugins.yaml
@@ -5,7 +5,7 @@ metadata:
  name: sonar-sonarqube-install-plugins
  labels:
    app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
    release: sonar
    heritage: Helm
 data:
--- a/apps/sonar/v1_ConfigMap_sonar-sonarqube-jdbc-config.yaml
+++ b/apps/sonar/v1_ConfigMap_sonar-sonarqube-jdbc-config.yaml
@@ -5,7 +5,7 @@ metadata:
  name: sonar-sonarqube-jdbc-config
  labels:
    app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
    release: sonar
    heritage: Helm
 data:
--- a/apps/sonar/v1_ConfigMap_sonar-sonarqube-prometheus-ce-config.yaml
+++ b/apps/sonar/v1_ConfigMap_sonar-sonarqube-prometheus-ce-config.yaml
@@ -5,7 +5,7 @@ metadata:
  name: sonar-sonarqube-prometheus-ce-config
  labels:
    app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
    release: sonar
    heritage: Helm
 data:
--- a/apps/sonar/v1_ConfigMap_sonar-sonarqube-prometheus-config.yaml
+++ b/apps/sonar/v1_ConfigMap_sonar-sonarqube-prometheus-config.yaml
@@ -5,7 +5,7 @@ metadata:
  name: sonar-sonarqube-prometheus-config
  labels:
    app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
    release: sonar
    heritage: Helm
 data:
--- a/apps/sonar/v1_Secret_sonar-sonarqube-monitoring-passcode.yaml
+++ b/apps/sonar/v1_Secret_sonar-sonarqube-monitoring-passcode.yaml
@@ -4,7 +4,7 @@ metadata:
  name: sonar-sonarqube-monitoring-passcode
  labels:
    app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
    release: sonar
    heritage: Helm
 type: Opaque
--- a/apps/sonar/v1_Service_sonar-sonarqube.yaml
+++ b/apps/sonar/v1_Service_sonar-sonarqube.yaml
@@ -5,7 +5,7 @@ metadata:
  name: sonar-sonarqube
  labels:
    app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
    release: sonar
    heritage: Helm