Merge pull request #40 from defenseunicorns/update-chart-1.21.1

defenseunicorns · Sep 9, 2024 · 684eb29 · 684eb29
2 parents 98f0081 + 5ef1c9d
commit 684eb29
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 25 deletions.
diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml
@@ -12,4 +12,4 @@ on:
 jobs:
   validate:
     name: Validate
-    uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@afd3aea72462ac21a715cb5dbc2654b42073ac40 # v0.11.0
+    uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -20,7 +20,7 @@ jobs:
           fetch-depth: 0
 
       - name: Environment setup
-        uses: defenseunicorns/uds-common/.github/actions/setup@afd3aea72462ac21a715cb5dbc2654b42073ac40 # v0.11.0
+        uses: defenseunicorns/uds-common/.github/actions/setup@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.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
@@ -37,7 +37,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:
           name: SARIF file
           path: results.sarif

diff --git a/.github/workflows/tag-and-release.yaml b/.github/workflows/tag-and-release.yaml
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Environment setup
-        uses: defenseunicorns/uds-common/.github/actions/setup@afd3aea72462ac21a715cb5dbc2654b42073ac40 # v0.11.0
+        uses: defenseunicorns/uds-common/.github/actions/setup@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0
         with:
           registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
           registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
@@ -47,6 +47,6 @@ jobs:
 
       - name: Save logs
         if: always()
-        uses: defenseunicorns/uds-common/.github/actions/save-logs@afd3aea72462ac21a715cb5dbc2654b42073ac40 # v0.11.0
+        uses: defenseunicorns/uds-common/.github/actions/save-logs@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0
         with:
           suffix: '${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}'
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -30,9 +30,43 @@ concurrency:
 
 permissions:
   contents: read
+  packages: read
 
 jobs:
-  run-test:
+  flavor-test:
+    name: Test-Flavor
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - name: test-flavor
+        uses: defenseunicorns/uds-common/.github/actions/test-flavor@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0
+        id: test-flavor
+    outputs:
+      upgrade-flavors: ${{ steps.test-flavor.outputs.upgrade-flavors }}
+
+  deploy-test:
+    # TODO: need to fix how actions work in uds-common before this can be used
+    # needs: flavor-test
+    # permissions: write-all
+    # uses: defenseunicorns/uds-common/.github/workflows/test-deploy.yaml@callable_workflow_fix  #@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0
+    # with:
+    #   upgrade-flavors: ${{ needs.flavor-test.outputs.upgrade-flavors }}
+    #   flavor: ${{ matrix.flavor }}
+    #   type: ${{ matrix.type }}
+    #   runs-on: ubuntu-latest
+    #   clean-runner: false
+    #   upload-reports: playwright
+    #   timeout: 25
+    # secrets: inherit # Inherits all secrets from the parent workflow.
+    # strategy:
+    #   fail-fast: true
+    #   matrix:
+    #     type: [install, upgrade]
+    #     flavor: [upstream, registry1]
+
+
     name: ${{ matrix.type }} ${{ matrix.flavor }}
     runs-on: uds-marketplace-ubuntu-big-boy-4-core
     timeout-minutes: 25
@@ -46,21 +80,22 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Environment setup
-        uses: defenseunicorns/uds-common/.github/actions/setup@afd3aea72462ac21a715cb5dbc2654b42073ac40 # v0.11.0
+        uses: defenseunicorns/uds-common/.github/actions/setup@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.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@afd3aea72462ac21a715cb5dbc2654b42073ac40 # v0.11.0
+        uses: defenseunicorns/uds-common/.github/actions/test-deploy@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0
         with:
+          upgrade-flavors: ${{ needs.flavor-test.outputs.upgrade-flavors }}
           flavor: ${{ matrix.flavor }}
           type: ${{ matrix.type }}
 
       - name: Save logs
         if: always()
-        uses: defenseunicorns/uds-common/.github/actions/save-logs@afd3aea72462ac21a715cb5dbc2654b42073ac40 # v0.11.0
+        uses: defenseunicorns/uds-common/.github/actions/save-logs@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.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
@@ -41,14 +41,14 @@ repos:
         args:
           [
             "--schemafile",
-            "https://raw.githubusercontent.com/defenseunicorns/zarf/v0.37.0/zarf.schema.json",
+            "https://raw.githubusercontent.com/defenseunicorns/zarf/v0.39.0/zarf.schema.json",
             "--no-cache"
           ]
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.59.1
+    rev: v1.61.0
     hooks:
       - id: golangci-lint
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 38.18.15
+    rev: 38.72.1
     hooks:
       - id: renovate-config-validator
diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml
@@ -13,7 +13,7 @@ packages:
 
   - name: postgres-operator
     repository: ghcr.io/defenseunicorns/packages/uds/postgres-operator
-    ref: 1.10.1-uds.4-upstream
+    ref: 1.13.0-uds.0-upstream
     overrides:
       postgres-operator:
         uds-postgres-config:

diff --git a/common/zarf.yaml b/common/zarf.yaml
@@ -16,7 +16,7 @@ components:
       - name: jira
         namespace: jira
         url: https://atlassian.github.io/data-center-helm-charts
-        version: 1.20.1
+        version: 1.21.1
         repoName: jira
         releaseName: jira
         valuesFiles:

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.11.0/tasks/create.yaml
-  - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.11.0/tasks/lint.yaml
-  - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.11.0/tasks/pull.yaml
-  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.11.0/tasks/deploy.yaml
-  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.11.0/tasks/setup.yaml
+  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/create.yaml
+  - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/lint.yaml
+  - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/pull.yaml
+  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/deploy.yaml
+  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/setup.yaml
 
 tasks:
   - name: default

diff --git a/tasks/publish.yaml b/tasks/publish.yaml
@@ -1,7 +1,7 @@
 includes:
   - dependencies: ./dependencies.yaml
-  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.11.0/tasks/create.yaml
-  - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.11.0/tasks/publish.yaml
+  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/create.yaml
+  - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/publish.yaml
 
 tasks:
   - name: package

diff --git a/values/registry1-values.yaml b/values/registry1-values.yaml
@@ -1,9 +1,13 @@
 image:
   repository: registry1.dso.mil/ironbank/atlassian/jira-data-center/jira-node
-  tag: "9.17.1"
+  tag: "9.17.2"
 
 monitoring:
   # TODO: Pending an upstream pr to fix jar file location to not be hardcoded:
   exposeJmxMetrics: false
+  # jmxExporterInitContainer:
+  #   jmxJarLocation: /var/atlassian/application-data/shared-home/jmx_prometheus_javaagent-0.18.0.jar
+  #   runAsRoot: false
   # jmxExporterImageRepo: registry1.dso.mil/ironbank/opensource/prometheus/jmx-exporter
   # jmxExporterImageTag: 0.18.0
+  # jmxExporterCustomJarLocation: /var/atlassian/application-data/shared-home/jmx_prometheus_javaagent-0.18.0.jar
diff --git a/values/upstream-values.yaml b/values/upstream-values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: atlassian/jira-software
-  tag: "9.17.1"
+  tag: "9.17.2"
 
 monitoring:
   jmxExporterImageRepo: bitnami/jmx-exporter

diff --git a/zarf.yaml b/zarf.yaml
@@ -31,7 +31,7 @@ components:
         valuesFiles:
           - values/upstream-values.yaml
     images:
-      - atlassian/jira-software:9.17.1
+      - atlassian/jira-software:9.17.2
       - bitnami/jmx-exporter:0.18.0
 
   - name: jira
@@ -48,6 +48,6 @@ components:
         valuesFiles:
           - values/registry1-values.yaml
     images:
-      - registry1.dso.mil/ironbank/atlassian/jira-data-center/jira-node:9.17.1
+      - registry1.dso.mil/ironbank/atlassian/jira-data-center/jira-node:9.17.2
       # TODO: Pending an upstream pr to fix jar file location to not be hardcoded:
       # - registry1.dso.mil/ironbank/opensource/prometheus/jmx-exporter:0.18.0