chore(deps): update container image tccr.io/truecharts/adminer to latest (#11585)

**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [ ] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 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

@@ -1837,6 +1837,106 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "VictorienXP",
+      "name": "VictorienXP",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1633366?v=4",
+      "profile": "https://github.com/VictorienXP",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "yelhouti",
+      "name": "yelhouti",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5471639?v=4",
+      "profile": "https://github.com/yelhouti",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "svetlemodry",
+      "name": "Jaroslav Lichtblau",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8712544?v=4",
+      "profile": "https://github.com/svetlemodry",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Maximilian-Staab",
+      "name": "MaximilianS",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20892091?v=4",
+      "profile": "https://github.com/Maximilian-Staab",
+      "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"
+      ]
+    },
+    {
+      "login": "cedstrom",
+      "name": "cedstrom",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6175957?v=4",
+      "profile": "https://github.com/cedstrom",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "v3DJG6GL",
+      "name": "v3DJG6GL",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72495210?v=4",
+      "profile": "https://github.com/v3DJG6GL",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "polarstack",
+      "name": "polarstack",
+      "avatar_url": "https://avatars.githubusercontent.com/u/42521003?v=4",
+      "profile": "https://github.com/polarstack",
+      "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-196-orange.svg?style=for-the-badge)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-207-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)):
@@ -388,6 +388,21 @@ 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/depasseg"><img src="https://avatars.githubusercontent.com/u/3201827?v=4?s=100" width="100px;" alt="depasseg"/><br /><sub><b>depasseg</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=depasseg" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/j1mbl3s"><img src="https://avatars.githubusercontent.com/u/44634577?v=4?s=100" width="100px;" alt="j1mbl3s"/><br /><sub><b>j1mbl3s</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=j1mbl3s" title="Documentation">📖</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/VictorienXP"><img src="https://avatars.githubusercontent.com/u/1633366?v=4?s=100" width="100px;" alt="VictorienXP"/><br /><sub><b>VictorienXP</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=VictorienXP" title="Code">💻</a></td>
+      <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>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/cedstrom"><img src="https://avatars.githubusercontent.com/u/6175957?v=4?s=100" width="100px;" alt="cedstrom"/><br /><sub><b>cedstrom</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=cedstrom" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/v3DJG6GL"><img src="https://avatars.githubusercontent.com/u/72495210?v=4?s=100" width="100px;" alt="v3DJG6GL"/><br /><sub><b>v3DJG6GL</b></sub></a><br /><a href="https://github.com/truecharts/charts/issues?q=author%3Av3DJG6GL" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/polarstack"><img src="https://avatars.githubusercontent.com/u/42521003?v=4?s=100" width="100px;" alt="polarstack"/><br /><sub><b>polarstack</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=polarstack" title="Code">💻</a></td>
+    </tr>
   </tbody>
 </table>
 

.github/SUPPORT.md

@@ -20,6 +20,10 @@ We also document which versions of TrueNAS will receive TrueCharts updates and f
 | 22.12.0          | `master` | :white_check_mark:     | :white_check_mark:        | :white_check_mark:    | Stable Release as of 2022-12-13                                                                                |
 | 22.12.1          | `master` | :white_check_mark:     | :white_check_mark:        | :white_check_mark:    | Stable Release as of 2023-02-21                                                                                |
 | 22.12.2          | `master` | :white_check_mark:     | :white_check_mark:        | :white_check_mark:    | Stable Release as of 2023-04-11                                                                                |
+| 22.12.3          | `master` | :white_check_mark:     | :white_check_mark:        | :white_check_mark:    | Stable Release as of 2023-06-13                                                                                |
+| 22.12.3.1        | `master` | :white_check_mark:     | :white_check_mark:        | :white_check_mark:    | Stable Release as of 2023-06-20                                                                                |
+| 22.12.3.2        | `master` | :white_check_mark:     | :white_check_mark:        | :white_check_mark:    | Stable Release as of 2023-07-05                                                                                |
+| 22.12.3.3        | `master` | :white_check_mark:     | :white_check_mark:        | :white_check_mark:    | Stable Release as of 2023-07-25                                                                                |
 | Nightly          | `master` | :white_check_mark:     | :x:                       | :white_check_mark:    | Please only submit bug reports during codefreeze                                                               |
 
 :::warning Support Guidelines

.github/ct-install.yaml

@@ -1,6 +1,6 @@
 remote: origin
 target-branch: master
-helm-extra-args: --timeout 180s
+helm-extra-args: --timeout 250s
 chart-yaml-schema: .github/chart_schema.yaml
 chart-dirs:
   - charts/incubator
@@ -11,8 +11,11 @@ chart-dirs:
   - charts/operators
 excluded-charts:
   - charts/dependency/subchart
+  - charts/incubator/twingate-connector
+  - charts/incubator/midarr
   - charts/incubator/orbital-sync
   - charts/incubator/plex-meta-manager
+  - charts/incubator/tauticord
   - charts/library/common
   - charts/stable/alertmanager-bot
   - charts/stable/alertmanager-bot
@@ -21,14 +24,13 @@ excluded-charts:
   - charts/stable/discordgsm
   - charts/stable/facebox
   - charts/stable/foundryvtt
-  - charts/stable/foundryvtt
   - charts/stable/heimdall
+  - charts/stable/mc-router
   - charts/stable/multus
   - charts/stable/orbital-sync
   - charts/stable/plex-meta-manager
   - charts/stable/pod-gateway
   - charts/stable/promcord
-  - charts/stable/promcord
   - charts/stable/rdesktop
   - charts/stable/reg
   - charts/stable/romm
@@ -42,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

@@ -20,6 +20,12 @@
     "fileMatch": ["charts/.+/Chart\\.yaml$"]
   },
   "packageRules": [
+    // Bundle Github Actions
+    {
+      "matchManagers": ["github-actions"],
+      "groupName": "Github-Actions",
+      "automerge": true
+    },
     // Setup datasources for dep updates
     {
       "datasources": ["helm"],
@@ -281,6 +287,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/build-catalog.sh

@@ -75,6 +75,21 @@ patch_apps() {
     sed -i "s|^icon:|icon_url:|g" catalog/${train}/${chartname}/item.yaml
     echo "categories:" >> catalog/${train}/${chartname}/item.yaml
     cat ${target}/Chart.yaml | yq '.annotations."truecharts.org/catagories"' -r >> catalog/${train}/${chartname}/item.yaml
+
+    # Generate screenshots
+    screenshots=""
+    if [[ -d "${target}/screenshots" ]]; then
+        screenshots=$(ls ${target}/screenshots)
+    fi
+    if [[ -n $screenshots ]]; then
+        echo "screenshots:" >> catalog/${train}/${chartname}/item.yaml
+        for screenshot in $screenshots; do
+            echo "  - https://truecharts.org/img/hotlink-ok/chart-screenshots/${chartname}/${screenshot}" >> catalog/${train}/${chartname}/item.yaml
+        done
+    else
+        echo "screenshots: []" >> catalog/${train}/${chartname}/item.yaml
+    fi
+    rm -rf ${target}/screenshots
     # Copy changelog from website
     if [[ ! -f "website/docs/charts/${train}/${chartname}/CHANGELOG.md" ]]; then
         touch "website/docs/charts/${train}/${chartname}/CHANGELOG.md"

.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/scripts/tc-lint.sh

@@ -4,6 +4,19 @@ function check_version() {
     chart_path=${1:?"No chart path provided to [Version Check]"}
     target_branch=${2:?"No target branch provided to [Version Check]"}
 
+    # If only docs changed, skip version check
+    # git diff target_branch, filter only on $chart_path and invert match for $chart_path/docs
+    # note that it requires branches to be up to date for this to work.
+    chart_changes=$(git diff --name-status "$target_branch" -- "$chart_path" | grep -v "$chart_path/docs")
+    echo -e "\tChange files: \n\n$chart_changes"
+
+    if [[ -z "$chart_changes" ]]; then
+        echo -e "\tLooks like only docs changed. Skipping chart version check"
+        echo -e "\t✅ Chart version: No bump required"
+        echo ''
+        return
+    fi
+
     new=$(git diff "$target_branch" -- "$chart_path" | sed -nr 's/^\+version: (.*)$/\1/p')
     old=$(git diff "$target_branch" -- "$chart_path" | sed -nr 's/^\-version: (.*)$/\1/p')
 
@@ -23,6 +36,7 @@ function check_version() {
             curr_result=1
         fi
     fi
+    echo ''
 }
 export -f check_version
 
@@ -32,7 +46,9 @@ function check_chart_schema(){
     yamale_output=$(yamale --schema .github/chart_schema.yaml "$chart_path/Chart.yaml")
     yamale_exit_code=$?
     while IFS= read -r line; do
-        echo -e "\t$line"
+        if [[ -n $line ]]; then
+            echo -e "\t$line"
+        fi
     done <<< "$yamale_output"
 
     if [ $yamale_exit_code -ne 0 ]; then
@@ -41,6 +57,7 @@ function check_chart_schema(){
     else
         echo -e "\t✅ Chart Schema: Passed"
     fi
+    echo ''
 }
 export -f check_chart_schema
 
@@ -51,7 +68,9 @@ function helm_lint(){
     helm_lint_output=$(helm lint --quiet "$chart_path")
     helm_lint_exit_code=$?
     while IFS= read -r line; do
-        echo -e "\t$line"
+        if [[ -n $line ]]; then
+            echo -e "\t$line"
+        fi
     done <<< "$helm_lint_output"
 
     if [ $helm_lint_exit_code -ne 0 ]; then
@@ -60,16 +79,46 @@ function helm_lint(){
     else
         echo -e "\t✅ Helm Lint: Passed"
     fi
+    echo ''
 }
 export -f helm_lint
 
+function helm_template(){
+    chart_path=${1:?"No chart path provided to [Helm template]"}
+    values=${2:-}
+
+    if [[ -n "$values" ]]; then
+        values="-f $values"
+    fi
+
+    # Print only errors and warnings
+    helm_template_output=$(helm template $values "$chart_path" 2>&1 >/dev/null)
+    helm_template_exit_code=$?
+    while IFS= read -r line; do
+        if [[ -n $line ]]; then
+            echo -e "\t$line"
+        fi
+    done <<< "$helm_template_output"
+
+    if [ $helm_template_exit_code -ne 0 ]; then
+        echo -e "\t❌ Helm template: Failed"
+        curr_result=1
+    else
+        echo -e "\t✅ Helm template: Passed"
+    fi
+    echo ''
+}
+export -f helm_template
+
 function yaml_lint(){
     file_path=${1:?"No file path provided to [YAML lint]"}
 
     yaml_lint_output=$(yamllint --config-file .github/yaml-lint-conf.yaml "$file_path")
     yaml_lint_exit_code=$?
     while IFS= read -r line; do
-        echo -e "\t$line"
+        if [[ -n $line ]]; then
+            echo -e "\t$line"
+        fi
     done <<< "$yaml_lint_output"
 
     if [ $yaml_lint_exit_code -ne 0 ]; then
@@ -78,6 +127,7 @@ function yaml_lint(){
     else
         echo -e "\t✅ YAML Lint: Passed [$file_path]"
     fi
+    echo ''
 }
 export -f yaml_lint
 
@@ -97,6 +147,19 @@ function lint_chart(){
         echo "👣 Helm Lint - [$chart_path]"
         helm_lint "$chart_path"
 
+        # FIXME: Comment out for now as it requires deps installed in linting.
+        # if [[ ! $(ls $chart_path/ci/*values.yaml) ]]; then
+        #     echo "👣 Helm Template - [$chart_path]"
+        #     helm_template "$chart_path"
+        # fi
+
+        # for values in $chart_path/ci/*values.yaml; do
+        #     if [ -f "${values}" ]; then
+        #         echo "👣 Helm Template - [$values]"
+        #         helm_template "$chart_path" "$values"
+        #     fi
+        # done
+
         echo "👣 Chart Version - [$chart_path] against [$target_branch]"
         check_version "$chart_path" "$target_branch"
 
@@ -129,6 +192,7 @@ function lint_chart(){
         echo ''
     } > "$curr_result_file"
     cat "$curr_result_file"
+    # $curr_result starts with 0, and it gets set to 1 only when a linting step fails
     echo $curr_result >> "$status_file"
 }
 export -f lint_chart

.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)
@@ -75,6 +75,7 @@ jobs:
       - name: Test and Fix Pre-Commit Issues
         shell: bash
         # TODO: Only run pre-commit on changed files
+        # TODO: Commit fixes
         if: inputs.chartChangesDetected == 'true'
         run: |
           echo "Running pre-commit test-and-cleanup..."
@@ -107,7 +108,7 @@ jobs:
       - name: Create/Update comment
         if: steps.list-changed.outputs.detected == 'true'
         continue-on-error: true
-        uses: thollander/actions-comment-pull-request@dadb7667129e23f12ca3925c90dc5cd7121ab57e # v2
+        uses: thollander/actions-comment-pull-request@d61db783da9abefc3437960d0cce08552c7c004f # v2
         with:
           filePath: /tmp/lint_result.txt
           comment_tag: lint_results

.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
@@ -184,6 +185,7 @@ jobs:
                 mkdir -p website/docs/charts/${train}/${chart} || echo "chart path already exists, continuing..."
                 yes | cp -rf charts/${train}/${chart}/docs/* website/docs/charts/${train}/${chart}/ 2>/dev/null || :
                 yes | cp -rf charts/${train}/${chart}/icon.png website/static/img/hotlink-ok/chart-icons/${chart}.png 2>/dev/null || :
+                yes | cp -rf charts/${train}/${chart}/screenshots/* website/static/img/hotlink-ok/chart-screenshots/${chart}/ 2>/dev/null || :
 
                 # Copy over kept documents
                 mv -f tmp/website/docs/charts/${train}/${chart}/CHANGELOG.md website/docs/charts/${train}/${chart}/CHANGELOG.md 2>/dev/null || :

.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"
 
@@ -146,18 +146,28 @@ jobs:
         run: |
           kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true
 
+      - name: Prep Helm
+        run: |
+          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 jetstack https://charts.jetstack.io
+          helm repo update
+
       - name: Add Dependencies
         run: |
-          ## TODO: Move to our Helm Charts
+          if [[ "${{ matrix.chart }}" == "charts/operators/metallb-config" ]]; then
+            helm install metallb truecharts/metallb --namespace metallb --create-namespace --wait
+          fi
           ## TODO: Only add when required
-          if [[ "${{ matrix.chart }}" != "charts/operators/metallb" ]]; 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"
+          if [[ "${{ matrix.chart }}" == "charts/enterprise/clusterissuer" ]]; then
+            helm install cert-manager truecharts/cert-manager --namespace cert-manager --create-namespace --wait
           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"
+            helm install cloudnative-pg truecharts/cloudnative-pg --namespace cloudnative-pg --create-namespace --wait
           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"
+            helm install prometheus-operator truecharts/prometheus-operator --namespace prometheus-operator --create-namespace --wait
           fi
 
       - name: Run chart-testing (install)
@@ -187,7 +197,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 +218,18 @@ jobs:
 
       - name: Add Dependencies
         run: |
-          if [[ "${{ matrix.chart }}" != "charts/operators/metallb" ]]; 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"
+          if [[ "${{ matrix.chart }}" == "charts/operators/metallb-config" ]]; then
+            helm install metallb truecharts/metallb --namespace metallb --create-namespace --wait
+          fi
+          ## TODO: Only add when required
+          if [[ "${{ matrix.chart }}" == "charts/enterprise/clusterissuer" ]]; then
+            helm install cert-manager truecharts/cert-manager --namespace cert-manager --create-namespace --wait
           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"
+            helm install cloudnative-pg truecharts/cloudnative-pg --namespace cloudnative-pg --create-namespace --wait
           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"
+            helm install prometheus-operator truecharts/prometheus-operator --namespace prometheus-operator --create-namespace --wait
           fi
 
       - name: Run chart-testing (install)
@@ -245,7 +259,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 +280,18 @@ jobs:
 
       - name: Add Dependencies
         run: |
-          if [[ "${{ matrix.chart }}" != "charts/operators/metallb" ]]; 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"
+          if [[ "${{ matrix.chart }}" == "charts/operators/metallb-config" ]]; then
+            helm install metallb truecharts/metallb --namespace metallb --create-namespace --wait
+          fi
+          ## TODO: Only add when required
+          if [[ "${{ matrix.chart }}" == "charts/enterprise/clusterissuer" ]]; then
+            helm install cert-manager truecharts/cert-manager --namespace cert-manager --create-namespace --wait
           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"
+            helm install cloudnative-pg truecharts/cloudnative-pg --namespace cloudnative-pg --create-namespace --wait
           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"
+            helm install prometheus-operator truecharts/prometheus-operator --namespace prometheus-operator --create-namespace --wait
           fi
 
       - name: Run chart-testing (install)
@@ -303,7 +321,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 +342,18 @@ jobs:
 
       - name: Add Dependencies
         run: |
-          if [[ "${{ matrix.chart }}" != "charts/operators/metallb" ]]; 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"
+          if [[ "${{ matrix.chart }}" == "charts/operators/metallb-config" ]]; then
+            helm install metallb truecharts/metallb --namespace metallb --create-namespace --wait
+          fi
+          ## TODO: Only add when required
+          if [[ "${{ matrix.chart }}" == "charts/enterprise/clusterissuer" ]]; then
+            helm install cert-manager truecharts/cert-manager --namespace cert-manager --create-namespace --wait
           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"
+            helm install cloudnative-pg truecharts/cloudnative-pg --namespace cloudnative-pg --create-namespace --wait
           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"
+            helm install prometheus-operator truecharts/prometheus-operator --namespace prometheus-operator --create-namespace --wait
           fi
 
       - name: Run chart-testing (install)
@@ -361,7 +383,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,16 +404,19 @@ jobs:
 
       - name: Add Dependencies
         run: |
-          if [[ "${{ matrix.chart }}" != "charts/operators/metallb" ]]; then
-            kubectl apply -f --server-side --force-conflicts https://raw.githubusercontent.com/metallb/metallb/v0.13.10/config/manifests/metallb-native.yaml
+          if [[ "${{ matrix.chart }}" == "charts/operators/metallb-config" ]]; then
+            helm install metallb truecharts/metallb --namespace metallb --create-namespace --wait
+          fi
+          ## TODO: Only add when required
+          if [[ "${{ matrix.chart }}" == "charts/enterprise/clusterissuer" ]]; then
+            helm install cert-manager truecharts/cert-manager --namespace cert-manager --create-namespace --wait
           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
+            helm install cloudnative-pg truecharts/cloudnative-pg --namespace cloudnative-pg --create-namespace --wait
           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
+            helm install prometheus-operator truecharts/prometheus-operator --namespace prometheus-operator --create-namespace --wait
           fi
-
       - name: Run chart-testing (install)
         run: ct install --config ".github/ct-install.yaml" --charts "${{ matrix.chart }}" # --upgrade
 
@@ -419,7 +444,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 +465,18 @@ jobs:
 
       - name: Add Dependencies
         run: |
-          if [[ "${{ matrix.chart }}" != "charts/operators/metallb" ]]; 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"
+          if [[ "${{ matrix.chart }}" == "charts/operators/metallb-config" ]]; then
+            helm install metallb truecharts/metallb --namespace metallb --create-namespace --wait
+          fi
+          ## TODO: Only add when required
+          if [[ "${{ matrix.chart }}" == "charts/enterprise/clusterissuer" ]]; then
+            helm install cert-manager truecharts/cert-manager --namespace cert-manager --create-namespace --wait
           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"
+            helm install cloudnative-pg truecharts/cloudnative-pg --namespace cloudnative-pg --create-namespace --wait
           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"
+            helm install prometheus-operator truecharts/prometheus-operator --namespace prometheus-operator --create-namespace --wait
           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@bea5baf987ba7aa777a8a0b4ace377a21c45c381 # v3
         with:
           node-version: 18
 

.github/workflows/renovate-bump.yaml

@@ -10,7 +10,7 @@ on:
 jobs:
   renovate-bump:
     name: Get changed Apps
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     container:
       image: ghcr.io/truecharts/devcontainer:3.1.10@sha256:c239addf725eb5cedf79517f8089fdafdc32b5270d1893ee87ae6e511b9bcae3
     steps:

.github/workflows/renovate.yml

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

.github/workflows/stale.yaml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   stale:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check for stale issues and PRs
         uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8

charts/dependency/clickhouse/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "23.4.2.11"
+appVersion: "23.7.4.5"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.1
+    version: 14.0.2
 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.41
+version: 7.0.3
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/clickhouse/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

charts/dependency/clickhouse/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/clickhouse
   pullPolicy: IfNotPresent
-  tag: v23.4.2.11@sha256:c12f70ed3f189415fac14cb4e1cb861575817fe6d1e385dc88024341eca10cca
+  tag: v23.7.4.5@sha256:2d52dece52908fc10565db7a5e8580606b4775ff164fb4bd0778f873cac58c5e
 
 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.1
+    version: 14.0.2
 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.20
+version: 3.0.5
 annotations:
   truecharts.org/catagories: |
     - metrics

charts/dependency/kube-state-metrics/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

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:3ec0f0765cae3d8635edad876f3bca1315ea2d69c2ae5cbee9f46c881c85acf5
+  tag: v2.9.2@sha256:eb75397391d6eed8eee85da22a9cf595c4e3d9a52fdfc311f8cb629baf1f543b
 
 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.1
+    version: 14.0.2
 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.50
+version: 9.0.6
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/mariadb/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

charts/dependency/mariadb/values.yaml

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

charts/dependency/memcached/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "1.6.20"
+appVersion: "1.6.21"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.1
+    version: 14.0.2
 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.59
+version: 8.0.7
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/memcached/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

charts/dependency/memcached/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/memcached
   pullPolicy: IfNotPresent
-  tag: v1.6.20@sha256:ed57e787e5b280440220cd8246d87901dbfd436fa61cb63b640cfd4387e8a07c
+  tag: v1.6.21@sha256:fc655c32727d371ba77d370203f2622dde3e90b23a69214ca2cdcb6156eaa376
 
 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.1
+    version: 14.0.2
 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.48
+version: 8.0.3
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/mongodb/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

charts/dependency/mongodb/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/mongodb
   pullPolicy: IfNotPresent
-  tag: v6.0.6@sha256:757f91b38a37e3a33710d3c77015eae68762fd890cb675d84c9b86668790f462
+  tag: v6.0.8@sha256:031136aedbbac60815dba3e87f4e270afb76fe3ab824946d57d4f9ba6bd6476f
 
 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.1
+    version: 14.0.2
 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.22
+version: 3.0.5
 annotations:
   truecharts.org/catagories: |
     - metrics

charts/dependency/node-exporter/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

charts/dependency/node-exporter/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/node-exporter
   pullPolicy: IfNotPresent
-  tag: v1.6.0@sha256:c286e5dab7f852d1464a01122c3bbd7c48149ecdec188499aea579aef379238b
+  tag: v1.6.1@sha256:3d253e6a23403d74d9280d6bb964735b83a117edce2cc06c38f43ca96c9eb78d
 
 service:
   main:
@@ -17,11 +17,12 @@ workload:
       containers:
         main:
           args:
-            - --path.procfs=/host/proc
-            - --path.sysfs=/host/sys
+            - --path.rootfs=/host
+            - --path.procfs=/hostproc
+            - --path.sysfs=/hostsys
             - --web.listen-address=0.0.0.0:{{ .Values.service.main.ports.main.port }}
-            - --collector.filesystem.ignored-mount-points="^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/.+|var/db/system/.+|mnt/[a-zA-Z0-9-_\\.]+/ix-applications/.+)($|/)"
-            - --collector.filesystem.ignored-fs-types="^(autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$"
+            - --collector.filesystem.mount-points-exclude="^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/.+|var/db/system/.+|mnt/[a-zA-Z0-9-_\\.]+/ix-applications/.+)($|/)"
+            - --collector.filesystem.fs-types-exclude="^(autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$"
             - --collector.netdev.device-exclude="^veth.*$"
             - --collector.netclass.ignored-devices="^veth.*$"
           probes:
@@ -44,18 +45,21 @@ podOptions:
 persistence:
   host:
     enabled: true
+    type: hostPath
     hostPath: /
     mountPath: /host
     readOnly: true
   proc:
     enabled: true
+    type: hostPath
     hostPath: /proc
-    mountPath: /host/proc
+    mountPath: /hostproc
     readOnly: true
   sys:
     enabled: true
+    type: hostPath
     hostPath: /sys
-    mountPath: /host/sys
+    mountPath: /hostsys
     readOnly: true
 
 metrics:
@@ -63,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.1
+    version: 14.0.2
 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.58
+version: 8.0.7
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/redis/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

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:186cc9418acb87e02a24566a0abceb7c7be55912ff20d12cd226d438de479b1d
 
 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.1
+    version: 14.0.2
 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.48
+version: 6.0.7
 annotations:
   truecharts.org/catagories: |
     - search

charts/dependency/solr/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

charts/dependency/solr/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/solr
   pullPolicy: IfNotPresent
-  tag: v9.2.1@sha256:04c6f6e9d7c3fcecf1a5c17ca6899223e5880370bd660c1321e11bf72d892bdd
+  tag: v9.3.0@sha256:0116bf9df507776691e51d4968ab61403d932cd5ca58a61505709e4988d1bee6
 
 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.2
+    version: 14.0.1
   - condition: redis.enabled
     name: redis
     repository: https://deps.truecharts.org
-    version: 6.0.58
+    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.28
+version: 18.0.0
 annotations:
   truecharts.org/catagories: |
     - security

charts/enterprise/authelia/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

charts/enterprise/authelia/docs/Setup-Guide.md

@@ -30,9 +30,8 @@ LLDAP is a `Stable` train chart and therefore isn't supported at the same level
 
 ### App Configuration
 
-Domain: `mydomain.com` <- Your domain without https://
-Default Redirection URL: `auth.mydomain.com`
-  - Can be anything, but we'll stick to auth.mydomain.com. As well, this will be the ingress URL for `Authelia`
+- Domain: `mydomain.com` <- Your domain without https://
+- Default Redirection URL: `https://auth.mydomain.com` <- Can be anything, but we'll stick to auth.mydomain.com. As well, this will be the ingress URL for `Authelia`
 
 ### LDAP Backend Configuration
 
@@ -97,6 +96,13 @@ Leave the default `one_factor` unless you've setup TOTP above. Then click `Add`
   - `Remote-Name`
   - `Remote-Email`
 
+### Adding the forwardauth to your Apps
+
+The last step is adding the `forwardauth` along with the standard `ingress` settings for your app, for more info on setting ingress see the [ClusterIssuer Guide](https://truecharts.org/charts/enterprise/clusterissuer/how-to). What changes versus a standard setup is the `Traefik Middlewares` section, where you must add your `forwardauth` to the section.
+
+- In this example we use the same name as above, or `auth`. Click `Add` to the `Traefik Middlewares` section, and enter your `forwardauth` name.
+
+![TraefikForwardAuthMiddleware](img/TraefikForwardAuthMiddleware.png)
 ### References
 
 The origin material for this guide is available on the [LLDAP Github](https://github.com/lldap/lldap). While further information on Authelia can be found on their [Github](https://github.com/authelia/authelia) and [website](https://www.authelia.com/).

charts/enterprise/authelia/docs/validation.md

@@ -0,0 +1,23 @@
+# Input Validation
+
+**`Default Redirection URL`**
+
+Accepts:
+
+- `https://`
+- DNS host
+- Characters (`0-9`, `a-z`, `A-Z`, `-`, `.`)
+
+Accepted formats are:
+
+- `https://dnshost`
+- `https://DNSHOST`
+- `https://DNS-HOST`
+- `https://dns-host`
+
+Regex used to match this: `^https?:\/\/(.*)`
+You can try live [here](https://regex101.com/r/zFt9zy/1)
+
+---
+
+_If you find a field that you think it needs validation, please open an issue on github_

charts/enterprise/authelia/questions.yaml

@@ -28,6 +28,7 @@ questions:
     schema:
       type: string
       default: ""
+      valid_chars: '^https?:\/\/(.*)'
   - variable: theme
     group: "App Configuration"
     label: "Theme"

charts/enterprise/authelia/templates/_configmap.tpl

@@ -32,41 +32,41 @@ enabled: true
 data:
   configuration.yaml: |
     ---
-    theme: {{ default "light" .Values.theme }}
+    theme: {{ .Values.theme | default "light" }}
     default_redirection_url: {{ default (printf "https://www.%s" .Values.domain) .Values.default_redirection_url }}
     ntp:
-      address:  {{ default "time.cloudflare.com:123" .Values.ntp.address }}
-      version: {{ default 4 .Values.ntp.version }}
-      max_desync: {{ default "3s" .Values.ntp.max_desync }}
-      disable_startup_check: {{ default false .Values.ntp.disable_startup_check }}
-      disable_failure: {{ default true .Values.ntp.disable_failure }}
+      address:  {{ .Values.ntp.address | default "time.cloudflare.com:123" }}
+      version: {{ .Values.ntp.version | default 4 }}
+      max_desync: {{ .Values.ntp.max_desync | default "3s" }}
+      disable_startup_check: {{ .Values.ntp.disable_startup_check | default false }}
+      disable_failure: {{ .Values.ntp.disable_failure |  default true }}
     server:
       host: 0.0.0.0
-      port: {{ default 9091 .Values.server.port }}
-      {{- if not (eq "" (default "" .Values.server.path)) }}
+      port: {{ .Values.server.port | default 9091 }}
+      {{- if ne "" (.Values.server.path | default "") }}
       path: {{ .Values.server.path }}
       {{- end }}
       buffers:
-        write: {{ default 4096 .Values.server.write_buffer_size }}
-        read: {{ default 4096 .Values.server.read_buffer_size }}
-      enable_pprof: {{ default false .Values.server.enable_pprof }}
-      enable_expvars: {{ default false .Values.server.enable_expvars }}
+        write: {{ .Values.server.write_buffer_size | default 4096 }}
+        read: {{ .Values.server.read_buffer_size | default 4096 }}
+      enable_pprof: {{ .Values.server.enable_pprof | default false }}
+      enable_expvars: {{ .Values.server.enable_expvars | default false }}
     log:
-      level: {{ default "info" .Values.log.level }}
-      format: {{ default "text" .Values.log.format }}
-      {{- if not (eq "" (default "" .Values.log.file_path)) }}
+      level: {{ .Values.log.level | default "info" }}
+      format: {{ .Values.log.format | default "text" }}
+      {{- if ne "" (.Values.log.file_path | default "") }}
       file_path: {{ .Values.log.file_path }}
       keep_stdout: true
       {{- end }}
     totp:
-      issuer: {{ default .Values.domain .Values.totp.issuer }}
-      period: {{ default 30 .Values.totp.period }}
-      skew: {{ default 1 .Values.totp.skew }}
+      issuer: {{ .Values.totp.issuer | default .Values.domain }}
+      period: {{ .Values.totp.period | default 30 }}
+      skew: {{ .Values.totp.skew | default 1 }}
     {{- if .Values.duo_api.enabled }}
     duo_api:
       hostname: {{ .Values.duo_api.hostname }}
       integration_key: {{ .Values.duo_api.integration_key }}
-    {{- end }}
+    {{- end -}}
     {{- with $auth := .Values.authentication_backend }}
     authentication_backend:
       password_reset:
@@ -74,95 +74,121 @@ data:
     {{- if $auth.file.enabled }}
       file:
         path: {{ $auth.file.path }}
-        password: {{ toYaml $auth.file.password | nindent 10 }}
-    {{- end }}
+        password:
+          {{- $p := $auth.file.password -}}
+          {{- if $p.algorithm }}
+          algorithm: {{ $p.algorithm }}
+          {{- end -}}
+          {{- if $p.iterations }}
+          iterations: {{ $p.iterations }}
+          {{- end -}}
+          {{- if $p.key_length }}
+          key_length: {{ $p.key_length }}
+          {{- end -}}
+          {{- if $p.salt_length }}
+          salt_length: {{ $p.salt_length }}
+          {{- end -}}
+          {{- if $p.memory }}
+          memory: {{ $p.memory }}
+          {{- end -}}
+          {{- if $p.parallelism }}
+          parallelism: {{ $p.parallelism }}
+          {{- end -}}
+    {{- end -}}
     {{- if $auth.ldap.enabled }}
       ldap:
-        implementation: {{ default "custom" $auth.ldap.implementation }}
+        implementation: {{ $auth.ldap.implementation | default "custom" }}
         url: {{ $auth.ldap.url }}
-        timeout: {{ default "5s" $auth.ldap.timeout }}
+        timeout: {{ $auth.ldap.timeout | default "5s" }}
         start_tls: {{ $auth.ldap.start_tls }}
         tls:
           {{- if hasKey $auth.ldap.tls "server_name" }}
-          server_name: {{ default $auth.ldap.host $auth.ldap.tls.server_name }}
+          server_name: {{ $auth.ldap.tls.server_name | default $auth.ldap.host }}
           {{- end }}
-          minimum_version: {{ default "TLS1.2" $auth.ldap.tls.minimum_version }}
-          skip_verify: {{ default false $auth.ldap.tls.skip_verify }}
+          minimum_version: {{ $auth.ldap.tls.minimum_version | default "TLS1.2" }}
+          skip_verify: {{ $auth.ldap.tls.skip_verify | default false }}
     {{- if $auth.ldap.base_dn }}
         base_dn: {{ $auth.ldap.base_dn }}
-    {{- end }}
+    {{- end -}}
     {{- if $auth.ldap.username_attribute }}
         username_attribute: {{ $auth.ldap.username_attribute }}
-    {{- end }}
+    {{- end -}}
     {{- if $auth.ldap.additional_users_dn }}
         additional_users_dn: {{ $auth.ldap.additional_users_dn }}
-    {{- end }}
+    {{- end -}}
     {{- if $auth.ldap.users_filter }}
         users_filter: {{ $auth.ldap.users_filter }}
-    {{- end }}
+    {{- end -}}
     {{- if $auth.ldap.additional_groups_dn }}
         additional_groups_dn: {{ $auth.ldap.additional_groups_dn }}
-    {{- end }}
+    {{- end -}}
     {{- if $auth.ldap.groups_filter }}
         groups_filter: {{ $auth.ldap.groups_filter }}
-    {{- end }}
+    {{- end -}}
     {{- if $auth.ldap.group_name_attribute }}
         group_name_attribute: {{ $auth.ldap.group_name_attribute }}
-    {{- end }}
+    {{- end -}}
     {{- if $auth.ldap.mail_attribute }}
         mail_attribute: {{ $auth.ldap.mail_attribute }}
-    {{- end }}
+    {{- end -}}
     {{- if $auth.ldap.display_name_attribute }}
         display_name_attribute: {{ $auth.ldap.display_name_attribute }}
     {{- end }}
         user: {{ $auth.ldap.user }}
-    {{- end }}
-    {{- end }}
+    {{- end -}}
+    {{- end -}}
     {{- with $session := .Values.session }}
     session:
-      name: {{ default "authelia_session" $session.name }}
+      name: {{ $session.name | default "authelia_session" }}
       domain: {{ required "A valid .Values.domain entry required!" $.Values.domain }}
-      same_site: {{ default "lax" $session.same_site }}
-      expiration: {{ default "1M" $session.expiration }}
-      inactivity: {{ default "5m" $session.inactivity }}
-      remember_me_duration: {{ default "1M" $session.remember_me_duration }}
+      same_site: {{ $session.same_site | default "lax" }}
+      expiration: {{ $session.expiration | default "1M" }}
+      inactivity: {{ $session.inactivity | default "5m" }}
+      remember_me_duration: {{ $session.remember_me_duration | default "1M" }}
     {{- end }}
       redis:
         host: {{ .Values.redis.creds.plain }}
       {{- with $redis := .Values.redisProvider }}
-        port: {{ default 6379 $redis.port }}
+        port: {{ $redis.port | default 6379 }}
         {{- if not (eq $redis.username "") }}
         username: {{ $redis.username }}
         {{- end }}
-        maximum_active_connections: {{ default 8 $redis.maximum_active_connections }}
-        minimum_idle_connections: {{ default 0 $redis.minimum_idle_connections }}
+        maximum_active_connections: {{ $redis.maximum_active_connections | default 8 }}
+        minimum_idle_connections: {{ $redis.minimum_idle_connections | default 0 }}
     {{- if $redis.tls.enabled }}
         tls:
           server_name: {{ $redis.tls.server_name }}
-          minimum_version: {{ default "TLS1.2" $redis.tls.minimum_version }}
+          minimum_version: {{ $redis.tls.minimum_version | default "TLS1.2" }}
           skip_verify: {{ $redis.tls.skip_verify }}
     {{- end }}
     {{- if $redis.high_availability.enabled }}
         high_availability:
           sentinel_name: {{ $redis.high_availability.sentinel_name }}
     {{- if $redis.high_availability.nodes }}
-          nodes: {{ toYaml $redis.high_availability.nodes | nindent 10 }}
+          nodes:
+          {{- range $node := $redis.high_availability.nodes }}
+          - host: {{ $node.host }}
+            port: {{ $node.port | default 26379 }}
+          {{- end -}}
     {{- end }}
           route_by_latency: {{ $redis.high_availability.route_by_latency }}
           route_randomly: {{ $redis.high_availability.route_randomly }}
       {{- end }}
     {{- end }}
-    regulation: {{ toYaml .Values.regulation | nindent 6 }}
+    regulation:
+      max_retries: {{ .Values.regulation.max_retries | default 3 }}
+      find_time: {{ .Values.regulation.find_time | default "1m" }}
+      ban_time: {{ .Values.regulation.ban_time | default "5m" }}
     storage:
       postgres:
         host: {{ $.Values.cnpg.main.creds.host }}
     {{- with $storage := .Values.storage }}
-        port: {{ default 5432 $storage.postgres.port }}
-        database: {{ default "authelia" $storage.postgres.database }}
-        username: {{ default "authelia" $storage.postgres.username }}
-        timeout: {{ default "5s" $storage.postgres.timeout }}
+        port: {{ $storage.postgres.port | default 5432 }}
+        database: {{ $storage.postgres.database | default "authelia" }}
+        username: {{ $storage.postgres.username | default "authelia" }}
+        timeout: {{ $storage.postgres.timeout | default "5s" }}
         ssl:
-          mode: {{ default "disable" $storage.postgres.sslmode }}
+          mode: {{ $storage.postgres.sslmode | default "disable" }}
     {{- end }}
     {{- with $notifier := .Values.notifier }}
     notifier:
@@ -174,8 +200,8 @@ data:
     {{- if $notifier.smtp.enabled }}
       smtp:
         host: {{ $notifier.smtp.host }}
-        port: {{ default 25 $notifier.smtp.port }}
-        timeout: {{ default "5s" $notifier.smtp.timeout }}
+        port: {{ $notifier.smtp.port | default 25 }}
+        timeout: {{ $notifier.smtp.timeout | default "5s" }}
         {{- with $notifier.smtp.username }}
         username: {{ . }}
         {{- end }}
@@ -186,50 +212,65 @@ data:
         disable_require_tls: {{ $notifier.smtp.disable_require_tls }}
         disable_html_emails: {{ $notifier.smtp.disable_html_emails }}
         tls:
-          server_name: {{ default $notifier.smtp.host $notifier.smtp.tls.server_name }}
-          minimum_version: {{ default "TLS1.2" $notifier.smtp.tls.minimum_version }}
-          skip_verify: {{ default false $notifier.smtp.tls.skip_verify }}
+          server_name: {{ $notifier.smtp.tls.server_name | default $notifier.smtp.host }}
+          minimum_version: {{ $notifier.smtp.tls.minimum_version | default "TLS1.2" }}
+          skip_verify: {{ $notifier.smtp.tls.skip_verify | default false }}
     {{- end }}
     {{- end }}
     {{- if .Values.identity_providers.oidc.enabled }}
     identity_providers:
       oidc:
-        access_token_lifespan: {{ default "1h" .Values.identity_providers.oidc.access_token_lifespan }}
-        authorize_code_lifespan: {{ default "1m" .Values.identity_providers.oidc.authorize_code_lifespan }}
-        id_token_lifespan: {{ default "1h" .Values.identity_providers.oidc.id_token_lifespan }}
-        refresh_token_lifespan: {{ default "90m" .Values.identity_providers.oidc.refresh_token_lifespan }}
-        enable_client_debug_messages: {{ default false .Values.identity_providers.oidc.enable_client_debug_messages }}
-        minimum_parameter_entropy: {{ default 8 .Values.identity_providers.oidc.minimum_parameter_entropy }}
-        {{- if gt (len .Values.identity_providers.oidc.clients) 0 }}
+        access_token_lifespan: {{ .Values.identity_providers.oidc.access_token_lifespan | default "1h" }}
+        authorize_code_lifespan: {{ .Values.identity_providers.oidc.authorize_code_lifespan | default "1m" }}
+        id_token_lifespan: {{ .Values.identity_providers.oidc.id_token_lifespan | default "1h" }}
+        refresh_token_lifespan: {{ .Values.identity_providers.oidc.refresh_token_lifespan | default "90m" }}
+        enable_client_debug_messages: {{ .Values.identity_providers.oidc.enable_client_debug_messages | default false }}
+        minimum_parameter_entropy: {{ .Values.identity_providers.oidc.minimum_parameter_entropy | default 8 }}
+        {{- if .Values.identity_providers.oidc.clients  }}
         clients:
     {{- range $client := .Values.identity_providers.oidc.clients }}
         - id: {{ $client.id }}
-          description: {{ default $client.id $client.description }}
-          secret: {{ default (randAlphaNum 128) $client.secret }}
+          description: {{ $client.description | default $client.id }}
+          secret: {{ $client.secret | default (randAlphaNum 128) }}
           {{- if $client.public }}
           public: {{ $client.public }}
           {{- end }}
-          authorization_policy: {{ default "two_factor" $client.authorization_policy }}
-          consent_mode: {{ default "auto" $client.consent_mode}}
+          authorization_policy: {{ $client.authorization_policy | default "two_factor" }}
+          consent_mode: {{ $client.consent_mode | default "auto" }}
           redirect_uris:
           {{- range $client.redirect_uris }}
           - {{ . }}
           {{- end }}
           {{- if $client.audience }}
-          audience: {{ toYaml $client.audience | nindent 10 }}
+          audience:
+            {{- range $client.audience }}
+            - {{ . }}
+            {{- end }}
+          {{- end }}
+          scopes:
+          {{- range ($client.scopes | default (list "openid" "profile" "email" "groups")) }}
+            - {{ . }}
+          {{- end }}
+          grant_types:
+          {{- range ($client.grant_types | default (list "refresh_token" "authorization_code")) }}
+            - {{ . }}
+          {{- end }}
+          response_types:
+          {{- range ($client.response_types | default (list "code")) }}
+            - {{ . }}
           {{- end }}
-          scopes: {{ toYaml (default (list "openid" "profile" "email" "groups") $client.scopes) | nindent 10 }}
-          grant_types: {{ toYaml (default (list "refresh_token" "authorization_code") $client.grant_types) | nindent 10 }}
-          response_types: {{ toYaml (default (list "code") $client.response_types) | nindent 10 }}
           {{- if $client.response_modes }}
-          response_modes: {{ toYaml $client.response_modes | nindent 10 }}
+          response_modes:
+          {{- range $client.response_modes }}
+            - {{ . }}
           {{- end }}
-          userinfo_signing_algorithm: {{ default "none" $client.userinfo_signing_algorithm }}
+          {{- end }}
+          userinfo_signing_algorithm: {{ $client.userinfo_signing_algorithm | default "none" }}
     {{- end }}
     {{- end }}
     {{- end }}
     access_control:
-    {{- if (eq (len .Values.access_control.rules) 0) }}
+    {{- if not .Values.access_control.rules }}
       {{- if (eq .Values.access_control.default_policy "bypass") }}
       default_policy: one_factor
       {{- else if (eq .Values.access_control.default_policy "deny") }}
@@ -240,15 +281,69 @@ data:
     {{- else }}
       default_policy: {{ .Values.access_control.default_policy }}
     {{- end }}
-    {{- if (eq (len .Values.access_control.networks) 0) }}
+
+    {{- if not .Values.access_control.networks }}
       networks: []
     {{- else }}
-      networks: {{ toYaml .Values.access_control.networks | nindent 6 }}
+      networks:
+    {{- range $net := .Values.access_control.networks }}
+      - name: {{ $net.name }}
+        networks:
+          {{- range $net.networks }}
+          - {{ . | squote }}
+          {{- end }}
     {{- end }}
-    {{- if (eq (len .Values.access_control.rules) 0) }}
+    {{- end }}
+
+    {{- if not .Values.access_control.rules }}
       rules: []
     {{- else }}
-      rules: {{ toYaml .Values.access_control.rules | nindent 6 }}
+      rules:
+    {{- range $rule := .Values.access_control.rules }}
+      {{- if $rule.domain }}
+      - domain:
+        {{- if kindIs "string" $rule.domain }}
+          - {{ $rule.domain | squote }}
+        {{- else -}}
+          {{- range $rule.domain }}
+          - {{ . | squote }}
+          {{- end }}
+        {{- end }}
+      {{- end -}}
+      {{- with $rule.policy }}
+        policy: {{ . }}
+      {{- end -}}
+      {{- if $rule.networks }}
+        networks:
+        {{- if kindIs "string" $rule.networks }}
+          - {{ $rule.networks | squote }}
+        {{- else -}}
+          {{- range $rule.networks }}
+            - {{ . | squote }}
+          {{- end }}
+        {{- end }}
+      {{- end }}
+      {{- if $rule.subject }}
+        subject:
+        {{- if kindIs "string" $rule.subject }}
+          - {{ $rule.subject | squote }}
+        {{- else -}}
+          {{- range $rule.subject }}
+            - {{ . | squote }}
+          {{- end }}
+        {{- end }}
+      {{- end }}
+      {{- if $rule.resources }}
+        resources:
+        {{- if kindIs "string" $rule.resources }}
+          - {{ $rule.resources | squote }}
+        {{- else -}}
+          {{- range $rule.resources }}
+            - {{ . | squote }}
+          {{- end }}
+        {{- end }}
+      {{- end }}
+    {{- end }}
     {{- end }}
     ...
 {{- end -}}

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.2
+    version: 14.0.1
   - condition: redis.enabled
     name: redis
     repository: https://deps.truecharts.org
-    version: 6.0.58
+    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.42
+version: 8.0.0
 annotations:
   truecharts.org/catagories: |
     - network

charts/enterprise/blocky/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

charts/enterprise/blocky/docs/setup-guide.md

@@ -8,64 +8,67 @@ Blocky has multiple DNS entries configured by default these can be overridden to
 
 Blocky supports 3 methods for upstream DNS.
 
-UDP - Basic DNS  
-DoT - DNS over TLS  
-DoH - DNS over HTTPS  
+- UDP - Basic DNS
+- DoT - DNS over TLS
+- DoH - DNS over HTTPS
 
 While UDP provides no security for DNS both DoT and DoH will encrypt DNS request. DoH has the added benefit of privacy since DNS traffic will appear as HTTPS traffic.
 
 ### UDP DNS Setup
 
-Google DNS: `8.8.8.8` `8.8.4.4`  
-Cloudflare DNS: `1.1.1.1` `1.0.0.1`  
+- Google DNS: `8.8.8.8` `8.8.4.4`
+- Cloudflare DNS: `1.1.1.1` `1.0.0.1`
 
 ![blocky-udp-upstream-google](./img/blocky-udp-upstream-google.png)
 
 ### DoT DNS Setup
 
-Google DNS ([Bootstrap DNS Required](#bootstrap-dns)): `tcp-tls:dns.google:853`  
-Cloudflare DNS: `tcp-tls:1.1.1.1:853` `tcp-tls:1.0.0.1:853`  
+- Google DNS ([Bootstrap DNS Required](#bootstrap-dns)): `tcp-tls:dns.google:853`
+- Cloudflare DNS: `tcp-tls:1.1.1.1:853` `tcp-tls:1.0.0.1:853`
 
 ![blocky-dot-upstream-google](./img/blocky-dot-upstream-google.png)
 
 ### DoH Upstream
 
-Google DNS ([Bootstrap DNS Required](#bootstrap-dns)): `https://dns.google/dns-query`  
-Cloudflare DNS: `https://1.1.1.1/dns-query` `https://1.0.0.1/dns-query`  
+- Google DNS ([Bootstrap DNS Required](#bootstrap-dns)): `https://dns.google/dns-query`
+- Cloudflare DNS: `https://1.1.1.1/dns-query` `https://1.0.0.1/dns-query`
 
 ![blocky-doh-upstream-google](./img/blocky-doh-upstream-google.png)
 
 ## Bootstrap DNS
 
-For DNS providers that do not use an IP address for DoT or DoH a bootstrap DNS provider is needed to resolve the DoT or DoH address. This provider can be any UDP upstream DNS. In the below example I am using Google DNS.
+For DNS providers that do not use an IP address for DoT or DoH a bootstrap DNS provider
+ is needed to resolve the DoT or DoH address. This provider can be any UDP upstream DNS.
+ In the below example I am using Google DNS.
 
 ![blocky-bootstrap-google](./img/blocky-bootstrap-google.png)
 
 ## DNS Blacklists
 
-DNS Blacklists are used to prevent DNS resolution of advertisement, malware, trackers and adult sites domains. This is completed with public maintained blocklists. A good source for these is [firebog.net](https://firebog.net).
+DNS Blacklists are used to prevent DNS resolution of advertisement, malware, trackers
+and adult sites domains. This is completed with public maintained blocklists.
+A good source for these is [firebog.net](https://firebog.net).
 
 :::warning Warning
 
-While publicly maintained blocklists usually do a good job of allowing legitimate traffic they can sometimes be too broad and catch traffic that you wish to allow. You may need to disable certain blocklists if you find legitimate traffic being blocked.
+While publicly maintained blocklists usually do a good job of allowing legitimate traffic they
+can sometimes be too broad and catch traffic that you wish to allow. You may need to disable
+certain blocklists if you find legitimate traffic being blocked.
 
 :::
 
 1. Pick a Group Name for your blocklists.
-
 2. Add List entries for each blocklist by URL.
-
-![blocky-blacklist](./img/blocky-blacklist.png)
-
+  ![blocky-blacklist](./img/blocky-blacklist.png)
 3. Add a Clients Group Block and set Client Group Name to `default`
-
 4. Under Groups Entry enter the Group name you used above.
-
-![blocky-blacklist-group](./img/blocky-blacklist-group.png)
+  ![blocky-blacklist-group](./img/blocky-blacklist-group.png)
 
 ## k8s-Gateway Configuration
 
-k8s-Gateway will automatically provide split DNS for your local domain. This will allow you to resolve all ingress configured subdomains locally. All that is required for setup is to add your root domain in the Domain name block.
+k8s-Gateway will automatically provide split DNS for your local domain. This will allow
+you to resolve all ingress configured subdomains locally. All that is required for setup
+is to add your root domain in the Domain name block.
 
 ![blocky-k8s-gateway](./img/blocky-k8s-gateway.png)
 

charts/enterprise/blocky/values.yaml

@@ -325,7 +325,7 @@ metrics:
   main:
     # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
     # @default -- See values.yaml
-    enabled: true
+    enabled: false
     type: "servicemonitor"
     endpoints:
       - port: main

charts/enterprise/clusterissuer/Chart.yaml

@@ -10,7 +10,7 @@ keywords:
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.2
+    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.6
+version: 4.0.1
 annotations:
   truecharts.org/catagories: |
     - core

charts/enterprise/clusterissuer/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

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

@@ -4,26 +4,18 @@ 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).
+- 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
 
-Ensure you have traefik installed, required for Ingress.
+## Set Scale Nameservers
 
-Search for clusterissuer in the `Apps` menu | `Available Applications` tab and click **Install**.
+It is important to configure Scale with reliable nameserver to avoid issues handling DNS-01 challenges. Under Network -> Global Configuration-> Nameservers, we recommend setting 1.1.1.1/1.0.0.1 or 8.8.8.8/8.8.4.4.
 
-## Cloudflare DNS-Provider
+![clusterissuer scale nameservers](img/scale-network-nameserver.png)
 
-You can setup multiple domains with a single `clusterissuer` app, all you have to do is either add the global API key (**not recommended**) or `Add` multiple `ACME Issuer` entries for each domain and create an API token for each at [Cloudflare API Tokens](https://dash.cloudflare.com/profile/api-tokens).
 
-- Give the certificate a name (eg domain or "maincert", etc).
-- Select the correct provider, for example `Cloudflare`.
-- Set **Server** to **Letsencrypt-Production**.
-- Set Email to the account email.
-- Optionally set Cloudflare API key (**not recommended**)
-- Set the Cloudflare API Token to the one created earlier.
-
-![clusterissuer edit dialog](img/clusterissuer1.png)
-
-## clusterissuer App
+## Install clusterissuer App
 
 :::note
 
@@ -33,7 +25,47 @@ It is by design that the app does not run, there are no events, no logs and no s
 
 ![clusterissuer app card](img/clusterissuer2.png)
 
-## How to Add Ingress to Apps with clusterissuer
+## Configure ACME Issuer
+
+You can setup multiple domains and/or DNS providers with a single `clusterissuer` app.
+
+### Cloudflare DNS Provider
+
+#### Create a Cloudflare API token
+
+Login to Cloudflare dashboard and go to the [Cloudflare API Tokens](https://dash.cloudflare.com/profile/api-tokens) page. Select Edit Zone DNS template.
+
+![clusterissuer app card](img/cf-apitokens-template.png)
+
+The recommended  `API Token` permissions are below:
+![clusterissuer app card](img/cf-apitokens-perms.png)
+
+#### Cloudflare ACME Issuer Settings
+
+- **Name**: Name of the issuer entry; such as "cert" or "cloudflareprod". This name will be used later in the app ingress configuration
+- **Type of DNS Provider**: `Cloudflare`
+- **Server**: `Letsencrypt-Production`
+- **Email**: The email address you register with Let's Encrypt for renewal/expiration notices
+- **Cloudflare API key**: Leave blank since API token will be used
+- **Cloudflare API Token**: Populate with token created from above.
+
+![clusterissuer edit dialog](img/clusterissuer-appconfig.png)
+
+More detail can be found on the upstream [Cert-Manager](https://cert-manager.io/) documentaition for [Cloudflare](https://cert-manager.io/docs/configuration/acme/dns01/cloudflare/).
+
+### Route 53 DNS Provider
+
+To be completed
+
+### Akamai DNS Provider
+
+To be completed
+
+### Digital Ocean DNS Provider
+
+To be completed
+
+## Configure Ingress using clusterissuer
 
 Here's an example on how to add ingress to an app with clusterissuer for a single domain only.
 
@@ -45,9 +77,9 @@ Do **NOT** use this combined with the `TLS-Settings`.
 
 :::
 
-![how to add ingress using clusterissuer ](img/clusterissuer3.png)
+![configure ingress using clusterissuer ](img/clusterissuer-ingressconfig.png)
 
-If you want to support multiple domains, use the `TLS-Settings` option to create each one, basically an extra step each time.
+If you want to support multiple domains on a single app, under `Show Advanced Settings` checkbox, use the `TLS-Settings` option to create each one with the Add button.
 
 ## Verifying clusterissuer is working
 
@@ -56,4 +88,4 @@ Once installed using the Ingress settings above, you can see the `Application Ev
 ![clusterissuer4](img/clusterissuer4.png)
 ![clusterissuer5](img/clusterissuer5.png)
 
-All is automated by `clusterissuer`
+Renewals are handled automatically by `clusterissuer`.

charts/enterprise/clusterissuer/questions.yaml

@@ -52,7 +52,6 @@ questions:
                       description: "Server for ACME, for example: letsencrypt"
                       schema:
                         type: string
-                        show_if: [["type", "!=", "HTTP01"]]
                         default: 'Letsencrypt-Production'
                         enum:
                           - value: 'https://acme-v02.api.letsencrypt.org/directory'
@@ -78,7 +77,6 @@ questions:
                       schema:
                         type: string
                         required: true
-                        show_if: [["type", "!=", "HTTP01"]]
                         default: "something@example.com"
                     - variable: cfapikey
                       label: CloudFlare API key

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:9dd0f68d32ace452a3a75273bd8e3a074d0a14e4d38683389c73887432832fc3
+  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.3"
+appVersion: "10.0.3"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.14.2
+    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.50
+version: 9.0.4
 annotations:
   truecharts.org/catagories: |
     - metrics

charts/enterprise/grafana/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

charts/enterprise/grafana/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/grafana
   pullPolicy: IfNotPresent
-  tag: v9.5.3@sha256:3f22fc64031f0a9e432ef397f8dd94173fd09c96777c5ba54fbe15ddce19e318
+  tag: v10.0.3@sha256:2e59eea99682231d1766062f50b8e4da0b04f2620126befc836e7297de863af6
 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.2
+    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.8
+version: 3.0.0
 annotations:
   truecharts.org/catagories: |
     - core

charts/enterprise/metallb-config/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

charts/enterprise/metallb-config/docs/setup-guide.md

@@ -20,7 +20,10 @@ With MetalLB installed, apps will not be reachable using the integrated loadbala
 
 Install `metallb` from `operators` train first. There is no config, so just hit save.
 
-If you previously had `metallb` installed and are attempting to upgrade, follow the steps specified below in [Migrating an existing MetalLB config to operator-based version](#migrating-an-existing-metallb-config-to-operator-version)
+If you encounter an error upon install, run the following command as root from system settings -> shell and attempt the install again:
+```k3s kubectl delete  --grace-period 30 --v=4 -k https://github.com/truecharts/manifests/delete```
+
+If you previously had `metallb` installed and encounter an error, delete the old version, then run the above command before proceeding to install the `metallb` operator.
 
 ## 2. Set Address Pool & L2 Advertisement in MetalLB-Config
 
@@ -87,9 +90,3 @@ Known Issue: On the SCALE Installed Applications page, the **Open** buttons on e
 :::
 
 For details on other configuration options, please reference the [MetaLB documentation](https://metallb.universe.tf/configuration/)
-
-## Migrating an existing MetalLB config to operator version
-
-- remove the old `metallb` chart coming from the `enterprise` train
-- run this in a **root** shell: `k3s kubectl delete  --grace-period 30 --v=4 -k https://github.com/truecharts/manifests/delete`
-- Proceed with Steps 1 & 2 in the setup guide above

charts/enterprise/metallb-config/values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: tccr.io/truecharts/scratch
-  tag: latest@sha256:9dd0f68d32ace452a3a75273bd8e3a074d0a14e4d38683389c73887432832fc3
+  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.2
+    version: 14.0.1
   - condition: exporters.enabled,exporters.node-exporter.enabled
     name: node-exporter
     repository: https://deps.truecharts.org
-    version: 1.0.22
+    version: 2.0.7
   - condition: exporters.enabled,exporters.kube-state-metrics.enabled
     name: kube-state-metrics
     repository: https://deps.truecharts.org
-    version: 1.0.20
+    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.21
+version: 12.1.0
 annotations:
   truecharts.org/catagories: |
     - metrics

charts/enterprise/prometheus/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

charts/enterprise/prometheus/questions.yaml

@@ -80,6 +80,44 @@ questions:
                 schema:
                   type: boolean
                   default: false
+              - variable: remoteWrite
+                label: "Remote Write"
+                schema:
+                  type: list
+                  default: []
+                  items:
+                    - variable: remoteWriteEntry
+                      label: Remote Write Entry
+                      schema:
+                        additional_attrs: true
+                        type: dict
+                        attrs:
+                          - variable: url
+                            label: URL
+                            description: Remote write destination URL
+                            schema:
+                              type: string
+                              required: true
+                              default: ""
+                          - variable: basicAuth
+                            label: Basic Auth
+                            type: dict
+                            description: Basic authentication for remote write
+                            attrs:
+                              - variable: username
+                                label: Username
+                                description: Basic auth username
+                                schema:
+                                  type: string
+                                  required: true
+                                  default: ""
+                              - variable: password
+                                label: Password
+                                description: Basic auth password
+                                schema:
+                                  type: string
+                                  required: false
+                                  default: ""
 
   - variable: exporters
     group: "App Configuration"

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:e35ebfcbc50d3655030eb4162ab1a33438a5d2dbadac2dcb4bcc0d794a8dadf7
+  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.2
+    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.15
+version: 21.0.0
 annotations:
   truecharts.org/catagories: |
     - network

charts/enterprise/traefik/README.md

@@ -12,7 +12,7 @@ For more information about this App, please check the docs on the TrueCharts [we
 
 ## Support
 
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)

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/docs/how-to.md

@@ -1,7 +1,3 @@
----
-sidebar_position: 1
----
-
 # Installing Traefik
 
 Within TrueCharts, our aim is to make it as easy as possible to secure your Apps.

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"
@@ -293,6 +298,7 @@ questions:
                           - variable: tls
                             label: "websecure Entrypoints Configuration"
                             schema:
+                              additional_attrs: true
                               type: dict
                               hidden: true
                               attrs:

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

@@ -1,13 +1,15 @@
 {{/* Define the portalHook */}}
 {{- define "traefik.portalhook" -}}
-{{- if .Values.portalhook.enabled }}
+{{- if .Values.portalhook.enabled -}}
+  {{- $name := "portalhook" -}}
+  {{- if $.Values.ingressClass.enabled -}}
+    {{- $name = printf "portalhook-%v" .Release.Name -}}
+  {{- end }}
 ---
-
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ ternary "portalhook" (printf "portalhook-%v" .Release.Name ) $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: {{ $name }}
 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 -}}