bump everything to common 14.0.1 (will need to fix inherently failing CI)

**Description**
With the removal of manifest manager tc-system is removed for new users.
Traefik should use it's own namespace for middlewares instead and common
is already adapted to allow this.

This change also allows us to throw errors if traefik isn't installed on
a system when ingress is enabled.

Downside is that this currently breaks ingressclass, which is a
non-supported setup currently, untill we do more R&D for cleanly
handling ingressClasses, namespaces and middlewares correctly.

Also adds helm and SCALE support for the modsecurity plugin.

Also fixes CI bug with metallb.

**⚙️ Type of change**

- [x] ⚙️ Feature/App addition
- [x] 🪛 Bugfix
- [x] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [x] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🪞 I have opened a PR on
[truecharts/containers](https://github.com/truecharts/containers) adding
the container to TrueCharts mirror repo.
- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._

.all-contributorsrc

@@ -1873,6 +1873,43 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "dionlarson",
+      "name": "Dion Larson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1843883?v=4",
+      "profile": "http://dionlarson.com",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "Physics-Dude",
+      "name": "Physics-Dude",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22563517?v=4",
+      "profile": "https://github.com/Physics-Dude",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "waflint",
+      "name": "waflint",
+      "avatar_url": "https://avatars.githubusercontent.com/u/94139453?v=4",
+      "profile": "https://github.com/waflint",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Shrinks99",
+      "name": "Henry Wilkinson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5672810?v=4",
+      "profile": "https://github.com/Shrinks99",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/README.md

@@ -124,7 +124,7 @@ A lot of our work is based on the great effort of others. We would love to exten
 ## Contributors ✨
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-200-orange.svg?style=for-the-badge)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-204-orange.svg?style=for-the-badge)](#contributors)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@@ -393,6 +393,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/yelhouti"><img src="https://avatars.githubusercontent.com/u/5471639?v=4?s=100" width="100px;" alt="yelhouti"/><br /><sub><b>yelhouti</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=yelhouti" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/svetlemodry"><img src="https://avatars.githubusercontent.com/u/8712544?v=4?s=100" width="100px;" alt="Jaroslav Lichtblau"/><br /><sub><b>Jaroslav Lichtblau</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=svetlemodry" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Maximilian-Staab"><img src="https://avatars.githubusercontent.com/u/20892091?v=4?s=100" width="100px;" alt="MaximilianS"/><br /><sub><b>MaximilianS</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=Maximilian-Staab" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://dionlarson.com"><img src="https://avatars.githubusercontent.com/u/1843883?v=4?s=100" width="100px;" alt="Dion Larson"/><br /><sub><b>Dion Larson</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=dionlarson" title="Code">💻</a> <a href="https://github.com/truecharts/charts/commits?author=dionlarson" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Physics-Dude"><img src="https://avatars.githubusercontent.com/u/22563517?v=4?s=100" width="100px;" alt="Physics-Dude"/><br /><sub><b>Physics-Dude</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=Physics-Dude" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/waflint"><img src="https://avatars.githubusercontent.com/u/94139453?v=4?s=100" width="100px;" alt="waflint"/><br /><sub><b>waflint</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=waflint" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Shrinks99"><img src="https://avatars.githubusercontent.com/u/5672810?v=4?s=100" width="100px;" alt="Henry Wilkinson"/><br /><sub><b>Henry Wilkinson</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=Shrinks99" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

.github/ct-install.yaml

@@ -12,6 +12,7 @@ chart-dirs:
 excluded-charts:
   - charts/dependency/subchart
   - charts/incubator/twingate-connector
+  - charts/incubator/midarr
   - charts/incubator/orbital-sync
   - charts/incubator/plex-meta-manager
   - charts/incubator/tauticord
@@ -23,7 +24,6 @@ excluded-charts:
   - charts/stable/discordgsm
   - charts/stable/facebox
   - charts/stable/foundryvtt
-  - charts/stable/foundryvtt
   - charts/stable/heimdall
   - charts/stable/mc-router
   - charts/stable/multus
@@ -44,3 +44,4 @@ chart-repos:
   - truecharts=https://charts.truecharts.org
   - truecharts-library=https://library-charts.truecharts.org
   - truecharts-deps=https://deps.truecharts.org
+  - jetstack=https://charts.jetstack.io

.github/ct-lint.yaml

@@ -14,3 +14,4 @@ chart-repos:
   - truecharts=https://charts.truecharts.org
   - truecharts-library=https://library-charts.truecharts.org
   - truecharts-deps=https://deps.truecharts.org
+  - jetstack=https://charts.jetstack.io

.github/renovate.json5

@@ -281,6 +281,11 @@
       "matchPackagePrefixes": ["tccr.io/truecharts/immich"],
       "groupName": "immich",
     },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/portainer"],
+      "groupName": "portainer",
+    },
     {
       "matchDatasources": ["docker"],
       "matchPackagePrefixes": ["tccr.io/truecharts/neko"],

.github/scripts/fetch_helm_deps.sh

@@ -28,6 +28,7 @@ echo "⏬ Downloading and Loading TrueCharts pgp Public Key"
 gpg_dir=.cr-gpg
 mkdir -p "$gpg_dir"
 curl --silent https://keybase.io/truecharts/pgp_keys.asc | gpg --dearmor > $gpg_dir/pubring.gpg || echo "❌ Couldn't load  Public Key."
+curl --silent https://cert-manager.io/public-keys/cert-manager-keyring-2021-09-20-1020CF3C033D4F35BAE1C19E1226061C665DF13E.gpg > $gpg_dir/certman.gpg || echo "❌ Couldn't load certman Public Key."
 echo "✅ Public Key loaded successfully..."
 echo ""
 }
@@ -93,17 +94,25 @@ for idx in $(eval echo "{0..$length}"); do
             # Extract url from repo_url. It's under .entries.DEP_NAME.urls. We filter the specific version first (.version)
             dep_url=$(v="$version" n="$name" go-yq '.entries.[env(n)].[] | select (.version == env(v)) | .urls.[0]' "$index_cache/$repo_dir/index.yaml")
 
+            # tmp hotpatch for cert-manager
+            if [[ !  "$dep_url" == "https"* ]]; then
+              dep_url="https://charts.jetstack.io/${dep_url}"
+            fi
+
             echo ""
             echo "⏬ Downloading dependency $name-$version from $dep_url..."
             mkdir -p "$cache_path/$repo_dir"
             wget --quiet "$dep_url" -P "$cache_path/$repo_dir"
-            wget --quiet "$dep_url.prov" -P "$cache_path/$repo_dir"
+            wget --quiet "$dep_url.prov" -P "$cache_path/$repo_dir" || echo "failed downloading .prov"
 
             if [ ! $? ]; then
                 echo "❌ wget encountered an error..."
               if [[ "$train_chart" =~ incubator\/.* ]]; then
                   helm dependency build "$charts_path/$train_chart/Chart.yaml" || \
                   helm dependency update "$charts_path/$train_chart/Chart.yaml"|| exit 1
+              elif [[ "$name" =~ "cert-manager" ]]; then
+                  helm dependency build "$charts_path/$train_chart/Chart.yaml" --verify --keyring $gpg_dir/certman.gpg || \
+                  helm dependency update "$charts_path/$train_chart/Chart.yaml" --verify --keyring $gpg_dir/certman.gpg || exit 1
               else
                   helm dependency build "$charts_path/$train_chart/Chart.yaml" --verify --keyring $gpg_dir/pubring.gpg || \
                   helm dependency update "$charts_path/$train_chart/Chart.yaml" --verify --keyring $gpg_dir/pubring.gpg || exit 1
@@ -112,7 +121,10 @@ for idx in $(eval echo "{0..$length}"); do
 
             if [ -f "$cache_path/$repo_dir/$name-$version.tgz" ]; then
                 echo "✅ Dependency Downloaded!"
-                if [[ ! "$train_chart" =~ incubator\/.* ]]; then
+                if [[ "$name" =~ "cert-manager" ]]; then
+                  helm verify $cache_path/$repo_dir/$name-$version.tgz --keyring $gpg_dir/certman.gpg || \
+                  helm verify $cache_path/$repo_dir/$name-$version.tgz --keyring $gpg_dir/certman.gpg || exit 1
+                elif [[ ! "$train_chart" =~ incubator\/.* ]]; then
                   echo "Validating dependency signature..."
                   helm verify $cache_path/$repo_dir/$name-$version.tgz --keyring $gpg_dir/pubring.gpg || \
                   helm verify $cache_path/$repo_dir/$name-$version.tgz --keyring $gpg_dir/pubring.gpg || exit 1
@@ -125,6 +137,9 @@ for idx in $(eval echo "{0..$length}"); do
               if [[ "$train_chart" =~ incubator\/.* ]]; then
                   helm dependency build "$charts_path/$train_chart/Chart.yaml" || \
                   helm dependency update "$charts_path/$train_chart/Chart.yaml"|| exit 1
+              elif [[ "$name" =~ "cert-manager" ]]; then
+                  helm dependency build "$charts_path/$train_chart/Chart.yaml" --verify --keyring $gpg_dir/certman.gpg || \
+                  helm dependency update "$charts_path/$train_chart/Chart.yaml" --verify --keyring $gpg_dir/certman.gpg || exit 1
               else
                   helm dependency build "$charts_path/$train_chart/Chart.yaml" --verify --keyring $gpg_dir/pubring.gpg || \
                   helm dependency update "$charts_path/$train_chart/Chart.yaml" --verify --keyring $gpg_dir/pubring.gpg || exit 1

.github/workflows/charts-lint.yaml

@@ -52,7 +52,7 @@ jobs:
           helm repo add truecharts https://charts.truecharts.org
           helm repo add truecharts-deps https://deps.truecharts.org
           helm repo add truecharts-library https://library-charts.truecharts.org
-          helm repo add truecharts-deps https://deps.truecharts.org
+          helm repo add jetstack https://charts.jetstack.io
           helm repo update
 
       - name: Collect changes (branch-based)

.github/workflows/charts-release.yaml

@@ -73,6 +73,7 @@ jobs:
           helm repo add truecharts https://charts.truecharts.org
           helm repo add truecharts-library https://library-charts.truecharts.org
           helm repo add truecharts-deps https://deps.truecharts.org
+          helm repo add jetstack https://charts.jetstack.io
           helm repo update
 
       # Optional step if GPG signing is used

.github/workflows/charts-test.yaml

@@ -127,7 +127,7 @@ jobs:
             helmv3
           helm: "3.9.4"
 
-      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
+      - uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4
         with:
           python-version: "3.11"
 
@@ -150,14 +150,14 @@ jobs:
         run: |
           ## TODO: Move to our Helm Charts
           ## TODO: Only add when required
-          if [[ "${{ matrix.chart }}" != "charts/operators/metallb" ]]; then
+          if [[ "${{ matrix.chart }}" == "charts/operators/metallb-config" ]]; then
             kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.13.10/config/manifests/metallb-native.yaml --server-side --force-conflicts || echo "error fetching metallb manifest"
           fi
           if [[ "${{ matrix.chart }}" != "charts/operators/cloudnative-pg" ]]; then
             kubectl apply -f https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/release-1.20/releases/cnpg-1.20.0.yaml  --server-side --force-conflicts || echo "error fetching cnpg manifest"
           fi
           if [[ "${{ matrix.chart }}" != "charts/operators/prometheus-operator" ]]; then
-            kubectl apply -f  https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.65.2/bundle.yaml --server-side --force-conflicts || echo "error fetching prometheus operator manifest"
+            kubectl apply -f  https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.66.0/bundle.yaml --server-side --force-conflicts || echo "error fetching prometheus operator manifest"
           fi
 
       - name: Run chart-testing (install)
@@ -187,7 +187,7 @@ jobs:
             helmv3
           helm: "3.9.4"
 
-      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
+      - uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4
         with:
           python-version: "3.11"
 
@@ -208,14 +208,14 @@ jobs:
 
       - name: Add Dependencies
         run: |
-          if [[ "${{ matrix.chart }}" != "charts/operators/metallb" ]]; then
+          if [[ "${{ matrix.chart }}" == "charts/operators/metallb-config" ]]; then
             kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.13.10/config/manifests/metallb-native.yaml --server-side --force-conflicts || echo "error fetching metallb manifest"
           fi
           if [[ "${{ matrix.chart }}" != "charts/operators/cloudnative-pg" ]]; then
             kubectl apply -f https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/release-1.17/releases/cnpg-1.17.5.yaml  --server-side --force-conflicts || echo "error fetching cnpg manifest"
           fi
           if [[ "${{ matrix.chart }}" != "charts/operators/prometheus-operator" ]]; then
-            kubectl apply -f  https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.65.2/bundle.yaml --server-side --force-conflicts || echo "error fetching prometheus operator manifest"
+            kubectl apply -f  https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.66.0/bundle.yaml --server-side --force-conflicts || echo "error fetching prometheus operator manifest"
           fi
 
       - name: Run chart-testing (install)
@@ -245,7 +245,7 @@ jobs:
             helmv3
           helm: "3.9.4"
 
-      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
+      - uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4
         with:
           python-version: "3.11"
 
@@ -266,14 +266,14 @@ jobs:
 
       - name: Add Dependencies
         run: |
-          if [[ "${{ matrix.chart }}" != "charts/operators/metallb" ]]; then
+          if [[ "${{ matrix.chart }}" == "charts/operators/metallb-config" ]]; then
             kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.13.10/config/manifests/metallb-native.yaml --server-side --force-conflicts || echo "error fetching metallb manifest"
           fi
           if [[ "${{ matrix.chart }}" != "charts/operators/cloudnative-pg" ]]; then
             kubectl apply -f https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/release-1.17/releases/cnpg-1.17.5.yaml  --server-side --force-conflicts || echo "error fetching cnpg manifest"
           fi
           if [[ "${{ matrix.chart }}" != "charts/operators/prometheus-operator" ]]; then
-            kubectl apply -f  https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.65.2/bundle.yaml --server-side --force-conflicts || echo "error fetching prometheus operator manifest"
+            kubectl apply -f  https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.66.0/bundle.yaml --server-side --force-conflicts || echo "error fetching prometheus operator manifest"
           fi
 
       - name: Run chart-testing (install)
@@ -303,7 +303,7 @@ jobs:
             helmv3
           helm: "3.9.4"
 
-      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
+      - uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4
         with:
           python-version: "3.11"
 
@@ -324,14 +324,14 @@ jobs:
 
       - name: Add Dependencies
         run: |
-          if [[ "${{ matrix.chart }}" != "charts/operators/metallb" ]]; then
+          if [[ "${{ matrix.chart }}" == "charts/operators/metallb-config" ]]; then
             kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.13.10/config/manifests/metallb-native.yaml --server-side --force-conflicts || echo "error fetching metallb manifest"
           fi
           if [[ "${{ matrix.chart }}" != "charts/operators/cloudnative-pg" ]]; then
             kubectl apply -f https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/release-1.17/releases/cnpg-1.17.5.yaml  --server-side --force-conflicts || echo "error fetching cnpg manifest"
           fi
           if [[ "${{ matrix.chart }}" != "charts/operators/prometheus-operator" ]]; then
-            kubectl apply -f  https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.65.2/bundle.yaml --server-side --force-conflicts || echo "error fetching prometheus operator manifest"
+            kubectl apply -f  https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.66.0/bundle.yaml --server-side --force-conflicts || echo "error fetching prometheus operator manifest"
           fi
 
       - name: Run chart-testing (install)
@@ -361,7 +361,7 @@ jobs:
             helmv3
           helm: "3.9.4"
 
-      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
+      - uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4
         with:
           python-version: "3.11"
 
@@ -382,14 +382,14 @@ jobs:
 
       - name: Add Dependencies
         run: |
-          if [[ "${{ matrix.chart }}" != "charts/operators/metallb" ]]; then
+          if [[ "${{ matrix.chart }}" == "charts/operators/metallb-config" ]]; then
             kubectl apply -f --server-side --force-conflicts https://raw.githubusercontent.com/metallb/metallb/v0.13.10/config/manifests/metallb-native.yaml
           fi
           if [[ "${{ matrix.chart }}" != "charts/operators/cloudnative-pg" ]]; then
             kubectl apply -f --server-side --force-conflicts https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/release-1.17/releases/cnpg-1.17.5.yaml
           fi
           if [[ "${{ matrix.chart }}" != "charts/operators/prometheus-operator" ]]; then
-            kubectl apply -f --server-side --force-conflicts --server-side --force-conflicts https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.65.2/bundle.yaml
+            kubectl apply -f --server-side --force-conflicts --server-side --force-conflicts https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.66.0/bundle.yaml
           fi
 
       - name: Run chart-testing (install)
@@ -419,7 +419,7 @@ jobs:
             helmv3
           helm: "3.9.4"
 
-      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
+      - uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4
         with:
           python-version: "3.11"
 
@@ -440,14 +440,14 @@ jobs:
 
       - name: Add Dependencies
         run: |
-          if [[ "${{ matrix.chart }}" != "charts/operators/metallb" ]]; then
+          if [[ "${{ matrix.chart }}" == "charts/operators/metallb-config" ]]; then
             kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.13.10/config/manifests/metallb-native.yaml --server-side --force-conflicts || echo "error fetching metallb manifest"
           fi
           if [[ "${{ matrix.chart }}" != "charts/operators/cloudnative-pg" ]]; then
             kubectl apply -f https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/release-1.17/releases/cnpg-1.17.5.yaml  --server-side --force-conflicts || echo "error fetching cnpg manifest"
           fi
           if [[ "${{ matrix.chart }}" != "charts/operators/prometheus-operator" ]]; then
-            kubectl apply -f  https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.65.2/bundle.yaml --server-side --force-conflicts || echo "error fetching prometheus operator manifest"
+            kubectl apply -f  https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.66.0/bundle.yaml --server-side --force-conflicts || echo "error fetching prometheus operator manifest"
           fi
 
       - name: Run chart-testing (install)

.github/workflows/daily.yaml

@@ -382,7 +382,7 @@ jobs:
           token: ${{ secrets.BOT_TOKEN }}
           fetch-depth: 1
 
-      - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
+      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3
         with:
           node-version: 18
 

.github/workflows/renovate.yml

@@ -12,7 +12,7 @@ jobs:
         with:
           token: ${{ secrets.BOT_TOKEN }}
       - name: Self-hosted Renovate
-        uses: renovatebot/github-action@2a87d1192eaa0cac92b6566233afedf68fd3472a # v38.1.8
+        uses: renovatebot/github-action@23a02fe7be9e93f857a953cc8162e57d2c8401ef # v39.0.1
         with:
           configurationFile: .github/renovate-config.js
           token: ${{ secrets.BOT_TOKEN }}

charts/dependency/clickhouse/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "23.5.3.24"
+appVersion: "23.7.1.247"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
 deprecated: false
 description: ClickHouse is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).
 home: https://truecharts.org/charts/dependency/clickhouse
@@ -22,7 +22,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/dependency/clickhouse
   - https://clickhouse.com/
 type: application
-version: 5.0.48
+version: 7.0.0
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/clickhouse/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/clickhouse
   pullPolicy: IfNotPresent
-  tag: v23.5.3.24@sha256:4b53287ef950c880e59faf83963047e486e19ba1b894e484066e6d00ebd2dd26
+  tag: v23.7.1.2470@sha256:fbec51f0c6b09733fe4601bba2584dc750f0a8a5077702b86163744bd6f4573f
 
 workload:
   main:

charts/dependency/kube-state-metrics/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: "2.9.2"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
 deprecated: false
 description: kube-state-metrics is a simple service that listens to the Kubernetes API server and generates metrics about the state of the objects.
 home: https://truecharts.org/charts/dependency/kube-state-metrics
@@ -21,7 +21,7 @@ name: kube-state-metrics
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/dependency/kube-state-metrics
 type: application
-version: 1.0.31
+version: 3.0.0
 annotations:
   truecharts.org/catagories: |
     - metrics

charts/dependency/kube-state-metrics/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/kube-state-metrics
   pullPolicy: IfNotPresent
-  tag: v2.9.2@sha256:6756dd7716b500cd3a96879cd961a189f14d9de91b4cf4fa3b069d39390e146a
+  tag: v2.9.2@sha256:f97c4f80c68ea1fb7852ac7f0dd5a06e680d61c4c0b43b6f9feca282bd5958f4
 
 service:
   main:
@@ -285,7 +285,7 @@ metrics:
     # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
     # @default -- See values.yaml
     enabled: true
-    type: serviceMonitor
+    type: "servicemonitor"
     endpoints:
       - port: main
       - port: selfmonitor

charts/dependency/mariadb/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "10.11.4"
+appVersion: "11.0.2"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
 deprecated: false
 description: Fast, reliable, scalable, and easy to use open-source relational database system.
 home: https://truecharts.org/charts/dependency/mariadb
@@ -25,7 +25,7 @@ sources:
   - https://github.com/prometheus/mysqld_exporter
   - https://mariadb.org
 type: application
-version: 7.0.62
+version: 9.0.0
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/mariadb/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/mariadb
   pullPolicy: IfNotPresent
-  tag: v10.11.4@sha256:6241a50f28f2401cefb6c44fa6dcf71954c3494ed65e790b7fdc1c7b7980b6f1
+  tag: v11.0.2@sha256:01c12c8ab605cf1a613f87ea781d34a1311cfa18aa61babcc76d0be61c5cb1f1
 
 workload:
   main:

charts/dependency/memcached/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: "1.6.21"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
 deprecated: false
 description: Memcached is a memory-backed database caching solution
 home: https://truecharts.org/charts/dependency/memcached
@@ -23,7 +23,7 @@ sources:
   - https://github.com/bitnami/bitnami-docker-memcached
   - http://memcached.org/
 type: application
-version: 6.0.69
+version: 8.0.0
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/memcached/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/memcached
   pullPolicy: IfNotPresent
-  tag: v1.6.21@sha256:a8eacfc98bb5169f1879c1c21b24a2dc3ca796c6040193063565f43501b6620f
+  tag: v1.6.21@sha256:a4405d38745d617d73119228f0043b72f80007af25735743e1c3ac86da75d4ac
 
 service:
   main:

charts/dependency/mongodb/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "6.0.6"
+appVersion: "6.0.8"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
 deprecated: false
 description: Fast, reliable, scalable, and easy to use open-source no-sql database system.
 home: https://truecharts.org/charts/dependency/mongodb
@@ -23,7 +23,7 @@ sources:
   - https://github.com/bitnami/bitnami-docker-mongodb
   - https://www.mongodb.com
 type: application
-version: 6.0.59
+version: 8.0.0
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/mongodb/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/mongodb
   pullPolicy: IfNotPresent
-  tag: v6.0.6@sha256:0e81f3d05478356b43545dd71bae0f878cef555aa399ff8cc127c47383c23f30
+  tag: v6.0.8@sha256:7435fdeb21aa12486de9efdce9d72e1ed1c4ed1d5f4af9b3e37b3e8eb31576be
 
 workload:
   main:

charts/dependency/node-exporter/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "1.6.0"
+appVersion: "1.6.1"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
 deprecated: false
 description: Prometheus exporter for hardware and OS metrics exposed by UNIX kernels, with pluggable metric collectors.
 home: https://truecharts.org/charts/dependency/node-exporter
@@ -21,7 +21,7 @@ name: node-exporter
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/dependency/node-exporter
 type: application
-version: 1.0.35
+version: 3.0.0
 annotations:
   truecharts.org/catagories: |
     - metrics

charts/dependency/node-exporter/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/node-exporter
   pullPolicy: IfNotPresent
-  tag: v1.6.0@sha256:a8accc7b7c9a55ec4df15e5568627e24ed5c831a09f7d9762efcab7a7869667a
+  tag: v1.6.1@sha256:6c481c3c3ddf83b604f207f7a27b3dbd469035c4e4783fc100e478bf05f9a9c5
 
 service:
   main:
@@ -67,7 +67,7 @@ metrics:
     # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
     # @default -- See values.yaml
     enabled: true
-    type: serviceMonitor
+    type: "servicemonitor"
     endpoints:
       - port: main
         path: /metrics

charts/dependency/redis/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "7.0.11"
+appVersion: "7.0.12"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
 deprecated: false
 description: Open source, advanced key-value store.
 home: https://truecharts.org/charts/dependency/redis
@@ -23,7 +23,7 @@ sources:
   - https://github.com/bitnami/bitnami-docker-redis
   - http://redis.io/
 type: application
-version: 6.0.62
+version: 8.0.0
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/redis/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/redis
   pullPolicy: IfNotPresent
-  tag: 7.0.11@sha256:4653f0bff0f593ae2fd5782fbca41c15e0fbc631ab339ee74fb0e82ef37ed90a
+  tag: v7.0.12@sha256:4a7b38a055a1183d226d8e2eb8bb1a55d2ef4ba217a74fd9c1562513c51e5064
 
 workload:
   main:

charts/dependency/solr/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "9.2.1"
+appVersion: "9.3.0"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
 deprecated: false
 description: Apache Solr
 home: https://truecharts.org/charts/dependency/solr
@@ -22,7 +22,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/dependency/solr
   - https://github.com/apache/solr
 type: application
-version: 4.0.60
+version: 6.0.0
 annotations:
   truecharts.org/catagories: |
     - search

charts/dependency/solr/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/solr
   pullPolicy: IfNotPresent
-  tag: v9.2.1@sha256:1ba6b2e573a30a49337af2682a961a80f7c8b9143112619194cc8f33df9e01e7
+  tag: v9.3.0@sha256:e4780b9d70fe771d1a6aa477fba5b3be92ddd8d858a685f334616f027f58772a
 
 workload:
   main:

charts/enterprise/authelia/Chart.yaml

@@ -3,11 +3,11 @@ appVersion: "4.37.5"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
   - condition: redis.enabled
     name: redis
     repository: https://deps.truecharts.org
-    version: 6.0.62
+    version: 7.0.6
 deprecated: false
 description: Authelia is a Single Sign-On Multi-Factor portal for web apps
 home: https://truecharts.org/charts/enterprise/authelia
@@ -35,7 +35,7 @@ sources:
   - https://github.com/authelia/chartrepo
   - https://github.com/authelia/authelia
 type: application
-version: 15.1.31
+version: 18.0.0
 annotations:
   truecharts.org/catagories: |
     - security

charts/enterprise/blocky/Chart.yaml

@@ -3,11 +3,11 @@ appVersion: "0.21.0"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
   - condition: redis.enabled
     name: redis
     repository: https://deps.truecharts.org
-    version: 6.0.62
+    version: 7.0.6
 description: Blocky is a DNS proxy, DNS enhancer and ad-blocker for the local network written in Go
 home: https://truecharts.org/charts/enterprise/blocky
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/blocky.png
@@ -25,7 +25,7 @@ sources:
   - https://0xerr0r.github.io/blocky/
   - https://github.com/0xERR0R/blocky
   - https://github.com/Mozart409/blocky-frontend
-version: 5.0.44
+version: 8.0.0
 annotations:
   truecharts.org/catagories: |
     - network

charts/enterprise/clusterissuer/Chart.yaml

@@ -10,7 +10,7 @@ keywords:
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
 kubeVersion: ">=1.16.0-0"
 maintainers:
   - email: info@truecharts.org
@@ -21,7 +21,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/enterprise/clusterissuer
   - https://cert-manager.io/
 type: application
-version: 1.0.10
+version: 4.0.0
 annotations:
   truecharts.org/catagories: |
     - core

charts/enterprise/clusterissuer/docs/how-to.md

@@ -4,8 +4,9 @@ This guide will walk you through setting up `clusterissuer`, certificate managem
 
 ## Prerequisites
 
-- Ensure you have the `enterprise` train enabled for `TrueCharts` as discussed [here](https://truecharts.org/manual/SCALE/guides/getting-started/#adding-truecharts).
-- Traefik is installed from enterprise train
+- Ensure you have the `enterprise` and `operators` trains enabled for `TrueCharts` as discussed [here](https://truecharts.org/manual/SCALE/guides/getting-started#adding-truecharts).
+- [Traefik](https://truecharts.org/charts/enterprise/traefik/) is installed from enterprise train
+- [Cert-Mananger](https://truecharts.org/charts/operators/cert-manager/) and [Prometheus-Operator](https://truecharts.org/charts/operators/prometheus-operator/) are installed from the operators train
 
 ## Set Scale Nameservers
 

charts/enterprise/clusterissuer/templates/_metrics.tpl

@@ -1,26 +0,0 @@
-{{- define "certmanager.metrics" -}}
-{{- if .Values.customMetrics.enabled }}
----
-apiVersion: monitoring.coreos.com/v1
-kind: PodMonitor
-metadata:
-  name: cert-manager
-  namespace: cert-manager
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-spec:
-  jobLabel: app.kubernetes.io/name
-  selector:
-    matchLabels:
-      app: cert-manager
-      app.kubernetes.io/name: cert-manager
-      app.kubernetes.io/instance: cert-manager
-      app.kubernetes.io/component: "controller"
-  podMetricsEndpoints:
-    - port: http
-      honorLabels: true
-{{- end }}
-{{- end -}}

charts/enterprise/clusterissuer/templates/clusterissuer/_ACME.tpl

@@ -1,4 +1,6 @@
 {{- define "certmanager.clusterissuer.acme" -}}
+{{- $operator := index $.Values.operator "cert-manager" -}}
+{{- $namespace := $operator.namespace | default "cert-manager" -}}
 {{- range .Values.clusterIssuer.ACME }}
   {{- if not (mustRegexMatch "^[a-z]+(-?[a-z]){0,63}-?[a-z]+$" .name) -}}
     {{- fail "ACME - Expected name to be all lowercase with hyphens, but not start or end with a hyphen" -}}
@@ -80,7 +82,7 @@ spec:
 apiVersion: v1
 kind: Secret
 metadata:
-  namespace: cert-manager
+  namespace: {{ $namespace }}
   name: {{ $issuerSecretName }}
 type: Opaque
 stringData:

charts/enterprise/clusterissuer/templates/clusterissuer/_CA.tpl

@@ -1,4 +1,7 @@
 {{- define "certmanager.clusterissuer.ca" -}}
+{{- $operator := index $.Values.operator "cert-manager" -}}
+{{- $namespace := $operator.namespace | default "cert-manager" -}}
+
 {{- range .Values.clusterIssuer.CA }}
   {{- if not (mustRegexMatch "^[a-z]+(-?[a-z]){0,63}-?[a-z]+$" .name) -}}
     {{- fail "CA - Expected name to be all lowercase with hyphens, but not start or end with a hyphen" -}}
@@ -16,7 +19,7 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: {{ .name }}-selfsigned-ca
-  namespace: cert-manager
+  namespace: {{ $namespace }}
 spec:
   isCA: true
   commonName: {{ .selfSignedCommonName }}
@@ -25,7 +28,7 @@ spec:
     algorithm: ECDSA
     size: 256
   issuerRef:
-    name: selfsigned-ca-issuer
+    name: {{ .name }}-selfsigned-ca-issuer
     kind: ClusterIssuer
     group: cert-manager.io
 {{- else }}
@@ -34,7 +37,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .name }}-ca
-  namespace: cert-manager
+  namespace: {{ $namespace }}
 data:
   tls.crt: {{ .crt | b64enc }}
   tls.key: {{ .key | b64enc }}

charts/enterprise/clusterissuer/templates/common.yaml

@@ -7,4 +7,3 @@
 {{- include "certmanager.clusterissuer.acme" . }}
 {{- include "certmanager.clusterissuer.selfsigned" . }}
 {{- include "certmanager.clusterissuer.ca" . }}
-{{- include "certmanager.metrics" . }}

charts/enterprise/clusterissuer/values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: tccr.io/truecharts/scratch
-  tag: latest@sha256:60efd806894fa4959708abf5ff7386bc67ffc7ca0d2e76a4fc5212591f2b37e3
+  tag: latest@sha256:1a9a10a0a5f5cb5fe4b30ac6d9c56ff87ad47f3f3490bafb6938fc155230131b
   pullPolicy: IfNotPresent
 manifestManager:
   enabled: true
@@ -31,6 +31,13 @@ portal:
   open:
     enabled: false
 
+operator:
+  verify:
+    additionalOperators:
+      - cert-manager
+    enabled: true
+    failOnError: false
+
 clusterIssuer:
   selfSigned:
     enabled: true
@@ -75,6 +82,3 @@ clusterIssuer:
 #     tsigKeyName: ""
 #     tsigAlgorithm: ""
 #     rfctsigSecret: ""
-
-customMetrics:
-  enabled: true

charts/enterprise/grafana/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "9.5.5"
+appVersion: "10.0.3"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
 deprecated: false
 description: Grafana is an open source, feature rich metrics dashboard and graph editor for Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
 home: https://truecharts.org/charts/enterprise/grafana
@@ -24,7 +24,7 @@ sources:
   - https://github.com/bitnami/bitnami-docker-grafana
   - https://grafana.com/
 type: application
-version: 7.0.57
+version: 9.0.0
 annotations:
   truecharts.org/catagories: |
     - metrics

charts/enterprise/grafana/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/grafana
   pullPolicy: IfNotPresent
-  tag: v9.5.5@sha256:ff0ba5eecd7ead218a1c9769d9f318873c92a9daa7edbeead429f9ad581ee6d3
+  tag: v10.0.3@sha256:c39406b61cd96aeb602fe1a2e6995053190fb3f09526cbc25886bcc252a2a016
 manifestManager:
   enabled: true
 securityContext:
@@ -59,7 +59,7 @@ metrics:
     # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
     # @default -- See values.yaml
     enabled: true
-    type: serviceMonitor
+    type: "servicemonitor"
     endpoints:
       - port: main
         path: /metrics

charts/enterprise/metallb-config/Chart.yaml

@@ -10,7 +10,7 @@ keywords:
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
 kubeVersion: ">=1.16.0-0"
 maintainers:
   - email: info@truecharts.org
@@ -22,7 +22,7 @@ sources:
   - https://github.com/metallb/metallb
   - https://metallb.universe.tf
 type: application
-version: 1.1.11
+version: 3.0.0
 annotations:
   truecharts.org/catagories: |
     - core

charts/enterprise/metallb-config/values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: tccr.io/truecharts/scratch
-  tag: latest@sha256:60efd806894fa4959708abf5ff7386bc67ffc7ca0d2e76a4fc5212591f2b37e3
+  tag: latest@sha256:1a9a10a0a5f5cb5fe4b30ac6d9c56ff87ad47f3f3490bafb6938fc155230131b
   pullPolicy: IfNotPresent
 manifestManager:
   enabled: false

charts/enterprise/prometheus/Chart.yaml

@@ -1,17 +1,17 @@
 apiVersion: v2
-appVersion: "2.44.0"
+appVersion: "2.46.0"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
   - condition: exporters.enabled,exporters.node-exporter.enabled
     name: node-exporter
     repository: https://deps.truecharts.org
-    version: 1.0.34
+    version: 2.0.7
   - condition: exporters.enabled,exporters.kube-state-metrics.enabled
     name: kube-state-metrics
     repository: https://deps.truecharts.org
-    version: 1.0.31
+    version: 2.0.6
 deprecated: false
 description: kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/prometheus.png
@@ -29,7 +29,7 @@ sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
 type: application
-version: 9.0.27
+version: 12.0.0
 annotations:
   truecharts.org/catagories: |
     - metrics

charts/enterprise/prometheus/templates/prometheus/_prometheus.tpl

@@ -25,6 +25,11 @@ spec:
   {{- else }}
   probeSelector: {}
   {{- end }}
+  {{- if .Values.prometheus.scrapeConfigSelector }}
+  scrapeConfigSelector: {{- include "tc.v1.common.tplvalues.render" (dict "value" .Values.prometheus.scrapeConfigSelector "context" $) | nindent 4 }}
+  {{- else }}
+  scrapeConfigSelector: {}
+  {{- end }}
   alerting:
     alertmanagers:
     {{- if .Values.prometheus.alertingEndpoints }}
@@ -113,6 +118,11 @@ spec:
   {{- else }}
   probeNamespaceSelector: {}
   {{- end }}
+  {{- if .Values.prometheus.scrapeConfigNamespaceSelector }}
+  scrapeConfigNamespaceSelector: {{- include "tc.v1.common.tplvalues.render" (dict "value" .Values.prometheus.scrapeConfigNamespaceSelector "context" $) | nindent 4 }}
+  {{- else }}
+  scrapeConfigNamespaceSelector: {}
+  {{- end }}
   {{- if .Values.prometheus.remoteRead }}
   remoteRead: {{- include "tc.v1.common.tplvalues.render" (dict "value" .Values.prometheus.remoteRead "context" $) | nindent 4 }}
   {{- end }}

charts/enterprise/prometheus/values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: tccr.io/truecharts/prometheus
-  tag: v2.44.0@sha256:0e799757a47bdc11f8a894e59c96a23c4afefa4db11e005bc37061cf4e3d57a3
+  tag: v2.46.0@sha256:0b0dc821c06967e8562bf32ebd9055eef7f1ddd8851187acbf8871d8bd9c72a3
 
 thanosImage:
   repository: tccr.io/truecharts/thanos
@@ -515,6 +515,14 @@ prometheus:
   ## See https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#namespaceselector for usage
   ##
   probeNamespaceSelector: {}
+  ## @param prometheus.scrapeConfigSelector The scrapeConfigs to be selected for target discovery.
+  ## If {}, select all scrapeConfigs
+  ##
+  scrapeConfigSelector: {}
+  ## @param prometheus.scrapeConfigNamespaceSelector Namespaces to be selected for scrapeConfig discovery.
+  ## If {}, select all namespaces.
+  ## If nil, select own namespace.
+  scrapeConfigNamespaceSelector: {}
   ## @param prometheus.retention Metrics retention days
   ##
   retention: 31d

charts/enterprise/traefik/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "2.10.1"
+appVersion: "2.10.4"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
 deprecated: false
 description: Traefik is a flexible reverse proxy and Ingress Provider.
 home: https://truecharts.org/charts/enterprise/traefik
@@ -23,7 +23,7 @@ sources:
   - https://github.com/traefik/traefik-helm-chart
   - https://traefik.io/
 type: application
-version: 18.0.18
+version: 21.0.0
 annotations:
   truecharts.org/catagories: |
     - network

charts/enterprise/traefik/docs/custom-header-middlewares.md

@@ -0,0 +1,11 @@
+# Adding or removing headers
+
+The `customRequestHeaders` and `customResponseHeaders` middlewares will allow you to add or remove headers from the request or response.
+
+## `customRequestHeaders`
+
+You can specify a list of headers to add to requests. When removing a header, you only need to specify the header name (an empty value removes the header with that name from requests, if it exists).
+
+## `customResponseHeaders`
+
+You can specify a list of headers to add to responses. When removing a header, you only need to specify the header name (an empty value removes the header with that name from responses, if it exists).

charts/enterprise/traefik/questions.yaml

@@ -184,6 +184,10 @@ questions:
       attrs:
 # Include{basicAuthMiddleware}
 # Include{forwardAuthMiddleware}
+# Include{bufferingMiddleware}
+# Include{customRequestHeadersMiddleware}
+# Include{customResponseHeadersMiddleware}
+# Include{customFrameOptionsValueMiddleware}
 # Include{chainMiddleware}
 # Include{redirectSchemeMiddleware}
 # Include{rateLimitMiddleware}
@@ -194,6 +198,7 @@ questions:
 # Include{realIPMiddleware}
 # Include{geoBlockMiddleware}
 # Include{addPrefixMiddleware}
+# Include{modsecurityMiddleware}
   - variable: service
     group: "Networking and Services"
     label: "Configure Service Entrypoint"

charts/enterprise/traefik/templates/_args.tpl

@@ -156,22 +156,24 @@ args:
   {{- end }}
   {{- end }}
   {{- end }}
-  {{/* theme.park */}}
+  {{/*
+    For new plugins, add them on the container also
+    https://github.com/truecharts/containers/blob/master/mirror/traefik/Dockerfile
+    moduleName must match on the container and here
+  */}}
   {{- if .Values.middlewares.themePark }}
-  - "--experimental.plugins.traefik-themepark.modulename=github.com/packruler/traefik-themepark"
-  - "--experimental.plugins.traefik-themepark.version={{ .Values.middlewares.themeParkVersion }}"
+  {{/* theme.park */}}
+  - "--experimental.localPlugins.traefik-themepark.modulename=github.com/packruler/traefik-themepark"
   {{- end }}
   {{/* End of theme.park */}}
   {{/* GeoBlock */}}
   {{- if .Values.middlewares.geoBlock }}
-  - "--experimental.plugins.GeoBlock.modulename=github.com/PascalMinder/geoblock"
-  - "--experimental.plugins.GeoBlock.version={{ .Values.middlewares.geoBlockVersion }}"
+  - "--experimental.localPlugins.GeoBlock.modulename=github.com/PascalMinder/geoblock"
   {{- end }}
   {{/* End of GeoBlock */}}
   {{/* RealIP */}}
   {{- if .Values.middlewares.realIP }}
-  - "--experimental.plugins.traefik-real-ip.modulename=github.com/soulbalz/traefik-real-ip"
-  - "--experimental.plugins.traefik-real-ip.version={{ .Values.middlewares.realIPVersion }}"
+  - "--experimental.localPlugins.traefik-real-ip.modulename=github.com/soulbalz/traefik-real-ip"
   {{- end }}
   {{/* End of RealIP */}}
   {{- with .Values.additionalArguments }}

charts/enterprise/traefik/templates/_portalhook.tpl

@@ -10,7 +10,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ $name }}
-  namespace: tc-system
 data:
   {{- $ports := dict }}
   {{- range $.Values.service }}

charts/enterprise/traefik/templates/middlewares/addPrefix.yaml

@@ -1,5 +1,3 @@
-{{- $values := .Values }}
-
 {{- range $index, $middlewareData := .Values.middlewares.addPrefix }}
 
 ---
@@ -7,7 +5,7 @@ apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   addPrefix:
     prefix: {{ $middlewareData.prefix }}

charts/enterprise/traefik/templates/middlewares/basic-middleware.yaml

@@ -1,10 +1,9 @@
-{{- $values := .Values }}
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-compress" $.Release.Name) "compress" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   compress: {}
 ---
@@ -14,7 +13,7 @@ apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-basic-ratelimit" $.Release.Name) "basic-ratelimit" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   rateLimit:
     average: 600
@@ -24,7 +23,7 @@ apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-basic-secure-headers" $.Release.Name) "basic-secure-headers" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   headers:
     accessControlAllowMethods:
@@ -49,7 +48,7 @@ apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-chain-basic" $.Release.Name) "chain-basic" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   chain:
     middlewares:

charts/enterprise/traefik/templates/middlewares/basicauth.yaml

@@ -1,17 +1,16 @@
-{{- $values := .Values }}
+{{- range $index, $middlewareData := .Values.middlewares.basicAuth -}}
+
+  {{- $users := list -}}
+  {{- range $index, $userdata := $middlewareData.users -}}
+    {{- $users = append $users (htpasswd $userdata.username $userdata.password) -}}
+  {{- end }}
 
-{{ range $index, $middlewareData := .Values.middlewares.basicAuth }}
 ---
-{{- $users := list }}
-{{- range $index, $userdata := $middlewareData.users }}
-  {{- $users = append $users (htpasswd $userdata.username $userdata.password) }}
-{{- end }}
-
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{printf "%v-%v" $middlewareData.name "secret" }}
-  namespace: tc-system
+  name: {{ printf "%v-%v" $middlewareData.name "secret" }}
+  namespace: {{ $.Release.Namespace }}
 type: Opaque
 stringData:
   users: |
@@ -24,8 +23,8 @@ apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   basicAuth:
     secret: {{ printf "%v-%v" $middlewareData.name "secret" }}
-{{ end }}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/buffering.yaml

@@ -0,0 +1,26 @@
+{{- range $index, $middlewareData := .Values.middlewares.buffering }}
+---
+# Declaring the user list
+apiVersion: traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+  buffering: {{/* Only render if its not <nil> and has a value of 0 or greater */}}
+    {{- if not (kindIs "invalid" $middlewareData.maxRequestBodyBytes) (ge ($middlewareData.maxRequestBodyBytes | int) 0) }}
+    maxRequestBodyBytes: {{ $middlewareData.maxRequestBodyBytes }}
+    {{- end -}}
+    {{- if not (kindIs "invalid" $middlewareData.memRequestBodyBytes) (ge ($middlewareData.memRequestBodyBytes | int) 0) }}
+    memRequestBodyBytes: {{ $middlewareData.memRequestBodyBytes }}
+    {{- end -}}
+    {{- if not (kindIs "invalid" $middlewareData.maxResponseBodyBytes) (ge ($middlewareData.maxResponseBodyBytes | int) 0) }}
+    maxResponseBodyBytes: {{ $middlewareData.maxResponseBodyBytes }}
+    {{- end -}}
+    {{- if not (kindIs "invalid" $middlewareData.memResponseBodyBytes) (ge ($middlewareData.memResponseBodyBytes | int) 0) }}
+    memResponseBodyBytes: {{ $middlewareData.memResponseBodyBytes }}
+    {{- end -}}
+    {{- if $middlewareData.retryExpression }}
+    retryExpression: {{ $middlewareData.retryExpression | quote }}
+    {{- end -}}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/chain.yaml

@@ -1,21 +1,21 @@
-{{- $values := .Values }}
-{{- $namespace := "tc-system" }}
-{{- if $.Values.ingressClass.enabled }}
-{{- $namespace := ( printf "tc-system-%s" .Release.Name ) }}
-{{- end }}
-{{ range $index, $middlewareData := .Values.middlewares.chain }}
+{{- $values := .Values -}}
+{{- $namespace := $.Release.Namespace -}}
+{{- if $.Values.ingressClass.enabled -}}
+  {{- $namespace := (printf "%v-%v" $namespace .Release.Name) -}}
+{{- end -}}
 
+{{- range $index, $middlewareData := .Values.middlewares.chain }}
 ---
 # Declaring the user list
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   chain:
     middlewares:
-      {{ range $index, $middleware := .middlewares }}
+      {{- range $index, $middleware := .middlewares }}
       - name: {{ printf "%v-%v@%v" $namespace $middleware "kubernetescrd" }}
-      {{ end }}
-{{ end }}
+      {{- end }}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/customFrameOptionsValue.yaml

@@ -0,0 +1,12 @@
+{{- range $index, $middlewareData := .Values.middlewares.customFrameOptionsValue }}
+---
+# Declaring the user list
+apiVersion: traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+  headers:
+    customFrameOptionsValue: {{ $middlewareData.value }}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/customRequestHeaders.yaml

@@ -0,0 +1,15 @@
+{{- range $index, $middlewareData := .Values.middlewares.customRequestHeaders }}
+---
+# Declaring the user list
+apiVersion: traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+  headers:
+    customRequestHeaders:
+      {{- range $index, $customRequestHeader := $middlewareData.headers }}
+      {{ $customRequestHeader.name }}: {{ $customRequestHeader.value | quote }}
+      {{- end }}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/customResponseHeaders.yaml

@@ -0,0 +1,15 @@
+{{- range $index, $middlewareData := .Values.middlewares.customResponseHeaders }}
+---
+# Declaring the user list
+apiVersion: traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+  headers:
+    customResponseHeaders:
+      {{- range $index, $customResponseHeader := $middlewareData.headers }}
+      {{ $customResponseHeader.name }}: {{ $customResponseHeader.value | quote }}
+      {{- end }}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/forwardauth.yaml

@@ -1,31 +1,29 @@
-{{- $values := .Values }}
-
-{{ range $index, $middlewareData := .Values.middlewares.forwardAuth }}
+{{- range $index, $middlewareData := .Values.middlewares.forwardAuth }}
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   forwardAuth:
     address: {{ $middlewareData.address }}
     {{- with $middlewareData.authResponseHeaders }}
     authResponseHeaders:
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
+      {{- toYaml . | nindent 4 }}
+    {{- end -}}
     {{- with $middlewareData.authRequestHeaders }}
     authRequestHeaders:
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
+      {{- toYaml . | nindent 4 }}
+    {{- end -}}
     {{- if $middlewareData.authResponseHeadersRegex }}
     authResponseHeadersRegex: {{ $middlewareData.authResponseHeadersRegex }}
-    {{- end }}
+    {{- end -}}
     {{- if $middlewareData.trustForwardHeader }}
     trustForwardHeader: true
-    {{- end }}
+    {{- end -}}
     {{- with $middlewareData.tls }}
     tls:
       insecureSkipVerify: {{ .insecureSkipVerify | default false }}
-    {{- end }}
-{{ end }}
+    {{- end -}}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/geoblock.yaml

@@ -1,13 +1,10 @@
-{{- $values := .Values }}
-
 {{- range $index, $middlewareData := .Values.middlewares.geoBlock }}
-
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   plugin:
     GeoBlock:
@@ -22,11 +19,11 @@ spec:
       allowUnknownCountries: {{ $middlewareData.allowUnknownCountries }}
       unknownCountryApiResponse: {{ $middlewareData.unknownCountryApiResponse }}
       blackListMode: {{ $middlewareData.blackListMode }}
-      {{- if not $middlewareData.countries }}
-        {{- fail "You have to define at least one country..." }}
+      {{- if not $middlewareData.countries -}}
+        {{- fail "You have to define at least one country..." -}}
       {{- end }}
       countries:
         {{- range $middlewareData.countries }}
         - {{ . }}
         {{- end }}
-{{- end }}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/ipwhitelist.yaml

@@ -1,14 +1,11 @@
-{{- $values := .Values }}
-
-{{ range $index, $middlewareData := .Values.middlewares.ipWhiteList }}
-
+{{- range $index, $middlewareData := .Values.middlewares.ipWhiteList }}
 ---
 # Declaring the user list
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   ipWhiteList:
     sourceRange:
@@ -19,12 +16,12 @@ spec:
     ipStrategy:
       {{- if $middlewareData.ipStrategy.depth }}
       depth: {{ $middlewareData.ipStrategy.depth }}
-      {{- end }}
+      {{- end -}}
       {{- if $middlewareData.ipStrategy.excludedIPs }}
       excludedIPs:
         {{- range $middlewareData.ipStrategy.excludedIPs }}
         - {{ . }}
         {{- end }}
-      {{- end }}
-    {{- end }}
-{{ end }}
+      {{- end -}}
+    {{- end -}}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/modsecurity.yaml

@@ -0,0 +1,14 @@
+{{- range $index, $middlewareData := .Values.middlewares.modsecurity }}
+---
+apiVersion: traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+  plugin:
+    traefik-modsecurity-plugin:
+      modSecurityUrl: {{ $middlewareData.modSecurityUrl }}
+      timeoutMillis: {{ $middlewareData.timeoutMillis }}
+      maxBodySize: {{ $middlewareData.maxBodySize }}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/ratelimit.yaml

@@ -1,16 +1,13 @@
-{{- $values := .Values }}
-
-{{ range $index, $middlewareData := .Values.middlewares.rateLimit }}
-
+{{- range $index, $middlewareData := .Values.middlewares.rateLimit }}
 ---
 # Declaring the user list
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   rateLimit:
     average: {{ $middlewareData.average }}
     burst: {{ $middlewareData.burst }}
-{{ end }}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/real-ip.yaml

@@ -1,13 +1,10 @@
-{{- $values := .Values }}
-
 {{- range $index, $middlewareData := .Values.middlewares.realIP }}
-
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   plugin:
     traefik-real-ip:
@@ -15,4 +12,4 @@ spec:
         {{- range $middlewareData.excludedNetworks }}
         - {{ . | quote }}
         {{- end }}
-{{- end }}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/redirectScheme.yaml

@@ -1,16 +1,13 @@
-{{- $values := .Values }}
-
-{{ range $index, $middlewareData := .Values.middlewares.redirectScheme }}
-
+{{- range $index, $middlewareData := .Values.middlewares.redirectScheme }}
 ---
 # Declaring the user list
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   redirectScheme:
     scheme: {{ $middlewareData.scheme }}
     permanent: {{ $middlewareData.permanent }}
-{{ end }}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/redirectregex.yaml

@@ -1,17 +1,14 @@
-{{- $values := .Values }}
-
-{{ range $index, $middlewareData := .Values.middlewares.redirectRegex }}
-
+{{- range $index, $middlewareData := .Values.middlewares.redirectRegex }}
 ---
 # Declaring the user list
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   redirectRegex:
     regex: {{ $middlewareData.regex | quote }}
     replacement: {{ $middlewareData.replacement | quote }}
     permanent: {{ $middlewareData.permanent }}
-{{ end }}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/stripPrefixRegex.yaml

@@ -1,17 +1,14 @@
-{{- $values := .Values }}
-
-
-{{ range $index, $middlewareData := .Values.middlewares.stripPrefixRegex }}
+{{- range $index, $middlewareData := .Values.middlewares.stripPrefixRegex }}
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   stripPrefixRegex:
     regex:
      {{- range $middlewareData.regex }}
       - {{ . | quote }}
      {{- end }}
-{{ end }}
+{{- end -}}

charts/enterprise/traefik/templates/middlewares/tc-chains.yaml

@@ -1,11 +1,9 @@
-{{- $values := .Values }}
-
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name "tc-opencors-chain") "tc-opencors-chain" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   chain:
     middlewares:
@@ -17,7 +15,7 @@ apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name "tc-closedcors-chain") "tc-closedcors-chain" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   chain:
     middlewares:

charts/enterprise/traefik/templates/middlewares/tc-headers.yaml

@@ -1,11 +1,9 @@
-{{- $values := .Values }}
-
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name "tc-opencors-headers") "tc-opencors-headers" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   headers:
     accessControlAllowHeaders:
@@ -35,7 +33,7 @@ apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name "tc-closedcors-headers") "tc-closedcors-headers" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   headers:
     accessControlAllowMethods:

charts/enterprise/traefik/templates/middlewares/tc-nextcloud.yaml

@@ -1,11 +1,9 @@
-{{- $values := .Values }}
-
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name "tc-nextcloud-redirectregex-dav") "tc-nextcloud-redirectregex-dav" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   redirectRegex:
     regex: "https://(.*)/.well-known/(card|cal)dav"
@@ -15,7 +13,7 @@ apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name "tc-nextcloud-chain") "tc-nextcloud-chain" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   chain:
     middlewares:

charts/enterprise/traefik/templates/middlewares/theme-park.yaml

@@ -1,13 +1,10 @@
-{{- $values := .Values }}
-
 {{- range $index, $middlewareData := .Values.middlewares.themePark }}
-
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  namespace: {{ $.Release.Namespace }}
 spec:
   plugin:
     traefik-themepark:
@@ -19,5 +16,5 @@ spec:
         {{- range $middlewareData.addons }}
         - {{ . | quote }}
         {{- end }}
-      {{- end }}
-{{- end }}
+      {{- end -}}
+{{- end -}}

charts/enterprise/traefik/values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: tccr.io/truecharts/traefik
-  tag: 2.10.1@sha256:049aece2d3e7eddabed1e2e4c4bd03ceba372d3b9f461386b262b6cb69369fcf
+  tag: 2.10.4@sha256:028687caa7680c6189c52a6dd28ffd17c3d0a747885ad83b3027fa74023a0fec
   pullPolicy: IfNotPresent
 manifestManager:
   enabled: true
@@ -23,7 +23,7 @@ workload:
               # @default -- "/"
               # path: "/ping"
 
-            # -- Redainess probe configuration
+            # -- Readiness probe configuration
             # @default -- See below
             readiness:
               # -- sets the probe type when not using a custom probe
@@ -48,6 +48,9 @@ workload:
 podOptions:
   automountServiceAccountToken: true
 
+operator:
+  register: true
+
 # -- Use ingressClass. Ignored if Traefik version < 2.3 / kubernetes < 1.18.x
 ingressClass:
   # true is not unit-testable yet, pending https://github.com/rancher/helm-unittest/pull/12
@@ -332,6 +335,30 @@ middlewares:
   #     - "X-CustomHeader"
   #   authResponseHeadersRegex: "^X-"
   #   trustForwardHeader: true
+  customRequestHeaders: []
+  # - name: customRequestHeaderExample
+  #   headers:
+  #     - name: X-Custom-Header
+  #       value: "foobar"
+  #     - name: X-Header-To-Remove
+  #       value: ""
+  customResponseHeaders: []
+  # - name: customResponseHeaderExample
+  #   headers:
+  #     - name: X-Custom-Header
+  #       value: "foobar"
+  #     - name: X-Header-To-Remove
+  #       value: ""
+  customFrameOptionsValue: []
+  # - name: customFrameOptionsValueExample
+  #   value: "SAMEORIGIN"
+  buffering: []
+  # - name: bufferingExample
+  #   maxRequestBodyBytes: 1000000
+  #   memRequestBodyBytes: 1000000
+  #   maxResponseBodyBytes: 1000000
+  #   memResponseBodyBytes: 1000000
+  #   retryExpression: "IsNetworkError() && Attempts() < 2"
   chain: []
   # - name: chainname
   #   middlewares:
@@ -358,7 +385,6 @@ middlewares:
   #   ipStrategy:
   #     depth: 2
   #     excludedIPs: []
-  themeParkVersion: v1.3.0
   themePark: []
   # - name: themeParkName
   # -- Supported apps, lower case name
@@ -370,7 +396,6 @@ middlewares:
   #   theme: themenamehere
   # -- https://theme-park.dev or a self hosted url
   #   baseUrl: https://theme-park.dev
-  realIPVersion: v1.0.3
   # Sets X-Real-Ip with an IP from the X-Forwarded-For or
   # Cf-Connecting-Ip (If from Cloudflare)
   # Evaluation of those headers will go from last to first
@@ -383,7 +408,6 @@ middlewares:
   addPrefix: []
   # - name: addPrefixName
   #   prefix: "/foo"
-  geoBlockVersion: v0.2.4
   geoBlock: []
   # -- https://github.com/PascalMinder/geoblock
   # - name: geoBlockName
@@ -400,6 +424,14 @@ middlewares:
   #   blackListMode: false
   #   countries:
   #     - RU
+  modsecurity: []
+  # - name: modsecurityName
+  #   modSecurityUrl: modSecurity container URL
+  #   timeoutMillis: Configurated  timeout
+  #   maxBodySize: maxBodySize
+  ## Note: body of every request will be buffered in memory while the request is in-flight
+  ## (i.e.: during the security check and during the request processing by traefik and the backend),
+  ## so you may want to tune maxBodySize depending on how much RAM you have.
 
 portalhook:
   enabled: true

charts/enterprise/vaultwarden/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "1.28.1"
+appVersion: "1.29.1"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 14.0.1
 deprecated: false
 description: Unofficial Bitwarden compatible server written in Rust
 home: https://truecharts.org/charts/enterprise/vaultwarden
@@ -25,7 +25,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/enterprise/vaultwarden
   - https://github.com/dani-garcia/vaultwarden
 type: application
-version: 20.0.34
+version: 22.0.0
 annotations:
   truecharts.org/catagories: |
     - security

charts/enterprise/vaultwarden/questions.yaml

@@ -53,6 +53,32 @@ questions:
                       schema:
                         type: string
                         default: ""
+        - variable: push
+          label: "Mobile Push Notifications"
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable Mobile Push Notifications"
+                description: "You must obtain and ID and Key here: https://bitwarden.com/host"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: installationId
+                      label: "Installation ID"
+                      schema:
+                        type: string
+                        default: ""
+                        required: true
+                    - variable: installationKey
+                      label: "Installation Key"
+                      schema:
+                        type: string
+                        default: ""
+                        required: true
         - variable: admin
           label: "Admin Portal"
           schema:
@@ -331,28 +357,6 @@ questions:
                               type: int
                               default: 10102
                               required: true
-        - variable: ws
-          label: "WebSocket Service"
-          description: "WebSocket Service"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-# Include{serviceSelectorLoadBalancer}
-# Include{serviceSelectorExtras}
-                    - variable: ws
-                      label: "WebSocket Service Port Configuration"
-                      schema:
-                        additional_attrs: true
-                        type: dict
-                        attrs:
-                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 3012
-                              required: true
 # Include{serviceExpertRoot}
 # Include{serviceExpert}
 # Include{serviceList}

charts/enterprise/vaultwarden/templates/_configmap.tpl

@@ -22,7 +22,6 @@ data:
   INVITATION_ORG_NAME: {{ .Values.vaultwarden.defaultInviteName | quote }}
   {{- end }}
   SHOW_PASSWORD_HINT: {{ .Values.vaultwarden.showPasswordHint | quote }}
-  WEBSOCKET_ENABLED: {{ .Values.vaultwarden.enableWebsockets | quote }}
   WEB_VAULT_ENABLED: {{ .Values.vaultwarden.enableWebVault | quote }}
   ORG_CREATION_USERS: {{ .Values.vaultwarden.orgCreationUsers | quote }}
   {{- if .Values.vaultwarden.attachmentLimitOrg }}

charts/enterprise/vaultwarden/templates/_secrets.tpl

@@ -29,4 +29,9 @@ data:
   YUBICO_CLIENT_ID: {{ $yubicoClientId }}
   YUBICO_SECRET_KEY: {{ required "Yubico Secret Key required" .Values.vaultwarden.yubico.secretKey | quote }}
   {{- end }}
+  {{- if .Values.vaultwarden.push.enabled }}
+  PUSH_ENABLED: {{ .Values.vaultwarden.push.enabled | quote }}
+  PUSH_INSTALLATION_ID: {{ required "Installation ID required" .Values.vaultwarden.push.installationId | quote }}
+  PUSH_INSTALLATION_KEY: {{ required "Installation Key required" .Values.vaultwarden.push.installationKey | quote }}
+  {{- end }}
 {{- end -}}

charts/enterprise/vaultwarden/templates/common.yaml

@@ -1,7 +1,6 @@
 {{/* Make sure all variables are set properly */}}
 {{- include "tc.v1.common.loader.init" . }}
 
-
 {{/* Render configmap for vaultwarden */}}
 {{- $configmapFile := include "vaultwarden.configmap" . | fromYaml -}}
 {{- if $configmapFile -}}
@@ -14,32 +13,5 @@
   {{- $_ := set .Values.secret "vaultwardensecret" $secret -}}
 {{- end -}}
 
-{{/* Define path for websocket */}}
-{{- define "vaultwarden.websocket" -}}
-{{- $fullname := include "tc.v1.common.lib.chart.names.fullname" . -}}
-path: "/notifications/hub"
-# -- Ignored if not kubeVersion >= 1.14-0
-pathType: Prefix
-service:
-  # -- Overrides the service name reference for this path
-  name: {{ printf "%s-ws" $fullname }}
-  port: {{ .Values.service.ws.ports.ws.port }}
-{{- end -}}
-
-{{/* inject websocket path to all main ingress hosts*/}}
-{{- define "vaultwarden.websocketinjector" -}}
-{{- $path := list (include "vaultwarden.websocket" . | fromYaml) -}}
-{{- if .Values.ingress.main.enabled }}
-{{- range .Values.ingress.main.hosts }}
-{{- $newpaths := list }}
-{{- $newpaths := concat .paths $path }}
-{{- $_ := set . "paths" ( deepCopy $newpaths ) -}}
-{{- end }}
-{{- end }}
-{{- end -}}
-
-{{/* inject websocket paths in ingress */}}
-{{- include "vaultwarden.websocketinjector" . }}
-
 {{/* Render the templates */}}
 {{ include "tc.v1.common.loader.apply" . }}

charts/enterprise/vaultwarden/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/vaultwarden
   pullPolicy: IfNotPresent
-  tag: 1.28.1@sha256:b8e2476d869797abb514848b256e9e4a8591bffac44cf6574c061ec56aea6dbd
+  tag: v1.29.1@sha256:5a670aee4b1a57a5a414607f9222f558ab365625f64ff78885f7776971c95b54
 manifestManager:
   enabled: true
 service:
@@ -10,13 +10,6 @@ service:
       main:
         port: 10102
         targetPort: 8080
-  ws:
-    enabled: true
-    ports:
-      ws:
-        enabled: true
-        port: 3012
-        targetPort: 3012
 
 workload:
   main:
@@ -73,9 +66,6 @@ vaultwarden:
   ## Default organization name in invitation e-mails that are not coming from a specific organization.
   # defaultInviteName: ""
   showPasswordHint: true
-  # Enable Websockets for notification. https://github.com/dani-garcia/bitwarden_rs/wiki/Enabling-WebSocket-notifications
-  # Redirect HTTP path "/notifications/hub" to port 3012. Ingress/IngressRoute controllers are automatically configured.
-  enableWebsockets: true
   # Enable Web Vault (static content). https://github.com/dani-garcia/bitwarden_rs/wiki/Disabling-or-overriding-the-Vault-interface-hosting
   enableWebVault: true
   # Restrict creation of orgs. Options are: 'all', 'none' or a comma-separated list of users.
@@ -132,6 +122,12 @@ vaultwarden:
     # clientId:
     # secretKey:
 
+  ## Enable Mobile Push Notifications. You must obtain and ID and Key here: https://bitwarden.com/host
+  push:
+    enabled: false
+    # installationId:
+    # installationKey: 
+
   ## Logging options. https://github.com/dani-garcia/bitwarden_rs/wiki/Logging
   log:
     # Log to file.

charts/incubator/acestream/Chart.yaml

@@ -21,7 +21,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/acestream
   - https://github.com/vstavrinov/acestream-service
 type: application
-version: 3.0.0
+version: 4.0.0
 annotations:
   truecharts.org/catagories: |
     - MediaServer-Video

charts/incubator/adguardhome-sync/Chart.yaml

@@ -21,7 +21,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/adguardhome-sync
   - https://github.com/bakito/adguardhome-sync/
 type: application
-version: 3.0.0
+version: 4.0.0
 annotations:
   truecharts.org/catagories: |
     - Other

charts/incubator/alienswarm-reactivedrop/Chart.yaml

@@ -25,4 +25,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/alienswarm-reactivedrop
   - https://www.steampowered.com/
 type: application
-version: 2.0.9
+version: 3.0.0

charts/incubator/alienswarm/Chart.yaml

@@ -25,4 +25,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/alienswarm
   - https://www.steampowered.com/
 type: application
-version: 2.0.8
+version: 3.0.0

charts/incubator/americasarmy-pg/Chart.yaml

@@ -25,4 +25,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/americasarmy-pg
   - https://www.americasarmy.com/
 type: application
-version: 2.0.9
+version: 3.0.0

charts/incubator/android-8-0/Chart.yaml

@@ -25,4 +25,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/android-8-0
   - https://registry.hub.docker.com/r/ulisses1478/docker-android
 type: application
-version: 2.0.9
+version: 3.0.0

charts/incubator/androiddebugbridge/Chart.yaml

@@ -24,4 +24,4 @@ name: androiddebugbridge
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/androiddebugbridge
 type: application
-version: 2.0.9
+version: 3.0.0

charts/incubator/anki-sync-server/Chart.yaml

@@ -18,7 +18,7 @@ name: anki-sync-server
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/anki-sync-server
   - https://github.com/ankicommunity/anki-devops-services
-version: 2.0.9
+version: 3.0.0
 annotations:
   truecharts.org/catagories: |
     - media

charts/incubator/anope/Chart.yaml

@@ -29,4 +29,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/anope
   - https://thelounge.chat/
 type: application
-version: 2.0.9
+version: 3.0.0

charts/incubator/apache-webdav/Chart.yaml

@@ -26,4 +26,4 @@ sources:
   - https://httpd.apache.org/docs/2.4/mod/mod_dav.html
   - https://github.com/mgutt/docker-apachewebdav
 type: application
-version: 2.0.9
+version: 3.0.0

charts/incubator/apprise-api/Chart.yaml

@@ -22,7 +22,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/apprise-api
   - https://github.com/caronc/apprise-api
 type: application
-version: 3.0.1
+version: 4.0.0
 annotations:
   truecharts.org/catagories: |
     - notifications

charts/incubator/appsmith/Chart.yaml

@@ -26,7 +26,7 @@ name: appsmith
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/appsmith
   - https://github.com/appsmithorg/appsmith
-version: 5.0.34
+version: 6.0.0
 annotations:
   truecharts.org/catagories: |
     - productivity

charts/incubator/archiveteam-warrior/Chart.yaml

@@ -29,4 +29,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/archiveteam-warrior
   - https://wiki.archiveteam.org/index.php/ArchiveTeam_Warrior
 type: application
-version: 2.0.12
+version: 3.0.0

charts/incubator/arksurvivalevolved/Chart.yaml

@@ -25,4 +25,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/arksurvivalevolved
   - https://survivetheark.com/
 type: application
-version: 3.0.9
+version: 4.0.0

charts/incubator/arma3/Chart.yaml

@@ -25,4 +25,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/arma3
   - https://arma3.com/
 type: application
-version: 2.0.8
+version: 3.0.0

charts/incubator/arma3exilemod/Chart.yaml

@@ -25,4 +25,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/arma3exilemod
   - http://www.exilemod.com/
 type: application
-version: 2.0.9
+version: 3.0.0

charts/incubator/artifactory-oss/Chart.yaml

@@ -28,4 +28,4 @@ sources:
   - https://jfrog.com/
   - https://registry.hub.docker.com/r/docker.bintray.io/jfrog/artifactory-oss
 type: application
-version: 2.0.19
+version: 3.0.0

charts/incubator/assettocorsa/Chart.yaml

@@ -25,4 +25,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/assettocorsa
   - https://www.assettocorsa.net/
 type: application
-version: 2.0.9
+version: 3.0.0

charts/incubator/aurora-files/Chart.yaml

@@ -29,4 +29,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/aurora-files
   - https://github.com/afterlogic/docker-aurora-files
 type: application
-version: 2.0.10
+version: 3.0.0

charts/incubator/authentik/Chart.yaml

@@ -1,13 +1,13 @@
 apiVersion: v2
-appVersion: "2023.5.3"
+appVersion: "2023.6.1"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.6
+    version: 13.2.2
   - condition: redis.enabled
     name: redis
     repository: https://deps.truecharts.org
-    version: 6.0.62
+    version: 7.0.6
 description: Authentik is an open-source Identity Provider focused on flexibility and versatility.
 home: https://truecharts.org/charts/incubator/authentik
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/authentik.png
@@ -23,7 +23,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/authentik
   - https://github.com/goauthentik/authentik
   - https://goauthentik.io/docs/
-version: 13.0.5
+version: 14.0.0
 annotations:
   truecharts.org/catagories: |
     - authentication

charts/incubator/authentik/docs/how_to.md

@@ -61,12 +61,12 @@ Default username is `akadmin` and password is whatever you entered in the initia
 ![New-Provider-2](img/New-Provider-2.png)
 
 - If you want to use subdomain-level access control, select `Forward auth (single application)` and enter the URL you have chosen for your apps' ingress.
-- The example uses `https://application.mydomain.com/`, make sure your app is reachable and uses a valid certificate beforehand. 
-- You can set HTTP-Basic Authentication Attributes under `Authentication settings` for your service here. 
-  - Don't use a `basicAuth` middleware in the apps' ingress settings. Only use this if your app has build in basic auth support. 
+- The example uses `https://application.mydomain.com/`, make sure your app is reachable and uses a valid certificate beforehand.
+- You can set HTTP-Basic Authentication Attributes under `Authentication settings` for your service here.
+  - Don't use a `basicAuth` middleware in the apps' ingress settings. Only use this if your app has build in basic auth support.
   - Add the attributes in a `authentik` group, then assign any user you want to be able to access the application to this group.
 
-![New-Provider-3](image.png)
+![New-Provider-3](img/New-Provider-3.png)
 
 - Once done use that new `Provider` you created
 
@@ -100,9 +100,9 @@ Once `authentik` is setup and running, you must create a `forwardAuth` inside `T
 
 The main thing about this screen is to use the internal DNS name for simplicity
 
-- I have successfully used an `authentik` instance on a difference host together with `external-service` using this URL: 
+- I have successfully used an `authentik` instance on a difference host together with `external-service` using this URL:
   - `https://authentik-external-service.ix-authentik.svc.cluster.local:9443/outpost.goauthentik.io/auth/traefik`
-- Use `heavyscript dns -a` to get the internal DNS name for your `authentik` instance in that case. 
+- Use `heavyscript dns -a` to get the internal DNS name for your `authentik` instance in that case.
 - I suggest using the `https` endpoint and port because it is what worked for me.
 
 :::

charts/incubator/authentik/questions.yaml

@@ -98,6 +98,15 @@ questions:
                 schema:
                   type: boolean
                   default: true
+              - variable: overwriteDefaultBlueprints
+                label: Overwrite Default Blueprints
+                description: |
+                  When enabled, all the default blueprints will be overwritten</br>
+                  True: mountPath: /blueprints</br>
+                  False: mountPath: /blueprints/custom
+                schema:
+                  type: boolean
+                  default: false
               - variable: tokenLength
                 label: Token Length
                 description: Configure the length of generated tokens
@@ -293,6 +302,16 @@ questions:
             additional_attrs: true
             type: dict
             attrs:
+              - variable: wipeBuiltInDb
+                label: Wipe Built-In GeoIP DB
+                description: |
+                  Wipes the built-in GeoIP database.</br>
+                  With this set to false, and disabled GeoIP container,</br>
+                  It will use the built-in database.
+                schema:
+                  type: boolean
+                  show_if: [["enabled", "=", false]]
+                  default: false
               - variable: enabled
                 label: Enabled
                 description: |

charts/incubator/authentik/templates/_config.tpl

@@ -30,8 +30,11 @@ server-worker:
     {{- $geoipPath := (printf "/geoip/%v.mmdb" .Values.authentik.geoip.editionID) -}}
     {{- if not .Values.authentik.geoip.enabled -}}
       {{- $geoipPath = "/tmp/non-existent-file" -}}
-    {{- end }}
+    {{- end -}}
+
+    {{- if or .Values.authentik.geoip.enabled .Values.authentik.geoip.wipeBuiltInDb }}
     AUTHENTIK_GEOIP: {{ $geoipPath }}
+    {{- end }}
 
     {{/* Mail */}}
     AUTHENTIK_EMAIL__USE_TLS: {{ .Values.authentik.email.useTLS | quote }}
@@ -120,6 +123,7 @@ geoip:
   data:
     GEOIPUPDATE_EDITION_IDS: {{ .Values.authentik.geoip.editionID }}
     GEOIPUPDATE_FREQUENCY: {{ .Values.authentik.geoip.frequency | quote }}
+    GEOIPUPDATE_DB_DIR: {{ .Values.persistence.geoip.targetSelector.geoip.geoip.mountPath | quote }}
 {{- end -}}
 
 {{- end -}}