Merge branch 'main' into update-license

defenseunicorns · Jul 1, 2024 · cf56575 · cf56575
2 parents 15e1800 + 5fbe70c
commit cf56575
Show file tree

Hide file tree

Showing 15 changed files with 69 additions and 33 deletions.
diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml
@@ -8,4 +8,4 @@ on:
 jobs:
   validate:
     name: Validate
-    uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@4cea6c8858b9f4db3a3624a6fc046db77e1f4eaa # v0.5.0
+    uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@61450a210fd16cf14157ee417f9682a4664c05e5 # v0.6.0
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -15,12 +15,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           fetch-depth: 0
 
       - name: Environment setup
-        uses: defenseunicorns/uds-common/.github/actions/setup@4cea6c8858b9f4db3a3624a6fc046db77e1f4eaa # v0.5.0
+        uses: defenseunicorns/uds-common/.github/actions/setup@61450a210fd16cf14157ee417f9682a4664c05e5 # v0.6.0
         with:
           registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
           registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}

diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           persist-credentials: false
 
@@ -45,6 +45,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
+        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/tag-and-release.yaml b/.github/workflows/tag-and-release.yaml
@@ -37,20 +37,24 @@ jobs:
       packages: write
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Environment setup
-        uses: defenseunicorns/uds-common/.github/actions/setup@4cea6c8858b9f4db3a3624a6fc046db77e1f4eaa # v0.5.0
+        uses: defenseunicorns/uds-common/.github/actions/setup@61450a210fd16cf14157ee417f9682a4664c05e5 # v0.6.0
         with:
           registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
           registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
           ghToken: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish Package
-        run: UDS_ARCHITECTURE=${{ matrix.architecture }} uds run -f tasks/publish.yaml package --set FLAVOR=${{ matrix.flavor }}
+        run: uds run -f tasks/publish.yaml package --set FLAVOR=${{ matrix.flavor }}
+
+      - name: Debug Output
+        if: ${{ always() }}
+        uses: defenseunicorns/uds-common/.github/actions/debug-output@61450a210fd16cf14157ee417f9682a4664c05e5 # v0.6.0
 
       - name: Save logs
         if: always()
-        uses: defenseunicorns/uds-common/.github/actions/save-logs@4cea6c8858b9f4db3a3624a6fc046db77e1f4eaa # v0.5.0
+        uses: defenseunicorns/uds-common/.github/actions/save-logs@61450a210fd16cf14157ee417f9682a4664c05e5 # v0.6.0
         with:
-          suffix: ${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}
+          suffix: ${{ matrix.flavor }}-${{ matrix.architecture }}-${{ github.run_id }}-${{ github.run_attempt }}
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -42,24 +42,28 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Environment setup
-        uses: defenseunicorns/uds-common/.github/actions/setup@4cea6c8858b9f4db3a3624a6fc046db77e1f4eaa # v0.5.0
+        uses: defenseunicorns/uds-common/.github/actions/setup@61450a210fd16cf14157ee417f9682a4664c05e5 # v0.6.0
         with:
           registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
           registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
           ghToken: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Test
-        uses: defenseunicorns/uds-common/.github/actions/test@4cea6c8858b9f4db3a3624a6fc046db77e1f4eaa # v0.5.0
+        uses: defenseunicorns/uds-common/.github/actions/test@61450a210fd16cf14157ee417f9682a4664c05e5 # v0.6.0
         with:
           flavor: ${{ matrix.flavor }}
           type: ${{ matrix.type }}
 
+      - name: Debug Output
+        if: ${{ always() }}
+        uses: defenseunicorns/uds-common/.github/actions/debug-output@61450a210fd16cf14157ee417f9682a4664c05e5 # v0.6.0
+
       - name: Save logs
         if: always()
-        uses: defenseunicorns/uds-common/.github/actions/save-logs@4cea6c8858b9f4db3a3624a6fc046db77e1f4eaa # v0.5.0
+        uses: defenseunicorns/uds-common/.github/actions/save-logs@61450a210fd16cf14157ee417f9682a4664c05e5 # v0.6.0
         with:
           suffix: ${{ matrix.type }}-${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -31,7 +31,7 @@ repos:
     hooks:
       - id: fix-smartquotes
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.28.4
+    rev: 0.28.5
     hooks:
       - id: check-jsonschema
         name: "Validate Zarf Configs Against Schema"
@@ -40,14 +40,14 @@ repos:
         args:
           [
             "--schemafile",
-            "https://raw.githubusercontent.com/defenseunicorns/zarf/v0.34.0/zarf.schema.json",
+            "https://raw.githubusercontent.com/defenseunicorns/zarf/v0.35.0/zarf.schema.json",
             "--no-cache"
           ]
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.59.0
+    rev: v1.59.1
     hooks:
       - id: golangci-lint
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 37.382.0
+    rev: 37.413.2
     hooks:
       - id: renovate-config-validator
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "9.9.5-uds.0"
+    ".": "9.9.5-uds.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [9.9.5-uds.1](https://github.com/defenseunicorns/uds-package-sonarqube/compare/v9.9.5-uds.0...v9.9.5-uds.1) (2024-06-20)
+
+
+### Features
+
+* add wait for SQ package CR readiness ([#85](https://github.com/defenseunicorns/uds-package-sonarqube/issues/85)) ([3f1db0e](https://github.com/defenseunicorns/uds-package-sonarqube/commit/3f1db0e054012f98f75328971987b163b0e27fff))
+* allow for Postgres password secret generation ([#88](https://github.com/defenseunicorns/uds-package-sonarqube/issues/88)) ([84503e5](https://github.com/defenseunicorns/uds-package-sonarqube/commit/84503e592fb0726809d8ba6e7c99e9c27507ba76))
+
+
+### Miscellaneous
+
+* add debug output on tag-and-release and test workflows ([#90](https://github.com/defenseunicorns/uds-package-sonarqube/issues/90)) ([ad11fca](https://github.com/defenseunicorns/uds-package-sonarqube/commit/ad11fca8641fcb3a3125dbe022993137df20772c))
+* add pre release testing ([#87](https://github.com/defenseunicorns/uds-package-sonarqube/issues/87)) ([f024ebf](https://github.com/defenseunicorns/uds-package-sonarqube/commit/f024ebfc32829e0f186ab5b49aa67efa5dc8b8da))
+* **deps:** update sonarqube support dependencies ([#80](https://github.com/defenseunicorns/uds-package-sonarqube/issues/80)) ([ab2bd2f](https://github.com/defenseunicorns/uds-package-sonarqube/commit/ab2bd2f055b8617925db2ceed086093375b31126))
+* **deps:** update sonarqube support dependencies ([#83](https://github.com/defenseunicorns/uds-package-sonarqube/issues/83)) ([cc7e869](https://github.com/defenseunicorns/uds-package-sonarqube/commit/cc7e869ee75d41d467ac5e15b386355ad0f17542))
+
 ## [9.9.5-uds.0](https://github.com/defenseunicorns/uds-package-sonarqube/compare/v9.9.2-uds.1...v9.9.5-uds.0) (2024-05-22)
 
 

diff --git a/bundle/uds-bundle.yaml b/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: 9.9.5-uds.0
+  version: 9.9.5-uds.1
   # x-release-please-end
 
 packages:
@@ -25,7 +25,7 @@ packages:
   - name: sonarqube
     path: ../
     # x-release-please-start-version
-    ref: 9.9.5-uds.0
+    ref: 9.9.5-uds.1
     # x-release-please-end
     overrides:
       sonarqube:

diff --git a/chart/templates/postgres-secret.yaml b/chart/templates/postgres-secret.yaml
@@ -0,0 +1,10 @@
+{{- if ne .Values.postgres.password "" }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: sonarqube-postgres
+  namespace: {{ .Release.Namespace }}
+type: kubernetes.io/opaque
+stringData:
+  password: {{ .Values.postgres.password }}
+{{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -5,6 +5,8 @@ sso:
   saml:
     providerName: Keycloak # This is displayed on the SonarQube landing screen ("Log in with <providerName>")
 postgres:
+  password: ""
+
   internal: true
   selector:
     cluster-name: pg-cluster

diff --git a/tasks.yaml b/tasks.yaml
@@ -2,11 +2,11 @@ includes:
   - cleanup: ./tasks/cleanup.yaml
   - dependencies: ./tasks/dependencies.yaml
   - test: ./tasks/test.yaml
-  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/create.yaml
-  - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/lint.yaml
-  - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/pull.yaml
-  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/deploy.yaml
-  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/setup.yaml
+  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.6.0/tasks/create.yaml
+  - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.6.0/tasks/lint.yaml
+  - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.6.0/tasks/pull.yaml
+  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.6.0/tasks/deploy.yaml
+  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.6.0/tasks/setup.yaml
 
 tasks:
   - name: default

diff --git a/tasks/publish.yaml b/tasks/publish.yaml
@@ -1,8 +1,8 @@
 includes:
-  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/create.yaml
-  - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/publish.yaml
-  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/setup.yaml
-  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/deploy.yaml
+  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.6.0/tasks/create.yaml
+  - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.6.0/tasks/publish.yaml
+  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.6.0/tasks/setup.yaml
+  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.6.0/tasks/deploy.yaml
   - dependencies: ./dependencies.yaml
   - test: ./test.yaml
 
@@ -22,5 +22,5 @@ tasks:
         task: publish:package
         with:
           # x-release-please-start-version
-          version: "9.9.5-uds.0"
+          version: "9.9.5-uds.1"
           # x-release-please-end
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-9.9.5-uds.0
+9.9.5-uds.1
diff --git a/zarf.yaml b/zarf.yaml
@@ -4,7 +4,7 @@ metadata:
   name: sonarqube
   description: "UDS Sonarqube package"
   # x-release-please-start-version
-  version: "9.9.5-uds.0"
+  version: "9.9.5-uds.1"
   # x-release-please-end
 
 variables: