address feedback, migrate db in zarf action

bundle/uds-bundle.yaml

@@ -3,7 +3,7 @@ metadata:
   name: sonarqube-test
   description: A UDS bundle for deploying Sonarqube and it's dependencies on a development cluster
   # x-release-please-start-version
-  version: 10.6.0-uds.0
+  version: 9.9.5-uds.1
   # x-release-please-end
 
 packages:
@@ -36,7 +36,7 @@ packages:
   - name: sonarqube
     path: ../
     # x-release-please-start-version
-    ref: 10.6.0-uds.0
+    ref: 9.9.5-uds.1
     # x-release-please-end
     overrides:
       sonarqube:

common/zarf.yaml

@@ -29,3 +29,7 @@ components:
                 name: sonarqube
                 namespace: sonarqube
                 condition: "'{.status.phase}'=Ready"
+          - description: Perform DB migrations if necessary
+            cmd: |
+              STATUS=$(curl -XPOST -s "https://sonarqube.$ZARF_VAR_DOMAIN/api/system/migrate_db" | ./uds zarf tools yq '.state')
+              echo "SonarQube migration state: ${STATUS}"

tasks.yaml

@@ -65,5 +65,4 @@ tasks:
       - task: setup:create-doug-user
       - task: create-sq-test-bundle
       - task: deploy:test-bundle
-      - task: test:migrate-db
       - task: test:all

tasks/test.yaml

@@ -37,10 +37,3 @@ tasks:
         dir: tests
       - cmd: npx playwright test
         dir: tests
-
-  - name: migrate-db
-    actions:
-      - description: Perform DB migrations if necessary
-        cmd: |
-          STATUS=$(curl -XPOST -s 'https://sonarqube.uds.dev/api/system/migrate_db' | ./uds zarf tools yq '.state')
-          echo "SonarQube migration state: ${STATUS}"

values/common-values.yaml

@@ -1,67 +1,19 @@
-## this is the default value
-# OpenShift:
-#   enabled: false
-
 edition: "community"
 
 # Name of the secret from which to load additional properties: https://community.sonarsource.com/t/additional-sonar-properties-to-load-from-a-secret/73748
 # This secret will be created by the uds operator based on the sso spec defined in chart/templates/uds-package.yaml
 sonarSecretProperties: sonarqube-sso
 
-# monitoring:
-#   enabled: true
-
 prometheusExporter:
   enabled: false
-  # jmx_prometheus_javaagent version to download from Maven Central
-  version: "0.17.2"
-  # Alternative full download URL for the jmx_prometheus_javaagent.jar (overrides prometheusExporter.version)
-  # downloadURL: ""
-  # if you need to ignore TLS certificates for whatever reason enable the following flag
-  # noCheckCertificate: false
-
-  # Ports for the jmx prometheus agent to export metrics at
-  webBeanPort: 8000
-  ceBeanPort: 8001
-
-  config:
-    rules:
-      - pattern: ".*"
-  # Overrides config for the CE process Prometheus exporter (by default, the same rules are used for both the Web and CE processes).
-  # ceConfig:
-  #   rules:
-  #     - pattern: ".*"
-  # image: curlimages/curl:8.2.1
-  # For use behind a corporate proxy when downloading prometheus
-  # httpProxy: ""
-  # httpsProxy: ""
-  # noProxy: ""
-  # Reuse default initcontainers.securityContext that match restricted pod security standard
-  # securityContext: {}
 
 prometheusMonitoring:
-  # Generate a Prometheus Pod Monitor (https://github.com/coreos/prometheus-operator)
-  #
   podMonitor:
-    # Create PodMonitor Resource for Prometheus scraping
     enabled: false
-    # (DEPRECATED) Specify a custom namespace where the PodMonitor will be created.
-    # This value should not be set, as the PodMonitor's namespace has to match the Release Namespace.
-    # namespace: "default"
-    # Specify the interval how often metrics should be scraped
-    interval: 30s
-    # Specify the timeout after a scrape is ended
-    # scrapeTimeout: ""
-    # Name of the label on target services that prometheus uses as job name
-    # jobLabel: ""
 
 initSysctl:
   enabled: false
 
-## DEPRECATED: Use initSysctl.enabled instead
-# elasticsearch:
-#   configureNode: false
-
 jdbcOverwrite:
   enable: true # DEPRECATED: use `jdbcOverwrite.enabled` in v10.7.0
   enabled: true

zarf.yaml

@@ -4,7 +4,7 @@ metadata:
   name: sonarqube
   description: "UDS Sonarqube package"
   # x-release-please-start-version
-  version: "10.6.0-uds.0"
+  version: "9.9.5-uds.1"
   # x-release-please-end
 
 variables: