Merge branch 'main' into marshall_plugins

defenseunicorns · Jun 28, 2024 · 1eb861c · 1eb861c
2 parents 697f195 + 9e5840f
commit 1eb861c
Show file tree

Hide file tree

Showing 18 changed files with 69 additions and 41 deletions.
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
@@ -29,17 +29,17 @@ jobs:
     steps:
 
       - name: Checkout repository
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+        uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
         with:
           languages: ${{ matrix.language }}
       - name: Autobuild
-        uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+        uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+        uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
         with:
           category: "/language:${{matrix.language}}"
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/dependencyreview.yaml b/.github/workflows/dependencyreview.yaml
@@ -22,6 +22,6 @@ jobs:
           egress-policy: audit
 
       - name: 'Checkout Repository'
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # v4.3.3
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@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+        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
@@ -30,17 +30,20 @@ jobs:
       matrix:
         flavor: [upstream, registry1]
         architecture: [amd64, arm64]
+        exclude:
+          - flavor: registry1
+            architecture: arm64
     name: Publish ${{ matrix.flavor }} ${{ matrix.architecture }}
 
     permissions:
       contents: read
       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 }}
@@ -58,10 +61,10 @@ jobs:
 
       - name: Debug Output
         if: ${{ always() }}
-        uses: defenseunicorns/uds-common/.github/actions/debug-output@4cea6c8858b9f4db3a3624a6fc046db77e1f4eaa # v0.5.0
+        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 }}-${{ matrix.architecture }}-${{ github.run_id }}-${{ github.run_attempt }}
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -43,28 +43,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@4cea6c8858b9f4db3a3624a6fc046db77e1f4eaa # v0.5.0
+        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
@@ -41,14 +41,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.1
     hooks:
       - id: golangci-lint
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 37.399.9
+    rev: 37.413.3
     hooks:
       - id: renovate-config-validator
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "9.8.1-uds.0"
+    ".": "9.9.0-uds.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file.
 
+## [9.9.0-uds.0](https://github.com/defenseunicorns/uds-package-mattermost/compare/v9.8.1-uds.1...v9.9.0-uds.0) (2024-06-26)
+
+
+### Miscellaneous
+
+* **deps:** update mattermost package dependencies to v9.9.0 ([33fc29f](https://github.com/defenseunicorns/uds-package-mattermost/commit/33fc29fbf560ad93f606c9276924527b602c96f2))
+
+## [9.8.1-uds.1](https://github.com/defenseunicorns/uds-package-mattermost/compare/v9.8.1-uds.0...v9.8.1-uds.1) (2024-06-20)
+
+
+### Features
+
+* add wait for MM package CR readiness ([#88](https://github.com/defenseunicorns/uds-package-mattermost/issues/88)) ([8c18d54](https://github.com/defenseunicorns/uds-package-mattermost/commit/8c18d54c082ad8209cff5d652b70f80d145bc2c3))
+
+
+### Miscellaneous
+
+* add `Made for UDS` badge to Mattermost ([#90](https://github.com/defenseunicorns/uds-package-mattermost/issues/90)) ([fce7636](https://github.com/defenseunicorns/uds-package-mattermost/commit/fce7636395d1e3afab5fcf8a502c084bd21a8a83))
+* add testing on arm64 architecture using qemu ([#95](https://github.com/defenseunicorns/uds-package-mattermost/issues/95)) ([ba4e8cc](https://github.com/defenseunicorns/uds-package-mattermost/commit/ba4e8cc9f9ff57e5a0bd4bf93ab44ec9c7ece47d))
+* add tests before publishing a release and remove arm64 architecture ([#91](https://github.com/defenseunicorns/uds-package-mattermost/issues/91)) ([c136830](https://github.com/defenseunicorns/uds-package-mattermost/commit/c136830e532892b57dd2b5337ac366eaf59dab06))
+* **deps:** update mattermost support dependencies ([#87](https://github.com/defenseunicorns/uds-package-mattermost/issues/87)) ([c0e0ca9](https://github.com/defenseunicorns/uds-package-mattermost/commit/c0e0ca9be701be569aaa4c9bc18037858fce569c))
+* **deps:** update mattermost support dependencies ([#94](https://github.com/defenseunicorns/uds-package-mattermost/issues/94)) ([c4fecda](https://github.com/defenseunicorns/uds-package-mattermost/commit/c4fecda6486053afee9447be8392e18190e590e1))
+* exclude registry1 arm64 architecture from matrix ([#97](https://github.com/defenseunicorns/uds-package-mattermost/issues/97)) ([7c6199d](https://github.com/defenseunicorns/uds-package-mattermost/commit/7c6199d4f16769f02fd628c516ba2a7103c09521))
+* refactor to skip tests on arm64 ([#96](https://github.com/defenseunicorns/uds-package-mattermost/issues/96)) ([b337bdb](https://github.com/defenseunicorns/uds-package-mattermost/commit/b337bdbd42970cc8ef17daa5acf9483ec50d25cd))
+
 ## [9.8.1-uds.0](https://github.com/defenseunicorns/uds-package-mattermost/compare/v9.8.0-uds.0...v9.8.1-uds.0) (2024-06-05)
 
 

diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml
@@ -3,7 +3,7 @@ metadata:
   name: mattermost-test
   description: A UDS bundle for deploying Mattermost and it's dependencies on a development cluster
   # x-release-please-start-version
-  version: 9.8.1-uds.0
+  version: 9.9.0-uds.0
   # x-release-please-end
 
 packages:
@@ -36,7 +36,7 @@ packages:
   - name: mattermost
     path: ../
     # x-release-please-start-version
-    ref: 9.8.1-uds.0
+    ref: 9.9.0-uds.0
     # x-release-please-end
     imports:
       - name: ACCESS_KEY

diff --git a/common/zarf.yaml b/common/zarf.yaml
@@ -18,7 +18,7 @@ components:
         namespace: mattermost
         url: https://helm.mattermost.com
         gitPath: chart
-        version: 2.6.54
+        version: 2.6.55
         valuesFiles:
           - ../values/common-values.yaml
     actions:

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,10 +1,10 @@
 includes:
   - dependencies: ./dependencies.yaml
   - test: ./test.yaml
-  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/create.yaml
-  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/deploy.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
+  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.6.0/tasks/create.yaml
+  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.6.0/tasks/deploy.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
 
 tasks:
   - name: build-package
@@ -29,5 +29,5 @@ tasks:
         task: publish:package
         with:
           # x-release-please-start-version
-          version: "9.8.1-uds.0"
+          version: "9.9.0-uds.0"
           # x-release-please-end
diff --git a/values/registry1-values.yaml b/values/registry1-values.yaml
@@ -1,7 +1,7 @@
 mattermostApp:
   image:
     repository: registry1.dso.mil/ironbank/opensource/mattermost/mattermost
-    tag: 9.8.1
+    tag: 9.9.0
 initContainerImage:
   repository: registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal
   tag: 9.4
diff --git a/values/upstream-values.yaml b/values/upstream-values.yaml
@@ -1,4 +1,4 @@
 mattermostApp:
   image:
     repository: mattermost/mattermost-enterprise-edition
-    tag: 9.8.1
+    tag: 9.9.0
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-9.8.1-uds.0
+9.9.0-uds.0
diff --git a/zarf.yaml b/zarf.yaml
@@ -4,7 +4,7 @@ metadata:
   name: mattermost
   description: "UDS Mattermost Package"
   # x-release-please-start-version
-  version: "9.8.1-uds.0"
+  version: "9.9.0-uds.0"
   # x-release-please-end
 
 variables:
@@ -45,7 +45,7 @@ components:
           - values/upstream-values.yaml
     images:
       - appropriate/curl:latest
-      - mattermost/mattermost-enterprise-edition:9.8.1
+      - mattermost/mattermost-enterprise-edition:9.9.0
 
   - name: mattermost
     required: true
@@ -62,4 +62,4 @@ components:
           - values/registry1-values.yaml
     images:
       - registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal:9.4
-      - registry1.dso.mil/ironbank/opensource/mattermost/mattermost:9.8.1
+      - registry1.dso.mil/ironbank/opensource/mattermost/mattermost:9.9.0