feat: enable & update sonarqube to 10.6.0 (#194)

* feat: re-enabled & updated sonarqube to version 10.6.0-community
defenseunicorns · Sep 26, 2024 · bc5ec54 · bc5ec54
1 parent 97c9207
commit bc5ec54
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/bundles/uds-core-swf/uds-bundle.yaml b/bundles/uds-core-swf/uds-bundle.yaml
@@ -537,16 +537,19 @@ packages:
             - path: volumeMounts
               value: *extra-volume-mounts
 
-  ### TODO - uncomment to replace functionality post MVP
-
-  # # Sonarqube
-  # - name: sonarqube-database-secret
-  #   path: ../../build
-  #   ref: 0.0.1
-
-  # - name: sonarqube
-  #   repository: ghcr.io/defenseunicorns/packages/uds/sonarqube
-  #   ref: 8.0.3-uds.6-registry1
+  - name: sonarqube
+    repository: ghcr.io/defenseunicorns/packages/uds/sonarqube
+    ref: 10.6.0-uds.1-registry1
+    overrides:
+      sonarqube:
+        uds-sonarqube-config:
+          values:
+            - path: postgres.internal
+              value: false
+            - path: postgres.password
+              value: "###ZARF_VAR_SONARQUBE_DB_PASSWORD###"
+            - path: "jdbcOverwrite.jdbcUsername"
+              value: "###ZARF_VAR_SONARQUBE_DB_USERNAME###"
 
   - name: jira
     repository: ghcr.io/defenseunicorns/packages/uds/jira

diff --git a/config/uds-config.yaml b/config/uds-config.yaml
@@ -141,12 +141,10 @@ variables:
         memory: 15G
     REGISTRY_REPLICAS: 2
     SHELL_REPLICAS: 2
-  sonarqube-database-secret:
-    SONARQUBE_DB_PASSWORD: "replace-me-db-passwords"
   sonarqube:
-    # db config
     SONARQUBE_DB_NAME: "sonarqubedb"
     SONARQUBE_DB_USERNAME: "postgres"
+    SONARQUBE_DB_PASSWORD: "replace-me-db-passwords"
     SONARQUBE_DB_ENDPOINT: "sonarqube-pg.replace.with.db.url"
   jira:
     JIRA_DB_NAME: "jiradb"

diff --git a/docs/packages-and-dependencies.md b/docs/packages-and-dependencies.md
@@ -44,7 +44,7 @@ The UDS Software Factory Bundle (SWF) is a collection of Zarf packages which inc
 | [Valkey](https://github.com/defenseunicorns/uds-package-valkey) | v7.2.5-uds.2-upstream | 7.2.5 | A key-value store used as a data backend for several applications in the stack |
 | [Gitlab](https://github.com/defenseunicorns/uds-package-gitlab) | v17.1.2-uds.0-registry1 | 17.1.2 | A source control management tool used in the software development lifecycle for storing, updating, building and deploying custom software |
 | [Gitlab Runner](https://github.com/defenseunicorns/uds-package-gitlab-runner) | 17.0.0-uds.0-registry1 | v17.0.0 | A counterpart to Gitlab (above) in which automated software builds, tests and deployments are executed |
-| [Sonarqube](https://github.com/defenseunicorns/uds-package-sonarqube) | 8.0.3-uds.6-registry1 | 9.9.3-community | A code inspection tool used during automated pipelines to evaluate security considerations of custom software and packaged images |
+| [Sonarqube](https://github.com/defenseunicorns/uds-package-sonarqube) | 10.6.0-uds.1-registry1 | 10.6.0-community | A code inspection tool used during automated pipelines to evaluate security considerations of custom software and packaged images |
 | [Jira](https://github.com/defenseunicorns/uds-package-jira) | 1.22.0-uds.0-registry1 | 10.0.1 | A collaboration tool used for team management and task organization |s
 | [Confluence](https://github.com/defenseunicorns/uds-package-confluence) | 1.20.0-uds.0-registry1 | 8.9.4 | A knowledge management tool used by teams to organize information |
 | [Mattermost](https://github.com/defenseunicorns/uds-package-mattermost) | 9.7.2-uds.0-registry1 | 9.7.2 | An instance of Mattermost, a self-hosted chat and collaboration platform |