update zammad, subcharts & ci (#128)

* update zammad, subcharts & ci Signed-off-by: André Bauer <[email protected]> * fix linitng errors Signed-off-by: André Bauer <[email protected]> * fix textlint Signed-off-by: André Bauer <[email protected]> * disable VALIDATE_ALL_CODEBASE Signed-off-by: André Bauer <[email protected]>
zammad · Apr 27, 2022 · 98ce733 · 98ce733
1 parent 72ca961
commit 98ce733
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 138 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -29,6 +29,7 @@ even continue reviewing your changes.
 
 
 #### Which issue this PR fixes
+
 *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*
   - fixes #
 
@@ -37,6 +38,7 @@ even continue reviewing your changes.
 
 
 #### Checklist
+
 [Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]
 - [ ] Chart Version bumped
 - [ ] Variables are documented in the README.md
diff --git a/.github/ct.yaml b/.github/ct.yaml
@@ -1,3 +1,4 @@
+---
 chart-dirs: .
 chart-repos:
   - bitnami=https://charts.bitnami.com/bitnami

diff --git a/.github/kind-config.yaml b/.github/kind-config.yaml
@@ -1,6 +1,6 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
-- role: control-plane
-- role: worker
-- role: worker
+  - role: control-plane
+  - role: worker
+  - role: worker
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,37 +8,24 @@ on:
       - 'zammad/**'
 
 env:
-  helm-version: "v3.7.1"
-  kubeconform-version: "v0.4.12"
+  helm-version: "v3.8.2"
+  kubeconform-version: "v0.4.13"
 
 jobs:
-  codespell:
-    name: codespell
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v2
-      - name: Codespell
-        uses: codespell-project/actions-codespell@master
-        with:
-          skip: .git
-          exclude_file: .github/kubeconform.sh
-          ignore_words_list: iam,aks
-          check_filenames: true
-          check_hidden: true
-
   super-linter:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
+
       - name: Lint Code Base
-        uses: github/super-linter@v4.8.1
+        uses: github/super-linter/slim@v4
         env:
           DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          LINTER_RULES_PATH: .github/linters
           VALIDATE_ALL_CODEBASE: false
           VALIDATE_JSCPD: false
           VALIDATE_KUBERNETES_KUBEVAL: false
@@ -48,7 +35,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up Helm
@@ -70,17 +57,16 @@ jobs:
     strategy:
       matrix:
         k8s:
-          - v1.19.11
-          - v1.20.7
-          - v1.21.2
-          - v1.22.2
+          - v1.21.10
+          - v1.22.7
+          - v1.23.5
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up Helm
-        uses: azure/setup-helm@v1.1
+        uses: azure/setup-helm@v2.0
         with:
           version: "${{ env.helm-version }}"
       - name: Run kubeconform
@@ -97,24 +83,23 @@ jobs:
     strategy:
       matrix:
         k8s:
-          - v1.19.11
-          - v1.20.7
-          - v1.21.2
-         # - v1.22.2
+          - v1.21.10
+          - v1.22.7
+          - v1.23.5
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up Helm
-        uses: azure/setup-helm@v1.1
+        uses: azure/setup-helm@v2.0
         with:
           version: "${{ env.helm-version }}"
       - uses: actions/setup-python@v2
         with:
           python-version: 3.7
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.1.0
+        uses: helm/chart-testing-action@v2.2.1
       - name: Run chart-testing (list-changed)
         id: list-changed
         run: |

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -23,7 +23,7 @@ jobs:
           git config user.email "[email protected]"
 
       - name: Install Helm
-        uses: azure/setup-helm@v1.1
+        uses: azure/setup-helm@v2.0
         with:
           version: "${{ env.helm-version }}"
 

diff --git a/.github/workflows/sync-readme.yaml b/.github/workflows/sync-readme.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: copy README.md
         run: |

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -38,7 +38,7 @@ See `git help commit`:
 * Must pass [DCO check](#sign-off-your-work)
 * Must follow [Charts best practices](https://helm.sh/docs/topics/chart_best_practices/)
 * Must pass CI jobs for linting and installing changed charts with the [chart-testing](https://github.com/helm/chart-testing) tool
-* Any change to a chart requires a version bump following [semver](https://semver.org/) principles. See [Immutability](#immutability) and [Versioning](#versioning) below
+* Any change to a chart requires a version bump following [SemVer](https://semver.org/) principles. See [Immutability](#immutability) and [Versioning](#versioning) below
 
 Once changes have been merged, the release job will automatically run to package and release changed charts.
 
@@ -48,7 +48,7 @@ Chart releases must be immutable. Any change to a chart warrants a chart version
 
 ### Versioning
 
-The chart `version` should follow [semver](https://semver.org/).
+The chart `version` should follow [SemVer](https://semver.org/).
 
 Charts should start at `1.0.0`. Any breaking (backwards incompatible) changes to a chart should:
 

diff --git a/README.md b/README.md
@@ -2,12 +2,12 @@
 
 A [Helm](https://helm.sh) chart to install [Zammad](https://zammad.org) on [Kubernetes](https://kubernetes.io)
 
-## Repo Info
+## Repository Info
 
 [![Releases downloads](https://img.shields.io/github/downloads/zammad/zammad-helm/total.svg)](https://github.com/zammad/zammad-helm/releases)
 [![Release Charts](https://github.com/zammad/zammad-helm/workflows/Release%20Charts/badge.svg)](https://github.com/zammad/zammad-helm/commits/master)
 
-## Add the Helm repo via
+## Add the Helm repository via
 
 ```console
 helm repo add zammad https://zammad.github.io/zammad-helm
@@ -22,18 +22,18 @@ Due to this charts dependencies the following minimum version requirements apply
 
 ## Sources
 
-The charts sources can be found here:
+The Helm charts sources can be found here:
 
 * [https://github.com/zammad/zammad-helm](https://github.com/zammad/zammad-helm)
 
-The repo source can be found here:
+The repository source can be found here:
 
 * [https://github.com/zammad/zammad-helm/tree/gh-pages](https://github.com/zammad/zammad-helm/tree/gh-pages)
 
 Helm releases can be found here:
 
 * [https://github.com/zammad/zammad-helm/releases](https://github.com/zammad/zammad-helm/releases)
 
-## Adding changes to this repo
+## Adding changes to this repository
 
 See our [contributing guidelines](https://github.com/zammad/zammad-helm/blob/master/CONTRIBUTING.md).
diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: zammad
-version: 6.3.1
+version: 6.4.0
 appVersion: 5.1.0
 description: Zammad is a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails.
 home: https://zammad.org
@@ -17,17 +17,17 @@ maintainers:
 dependencies:
   - name: elasticsearch
     repository: https://helm.elastic.co
-    version: 7.16.3
+    version: 7.17.3
     condition: zammadConfig.elasticsearch.enabled
   - name: memcached
-    version: 6.0.2
+    version: 6.0.16
     repository: https://charts.bitnami.com/bitnami
     condition: zammadConfig.memcached.enabled
   - name: postgresql
-    version: 10.12.8
+    version: 10.16.2
     repository: https://charts.bitnami.com/bitnami
     condition: zammadConfig.postgresql.enabled
   - name: redis
-    version: 15.7.6
+    version: 16.8.7
     repository: https://charts.bitnami.com/bitnami
     condition: zammadConfig.redis.enabled