feat: add pod options GUI items for TrueNAS SCALE

.all-contributorsrc

@@ -1060,8 +1060,7 @@
       "profile": "https://github.com/ZasX",
       "contributions": [
         "doc",
-        "mentoring",
-        "code"
+        "mentoring"
       ]
     },
     {
@@ -1781,15 +1780,6 @@
         "code",
         "bug"
       ]
-    },
-    {
-      "login": "marcofaggian",
-      "name": "Marco Faggian",
-      "avatar_url": "https://avatars.githubusercontent.com/u/19221001?v=4",
-      "profile": "https://marcofaggian.com",
-      "contributions": [
-        "code"
-      ]
     }
   ],
   "contributorsPerLine": 7,

.github/CODEOWNERS

@@ -5,5 +5,5 @@
 /charts/dependency/     @truecharts/enterprise-maintainers @ornias1993
 /charts/enterprise/     @truecharts/enterprise-maintainers @ornias1993
 /charts/dev/            @ornias1993
-/.github/               @truecharts/ci-maintainers @ornias1993
+/.github/               @truecharts/ci-maintainers @ornias1993 
 docs/                   @truecharts/docs-maintainers @ornias1993

.github/README.md

@@ -277,7 +277,7 @@ 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/uranderu"><img src="https://avatars.githubusercontent.com/u/71091366?v=4?s=100" width="100px;" alt="uranderu"/><br /><sub><b>uranderu</b></sub></a><br /><a href="https://github.com/truecharts/charts/issues?q=author%3Auranderu" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/heytcass"><img src="https://avatars.githubusercontent.com/u/11260288?v=4?s=100" width="100px;" alt="Tom Cassady"/><br /><sub><b>Tom Cassady</b></sub></a><br /><a href="https://github.com/truecharts/charts/issues?q=author%3Aheytcass" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Huftierchen"><img src="https://avatars.githubusercontent.com/u/16015778?v=4?s=100" width="100px;" alt="Huftierchen"/><br /><sub><b>Huftierchen</b></sub></a><br /><a href="https://github.com/truecharts/charts/issues?q=author%3AHuftierchen" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZasX"><img src="https://avatars.githubusercontent.com/u/806452?v=4?s=100" width="100px;" alt="ZasX"/><br /><sub><b>ZasX</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=ZasX" title="Documentation">📖</a> <a href="#mentoring-ZasX" title="Mentoring">🧑‍🏫</a> <a href="https://github.com/truecharts/charts/commits?author=ZasX" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZasX"><img src="https://avatars.githubusercontent.com/u/806452?v=4?s=100" width="100px;" alt="ZasX"/><br /><sub><b>ZasX</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=ZasX" title="Documentation">📖</a> <a href="#mentoring-ZasX" title="Mentoring">🧑‍🏫</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/aeolus811tw"><img src="https://avatars.githubusercontent.com/u/4956319?v=4?s=100" width="100px;" alt="Kevin T."/><br /><sub><b>Kevin T.</b></sub></a><br /><a href="https://github.com/truecharts/charts/issues?q=author%3Aaeolus811tw" title="Bug reports">🐛</a></td>
     </tr>
     <tr>
@@ -377,11 +377,11 @@ 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/schopenhauer"><img src="https://avatars.githubusercontent.com/u/2085103?v=4?s=100" width="100px;" alt="schopenhauer"/><br /><sub><b>schopenhauer</b></sub></a><br /><a href="https://github.com/truecharts/charts/issues?q=author%3Aschopenhauer" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Zackptg5"><img src="https://avatars.githubusercontent.com/u/5107713?v=4?s=100" width="100px;" alt="Zackptg5"/><br /><sub><b>Zackptg5</b></sub></a><br /><a href="https://github.com/truecharts/charts/issues?q=author%3AZackptg5" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://bradackerman.com/"><img src="https://avatars.githubusercontent.com/u/115895?v=4?s=100" width="100px;" alt="Brad Ackerman"/><br /><sub><b>Brad Ackerman</b></sub></a><br /><a href="https://github.com/truecharts/charts/issues?q=author%3Abackerman" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://hachyderm.io/@mcspiff"><img src="https://avatars.githubusercontent.com/u/7252551?v=4?s=100" width="100px;" alt="mcspiff313"/><br /><sub><b>mcspiff313</b></sub></a><br /><a href="https://github.com/truecharts/charts/issues?q=author%3Amcspiff313" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/snazy2000"><img src="https://avatars.githubusercontent.com/u/1378836?v=4?s=100" width="100px;" alt="Stephen"/><br /><sub><b>Stephen</b></sub></a><br /><a href="https://github.com/truecharts/charts/issues?q=author%3Asnazy2000" title="Bug reports">🐛</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://hachyderm.io/@mcspiff"><img src="https://avatars.githubusercontent.com/u/7252551?v=4?s=100" width="100px;" alt="mcspiff313"/><br /><sub><b>mcspiff313</b></sub></a><br /><a href="https://github.com/truecharts/charts/issues?q=author%3Amcspiff313" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://fnichol.com"><img src="https://avatars.githubusercontent.com/u/261548?v=4?s=100" width="100px;" alt="Fletcher Nichol"/><br /><sub><b>Fletcher Nichol</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=fnichol" title="Code">💻</a> <a href="https://github.com/truecharts/charts/issues?q=author%3Afnichol" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://marcofaggian.com"><img src="https://avatars.githubusercontent.com/u/19221001?v=4?s=100" width="100px;" alt="Marco Faggian"/><br /><sub><b>Marco Faggian</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=marcofaggian" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

.github/SUPPORT.md

@@ -1,7 +1,3 @@
----
-sidebar_position: 3
----
-
 # Support Policy
 
 ## TrueCharts on TrueNAS SCALE
@@ -15,11 +11,9 @@ We also document which versions of TrueNAS will receive TrueCharts updates and f
 ### Supported Versions
 
 | TrueNAS version  | Branch   | Supported with updates | Accepting Support tickets | Accepting Bug Reports | Notes                                                                                                          |
-| ---------------- | -------- | ---------------------- | ------------------------- | --------------------- | -------------------------------------------------------------------------------------------------------------- |
-| 22.02.4 or prior | `master` | :x:                    | :x:                       | :x:                   | Advised to update to 22.12.2 release of [TrueNAS SCALE](https://www.truenas.com/docs/scale/scalereleasenotes/) |
-| 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.02.4 or prior | `master` | :x:     | :x:                       | :x:                   | Advised to update to 22.12.1 release of [TrueNAS SCALE](https://www.truenas.com/docs/scale/scalereleasenotes/) |     |
+| 22.12.1          | `master` | :white_check_mark:     | :white_check_mark:        | :white_check_mark:    | Most Stable Release as of 2023-02-21                                                                           |
 | Nightly          | `master` | :white_check_mark:     | :x:                       | :white_check_mark:    | Please only submit bug reports during codefreeze                                                               |
 
 :::warning Support Guidelines
@@ -38,7 +32,7 @@ please report them to our [github](https://github.com/truecharts/charts/issues/n
 ## Incubator Train Charts
 
 Our support policy for `incubator` train charts is different for those on the `stable` train. Those charts are work in progress,
-may break at anytime and we're still going through many of the charts from unRAID. We won't accept support tickets for `incubator` train
-charts on our [discord](https://discord.gg/tVsPTHWTtr). However, we have an **#incubator-chat** channel for these apps to help get them running and/or receive feedback.
-With enough positive feedback a chart can be promoted to `stable` train. Feedback about bugs is also accepted there which can be used to fix them.
+may break at anytime and we're still going through many of the charts from unRAID. We won't accept support tickets on our discord for `incubator` train
+charts on our [discord](https://discord.gg/tVsPTHWTtr). However we have an **#incubator-chat** channel for these apps to help get them running and/or receive feedback.
+With enough posivite feedback a chart can be promoted to `stable` train. Feedback about bugs is also accepted there which can be used to fix them.
 Assume anything in the `incubator` train is in beta and you're testing it. As well, anything installed in `incubator` will have to be REINSTALLED once it moves to the `stable` train.

.github/actions/label-from-status/action.yaml

@@ -0,0 +1,48 @@
+name: "Set issue labels based on status"
+description: "Sets / removes issue labels based on CI job status"
+inputs:
+  token:
+    required: true
+    description: "The Github API token to use"
+  issue-number:
+    required: true
+    description: "The issue to label"
+  prefix:
+    required: true
+    description: "The label prefix (e.g. lint, install)"
+  job-status:
+    required: true
+    description: "The status of the CI job"
+  remove-on-skipped:
+    required: false
+    default: false
+    description: "Remove the label if the job was skipped"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Label success
+      uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # tag=1.0.4
+      if: ${{ inputs.job-status == 'success' }}
+      with:
+        repo-token: ${{ inputs.token }}
+        issue-number: ${{ inputs.issue-number }}
+        add-labels: "${{ inputs.prefix }}:ok"
+        remove-labels: "${{ inputs.prefix }}:failed"
+
+    - name: Label failure
+      uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # tag=1.0.4
+      if: ${{ inputs.job-status == 'failure' }}
+      with:
+        repo-token: ${{ inputs.token }}
+        issue-number: ${{ inputs.issue-number }}
+        add-labels: "${{ inputs.prefix }}:failed"
+        remove-labels: "${{ inputs.prefix }}:ok"
+
+    - name: Remove label
+      uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # tag=1.0.4
+      if: ${{ (inputs.job-status == 'skipped') && (inputs.remove-on-skipped == 'true') }}
+      with:
+        repo-token: ${{ inputs.token }}
+        issue-number: ${{ inputs.issue-number }}
+        remove-labels: "${{ inputs.prefix }}:ok, ${{ inputs.prefix }}:failed"

.github/cr.yaml

@@ -0,0 +1,7 @@
+owner: truecharts
+git-repo: charts
+repo: charts
+charts-dir: charts/*
+charts_repo_url: "https://charts.truecharts.org"
+SkipExisting: true
+skipExisting: true

.github/ct-install.yaml

@@ -1,13 +1,16 @@
 remote: origin
 target-branch: master
-helm-extra-args: --timeout 180s
+helm-extra-args: --timeout 300s
 chart-yaml-schema: .github/chart_schema.yaml
 chart-dirs:
   - charts/incubator
   - charts/stable
   - charts/dependency
+  - charts/core
   - charts/dev
+  - charts/games
   - charts/enterprise
+  - charts/SCALE
 excluded-charts:
   - charts/dependency/subchart
   - charts/incubator/frigate
@@ -32,7 +35,6 @@ excluded-charts:
   - charts/stable/promcord
   - charts/stable/rdesktop
   - charts/stable/reg
-  - charts/incubator/romm
   - charts/stable/ser2sock
   - charts/stable/storj-node
   - charts/stable/tailscale
@@ -42,4 +44,6 @@ excluded-charts:
 chart-repos:
   - truecharts=https://charts.truecharts.org
   - truecharts-library=https://library-charts.truecharts.org
-  - truecharts-deps=https://deps.truecharts.org
+  - bitnami=https://charts.bitnami.com/bitnami
+  - grafana=https://grafana.github.io/helm-charts
+  - prometheus=https://prometheus-community.github.io/helm-charts

.github/ct-lint.yaml

@@ -1,15 +1,20 @@
 remote: origin
 target-branch: master
 chart-yaml-schema: .github/chart_schema.yaml
-helm-extra-args: --timeout 120s
+helm-extra-args: --timeout 600s
 chart-dirs:
   - charts/incubator
   - charts/stable
   - charts/dependency
+  - charts/core
   - charts/dev
+  - charts/games
   - charts/enterprise
+  - charts/SCALE
 excluded-charts: []
 chart-repos:
   - truecharts=https://charts.truecharts.org
   - truecharts-library=https://library-charts.truecharts.org
-  - truecharts-deps=https://deps.truecharts.org
+  - bitnami=https://charts.bitnami.com/bitnami
+  - grafana=https://grafana.github.io/helm-charts
+  - prometheus=https://prometheus-community.github.io/helm-charts

.github/renovate.json5

@@ -8,10 +8,10 @@
   "commitMessageExtra": "to {{newVersion}}",
   "commitMessageSuffix": "",
   "rebaseWhen": "conflicted",
-  "prConcurrentLimit": 150,
+  "prConcurrentLimit": 50,
   "timezone":"Europe/Amsterdam",
   "pinDigests": true,
-  "automerge": false,
+  "automerge": true,
   "gitAuthor": "TrueCharts-Admin <bot@truecharts.org>",
   "helm-values": {
     "fileMatch": ["charts/.+/.*values\\.yaml$", "charts/.+/SCALE/.*_values\\.yaml$"]
@@ -32,7 +32,7 @@
       "matchManagers": ["helm-values"],
       "enabled": true,
       "pinDigests": true,
-      "automerge": false,
+      "automerge": true,
       "commitMessageTopic": "container image {{depName}}",
       "commitMessageExtra": "to {{#if isSingleVersion}}v{{{newVersion}}}{{else}}{{{newValue}}}{{/if}}",
       "matchUpdateTypes": ["major", "minor", "patch", "digest"],
@@ -41,7 +41,7 @@
       "datasources": ["docker"],
       "enabled": true,
       "pinDigests": true,
-      "automerge": false,
+      "automerge": true,
       "separateMinorPatch": true,
       "commitMessageTopic": "container image {{depName}}",
       "commitMessageExtra": "to {{#if isSingleVersion}}v{{{newVersion}}}{{else}}{{{newValue}}}{{/if}}",
@@ -50,7 +50,7 @@
     {
       "matchManagers": ["github-actions"],
       "excludePackageNames": ["stefanzweifel/git-auto-commit-action"],
-      "automerge": true,
+      "automerge": false,
     },
     //
     // helm deps
@@ -66,13 +66,13 @@
     },
     {
       "matchDatasources": ["helm"],
-      "automerge": false,
+      "automerge": true,
       "matchUpdateTypes": [
         "minor",
         "patch"
       ],
       "bumpVersion": "patch",
-      "labels": ["update/helm/dependency/non-major", "automerge"],
+      "labels": ["update/helm/dependency/non-major"],
       "matchPaths": ["charts/dependency/**"],
       "groupName": "helm dependency non-major",
     },
@@ -93,14 +93,14 @@
     },
     {
       "matchDatasources": ["helm"],
-      "automerge": false,
+      "automerge": true,
       "matchUpdateTypes": [
         "minor",
         "patch"
       ],
       "enabled": true,
       "bumpVersion": "patch",
-      "labels": ["update/helm/general/non-major", "automerge"],
+      "labels": ["update/helm/general/non-major"],
       "groupName": "helm general non-major",
       "matchPaths": ["charts/enterprise/**"],
       "schedule": [
@@ -124,14 +124,14 @@
     },
     {
       "matchDatasources": ["helm"],
-      "automerge": false,
+      "automerge": true,
       "enabled": true,
       "matchUpdateTypes": [
         "minor",
         "patch"
       ],
       "bumpVersion": "patch",
-      "labels": ["update/helm/general/non-major", "automerge"],
+      "labels": ["update/helm/general/non-major"],
       "groupName": "helm general non-major",
       "matchPaths": ["charts/incubator/**", "charts/SCALE/**", "charts/dev/**", "charts/stable/**", "templates/app/**"],
       "schedule": [
@@ -151,7 +151,7 @@
     },
     {
       "matchDatasources": ["docker"],
-      "automerge": false,
+      "automerge": true,
       "matchUpdateTypes": [
         "minor",
       ],
@@ -162,7 +162,7 @@
     },
     {
       "matchDatasources": ["docker"],
-      "automerge": false,
+      "automerge": true,
       "matchUpdateTypes": [
         "patch",
         "digest",
@@ -170,48 +170,23 @@
       ],
       "bumpVersion": "patch",
       "enabled": true,
-      "labels": ["update/docker/enterprise/patch", "automerge"],
+      "labels": ["update/docker/enterprise/patch"],
       "matchPaths": ["charts/enterprise/**"],
     },
     //
-    // Tag updates for semantic tags on incubator and dev charts
+    // Tag updates for semantic tags on all but enterprise Apps
     //
     {
       "matchDatasources": ["docker"],
       "updateTypes": ["major"],
       "bumpVersion": "minor",
       "enabled": false,
-      "labels": ["update/docker/incubator/major", "automerge"],
-      "matchPaths": ["charts/incubator/**", "charts/dev/**"],
-    },
-    {
-      "matchDatasources": ["docker"],
-      "automerge": false,
-      "matchUpdateTypes": [
-        "minor",
-        "patch",
-        "digest",
-        "pin",
-      ],
-      "bumpVersion": "patch",
-      "enabled": false,
-      "labels": ["update/docker/incubator/non-major", "automerge"],
-      "matchPaths": ["charts/incubator/**", "charts/dev/**"],
-    },
-    //
-    // Tag updates for semantic tags on all but enterprise and incubator Apps
-    //
-    {
-      "matchDatasources": ["docker"],
-      "updateTypes": ["major"],
-      "bumpVersion": "minor",
-      "enabled": true,
       "labels": ["update/docker/general/major", "automerge"],
-      "matchPaths": ["charts/dependency/**", "charts/SCALE/**", "charts/stable/**", "templates/app/**"],
+      "matchPaths": ["charts/dependency/**", "charts/SCALE/**", "charts/incubator/**", "charts/dev/**", "charts/stable/**", "templates/app/**"],
     },
     {
       "matchDatasources": ["docker"],
-      "automerge": false,
+      "automerge": true,
       "matchUpdateTypes": [
         "minor",
         "patch",
@@ -219,9 +194,9 @@
         "pin",
       ],
       "bumpVersion": "patch",
-      "enabled": true,
+      "enabled": false,
       "labels": ["update/docker/general/non-major", "automerge"],
-      "matchPaths": ["charts/dependency/**", "charts/SCALE/**", "charts/library/**", "charts/stable/**", "templates/app/**"],
+      "matchPaths": ["charts/dependency/**", "charts/SCALE/**",  "charts/incubator/**", "charts/dev/**", "charts/library/**", "charts/stable/**", "templates/app/**"],
     },
     //
     // Tag semantic version type based on regex

.github/scripts/fetch_helm_deps.sh

@@ -19,20 +19,8 @@ trains=(
     "stable"
     "incubator"
     "dependency"
-    "operators"
 )
 
-load_gpg_key() {
-echo ""
-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."
-echo "✅ Public Key loaded successfully..."
-echo ""
-}
-export -f load_gpg_key
-
 download_deps() {
 local train_chart="$1"
 
@@ -97,38 +85,17 @@ for idx in $(eval echo "{0..$length}"); do
             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"
-
             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
-              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
-              fi
+                helm dependency build "$charts_path/$train_chart/Chart.yaml" || helm dependency update "$charts_path/$train_chart/Chart.yaml" || exit 1
             fi
 
             if [ -f "$cache_path/$repo_dir/$name-$version.tgz" ]; then
                 echo "✅ Dependency Downloaded!"
-                if [[ ! "$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
-                else
-                  echo "Skipping dependency signature verification for $train_chart..."
-                fi
             else
                 echo "❌ Failed to download dependency"
                 # Try helm dependency build/update or otherwise fail fast if a dep fails to download...
-              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
-              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
-              fi
+                helm dependency build "$charts_path/$train_chart/Chart.yaml" || helm dependency update "$charts_path/$train_chart/Chart.yaml" || exit 1
             fi
         fi
         echo ""
@@ -143,16 +110,13 @@ for idx in $(eval echo "{0..$length}"); do
         else
             echo "❌ Failed to copy dependency"
             # Try helm dependency build/update or otherwise fail fast if a dep fails to copy...
-            helm dependency build "$charts_path/$train_chart/Chart.yaml" || \
-            helm dependency update "$charts_path/$train_chart/Chart.yaml" || exit 1
+            helm dependency build "$charts_path/$train_chart/Chart.yaml" || helm dependency update "$charts_path/$train_chart/Chart.yaml" || exit 1
         fi
     fi
 done
 }
 export -f download_deps
 
-load_gpg_key
-
 if [ -z "$1" ]; then
   for train in "${trains[@]}"; do
       for chart in $(ls "$charts_path/$train"); do

.github/scripts/tc-lint.sh

@@ -1,182 +0,0 @@
-#!/bin/bash
-
-function check_version() {
-    chart_path=${1:?"No chart path provided to [Version Check]"}
-    target_branch=${2:?"No target branch provided to [Version Check]"}
-
-    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')
-
-    if [[ -z "$new" ]]; then
-        echo -e "\t❌ Chart version: Not changed"
-        curr_result=1
-    fi
-
-    echo -e "\t🔙 Old Chart Version: $old"
-    echo -e "\t🆕 New Chart Version: $new"
-
-    if [[ $(echo "$new\n$old" | sort -V -r | head -n1) != "$old" ]]; then
-        echo -e "\t✅ Chart version: Bumped"
-    else
-        echo -e "\t❌ Chart version: Not bumped or downgraded"
-        curr_result=1
-    fi
-}
-export -f check_version
-
-function check_chart_schema(){
-    chart_path=${1:?"No chart path provided to [Chart.yaml lint]"}
-
-    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"
-    done <<< "$yamale_output"
-
-    if [ $yamale_exit_code -ne 0 ]; then
-        echo -e "\t❌ Chart Schema: Failed"
-        curr_result=1
-    else
-        echo -e "\t✅ Chart Schema: Passed"
-    fi
-}
-export -f check_chart_schema
-
-function helm_lint(){
-    chart_path=${1:?"No chart path provided to [Helm lint]"}
-
-    # Print only errors and warnings
-    helm_lint_output=$(helm lint --quiet "$chart_path")
-    helm_lint_exit_code=$?
-    while IFS= read -r line; do
-        echo -e "\t$line"
-    done <<< "$helm_lint_output"
-
-    if [ $helm_lint_exit_code -ne 0 ]; then
-        echo -e "\t❌ Helm Lint: Failed"
-        curr_result=1
-    else
-        echo -e "\t✅ Helm Lint: Passed"
-    fi
-}
-export -f helm_lint
-
-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"
-    done <<< "$yaml_lint_output"
-
-    if [ $yaml_lint_exit_code -ne 0 ]; then
-        echo -e "\t❌ YAML Lint: Failed [$file_path]"
-        curr_result=1
-    else
-        echo -e "\t✅ YAML Lint: Passed [$file_path]"
-    fi
-}
-export -f yaml_lint
-
-function lint_chart(){
-    chart_path=${1:?"No chart path provided to [Lint Chart]"}
-    target_branch=${2:?"No target branch provided to [Lint Chart]"}
-    status_file=${3:?"No status file provided to [Lint Chart]"}
-
-    curr_result_file=/tmp/$(basename "$chart_path")
-    curr_result=0
-    {
-        start_time=$(date +%s)
-        echo '---------------------------------------------------------------------------------------'
-        echo "## 🔍Linting [$chart_path]"
-        echo '----------------------------------------------'
-        echo ''
-        echo "👣 Helm Lint - [$chart_path]"
-        helm_lint "$chart_path"
-
-        echo "👣 Chart Version - [$chart_path] against [$target_branch]"
-        check_version "$chart_path" "$target_branch"
-
-        echo "👣 Chart Schema - [$chart_path]"
-        check_chart_schema "$chart_path"
-
-        echo "👣 YAML Lint - [$chart_path/Chart.yaml]"
-        yaml_lint "$chart_path/Chart.yaml"
-
-        echo "👣 YAML Lint - [$chart_path/values.yaml]"
-        yaml_lint "$chart_path/values.yaml"
-
-        for values in $chart_path/ci/*values.yaml; do
-            if [ -f "${values}" ]; then
-                echo "👣 YAML Lint - [$values]"
-                yaml_lint "$values"
-            fi
-        done
-
-        end_time=$(date +%s)
-        diff_time=$((end_time - start_time))
-
-        echo -e "\nResult:"
-        if [ $curr_result -ne 0 ]; then
-            echo "❌ Linting [$chart_path]: Failed - Took $diff_time seconds" | tee -a "$result_file"
-        else
-            echo "✅ Linting [$chart_path]: Passed - Took $diff_time seconds" | tee -a "$result_file"
-        fi
-        echo '---------------------------------------------------------------------------------------'
-        echo ''
-    } > "$curr_result_file"
-    cat "$curr_result_file"
-    echo $curr_result >> "$status_file"
-}
-export -f lint_chart
-
-# Start of script
-
-charts=$1
-target_branch=${2:-"origin/master"}
-status_file="/tmp/status"
-exit_code=0
-
-result_file=${result_file:?"No result file provided"}
-
-changed=$(echo $charts | jq --raw-output '.[]')
-
-echo "📂 Charts to lint:"
-for chart in $changed; do
-    echo -e "\t- 📄 $chart"
-done
-echo ''
-
-start_time=$(date +%s)
-# Run lint_chart in parallel
-parallel --jobs $(($(nproc) * 2)) "lint_chart {} $target_branch $status_file" ::: $changed || true
-if grep -q 1 "$status_file"; then
-    exit_code=1
-fi
-end_time=$(date +%s)
-diff_time=$((end_time - start_time))
-
-echo '------------------------------------'
-
-# Print summary
-sorted=$(cat "$result_file" | sort)
-sorted=$(echo "$sorted" | sed 's/✅/:heavy_check_mark:/g')
-sorted=$(echo "$sorted" | sed 's/❌/:heavy_multiplication_x:/g')
-echo "# 📝 Linting results:" | tee "$result_file"
-echo '====================================================================================='
-echo "$sorted" | tee -a "$result_file"
-echo ''
-echo -e "Total Charts Linted: **$(echo "$sorted" | wc -l)**" | tee -a "$result_file"
-echo -e "Total Charts Passed: **$(echo "$sorted" | grep -c 'heavy_check_mark')**" | tee -a "$result_file"
-echo -e "Total Charts Failed: **$(echo "$sorted" | grep -c 'heavy_multiplication_x')**" | tee -a "$result_file"
-echo '====================================================================================='
-echo '' | tee -a "$result_file"
-
-if [ $exit_code -ne 0 ]; then
-    echo "❌ Linting: **Failed** - Took $diff_time seconds" | tee -a "$result_file"
-else
-    echo "✅ Linting: **Passed** - Took $diff_time seconds" | tee -a "$result_file"
-fi
-
-exit $exit_code

.github/workflows/catalog-test.yaml

@@ -15,7 +15,7 @@ jobs:
     name: Test SCALE Catalog
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/truecharts/devcontainer:3.1.10@sha256:c239addf725eb5cedf79517f8089fdafdc32b5270d1893ee87ae6e511b9bcae3
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:44047909bbf54cb1ce3551ae0b342244a5bdcd62562a7f2f07caad4bf8856ee4
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
         name: Checkout

.github/workflows/charts-changelog.yaml

@@ -0,0 +1,89 @@
+name: "Charts: Update README"
+
+on:
+  workflow_dispatch:
+    inputs:
+      modifiedCharts:
+        required: true
+        type: string
+      isRenovatePR:
+        required: true
+        type: string
+    outputs:
+      commitHash:
+        description: "The most recent commit hash at the end of this workflow"
+        value: ${{ jobs.generate-changelog.outputs.commitHash }}
+
+jobs:
+  validate-changelog:
+    name: Validate changelog
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+        with:
+          fetch-depth: 0
+
+      - name: Check changelog annotations
+        if: inputs.isRenovatePR != 'true'
+        run: |
+          CHARTS=(${{ inputs.modifiedCharts }})
+          for i in "${CHARTS[@]}"
+          do
+              IFS='/' read -r -a chart_parts <<< "$i"
+              ./.github/scripts/check-releasenotes.sh "charts/${chart_parts[0]}/${chart_parts[1]}"
+              echo ""
+          done
+
+  generate-changelog:
+    name: Generate changelog annotations
+    runs-on: ubuntu-latest
+    needs:
+      - validate-changelog
+    outputs:
+      commitHash: ${{ steps.save-commit-hash.outputs.commit_hash }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+        with:
+          fetch-depth: 0
+
+      - name: Install Kubernetes tools
+        if: inputs.isRenovatePR == 'true'
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
+        with:
+          setup-tools: |
+            yq
+          yq: "4.20.1"
+
+      - name: Annotate Charts.yaml for Renovate PR's
+        if: inputs.isRenovatePR == 'true'
+        env:
+          DEFAULT_BRANCH: "${{ github.event.repository.default_branch }}"
+        run: |
+          CHARTS=(${{ inputs.modifiedCharts }})
+          for i in "${CHARTS[@]}"
+          do
+              IFS='/' read -r -a chart_parts <<< "$i"
+                ./.github/scripts/renovate-releasenotes.sh "charts/${chart_parts[0]}/${chart_parts[1]}"
+              echo ""
+          done
+
+      - name: Create commit
+        id: create-commit
+        if: inputs.isRenovatePR == 'true'
+        uses: stefanzweifel/git-auto-commit-action@3ea6ae190baf489ba007f7c92608f33ce20ef04a # v4
+        with:
+          file_pattern: charts/**/
+          commit_message: "chore: Auto-update chart metadata [skip ci]"
+          commit_user_name: ${{ github.actor }}
+          commit_user_email: ${{ github.actor }}@users.noreply.github.com
+
+      - name: Save commit hash
+        id: save-commit-hash
+        run: |
+          if [ "${{ steps.create-commit.outputs.changes_detected || 'unknown' }}" == "true" ]; then
+            echo '::set-output name=commit_hash::${{ steps.create-commit.outputs.commit_hash }}'
+          else
+            echo "::set-output name=commit_hash::${GITHUB_SHA}"
+          fi

.github/workflows/charts-lint.yaml

@@ -9,16 +9,42 @@ on:
       chartChangesDetected:
         required: true
         type: string
-      modifiedFiles:
-        required: true
-        type: string
 
 jobs:
-  lint-and-verify:
-    name: Lint Charts and Verify Dependencies
+  generate-lint-matrix:
+    name: Generate matrix for lint
     runs-on: ubuntu-latest
-    container:
-      image: tccr.io/truecharts/devcontainer:v3.1.38@sha256:2fd9355bc6791461430db87a04f5fe7b49c46bc5957bc348f1efbff4c6c7913d
+    outputs:
+      matrix1: |
+        {
+          "chart": ${{ steps.list-changed.outputs.charts1 }}
+        }
+      matrix2: |
+        {
+          "chart": ${{ steps.list-changed.outputs.charts2 }}
+        }
+      matrix3: |
+        {
+          "chart": ${{ steps.list-changed.outputs.charts3 }}
+        }
+      matrix4: |
+        {
+          "chart": ${{ steps.list-changed.outputs.charts4 }}
+        }
+      matrix5: |
+        {
+          "chart": ${{ steps.list-changed.outputs.charts5 }}
+        }
+      matrix6: |
+        {
+          "chart": ${{ steps.list-changed.outputs.charts6 }}
+        }
+      detected1: ${{ steps.list-changed.outputs.detected1 }}
+      detected2: ${{ steps.list-changed.outputs.detected2 }}
+      detected3: ${{ steps.list-changed.outputs.detected3 }}
+      detected4: ${{ steps.list-changed.outputs.detected4 }}
+      detected5: ${{ steps.list-changed.outputs.detected5 }}
+      detected6: ${{ steps.list-changed.outputs.detected6 }}
     steps:
       - name: Checkout
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
@@ -26,80 +52,316 @@ jobs:
           fetch-depth: 0
           ref: ${{ inputs.checkoutCommit }}
 
-      - name: Setting repo parent dir as safe safe.directory
-        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
 
-      - 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 truecharts-deps https://deps.truecharts.org
-          helm repo update
-
-      - name: Collect changes (branch-based)
+      - name: Collect changes
         id: list-changed
         if: inputs.chartChangesDetected == 'true'
         shell: bash
         run: |
+          EXCLUDED=$(yq eval -o=json '.excluded-charts // []' .github/ct-lint.yaml)
           CHARTS=$(ct list-changed --config .github/ct-lint.yaml)
-          EXCLUDED_JSON=$(go-yq eval -o=json '.excluded-charts // []' .github/ct-lint.yaml)
-          CHARTS_JSON=$(echo "${CHARTS}" | jq --raw-input '.' | jq --compact-output --slurp '.')
-          OUTPUT_JSON=$(echo "{\"excluded\": ${EXCLUDED_JSON}, \"all\": ${CHARTS_JSON}}" | jq --compact-output '.all-.excluded')
-
-          echo CHANGED_CHARTS=${OUTPUT_JSON} >> "$GITHUB_OUTPUT"
-          if [[ $(echo ${OUTPUT_JSON} | jq --compact-output '. | length') -gt 0 ]]; then
-            echo "detected=true" >> "$GITHUB_OUTPUT"
+          CHARTS_JSON=$(echo "${CHARTS}" | jq -R -s -c 'split("\n")[:-1]')
+          OUTPUT_JSON=$(echo "{\"excluded\": ${EXCLUDED}, \"all\": ${CHARTS_JSON}}" | jq -c '.all-.excluded')
+          OUTPUT_JSON1=$((echo $OUTPUT_JSON | jq -r -c '.[:50]'; echo $OUTPUT_JSON | jq -r -c '.[301:350]'; echo $OUTPUT_JSON | jq -r -c '.[601:650]'; echo $OUTPUT_JSON | jq -r -c '.[901:950]'; echo $OUTPUT_JSON | jq -r -c '.[1201:1250]') | jq -s add)
+          OUTPUT_JSON2=$((echo $OUTPUT_JSON | jq -r -c '.[51:100]'; echo $OUTPUT_JSON | jq -r -c '.[351:400]'; echo $OUTPUT_JSON | jq -r -c '.[651:700]'; echo $OUTPUT_JSON | jq -r -c '.[951:1000]'; echo $OUTPUT_JSON | jq -r -c '.[1251:1300]') | jq -s add)
+          OUTPUT_JSON3=$((echo $OUTPUT_JSON | jq -r -c '.[101:150]'; echo $OUTPUT_JSON | jq -r -c '.[401:450]'; echo $OUTPUT_JSON | jq -r -c '.[701:750]'; echo $OUTPUT_JSON | jq -r -c '.[1001:1050]'; echo $OUTPUT_JSON | jq -r -c '.[1301:1350]') | jq -s add)
+          OUTPUT_JSON4=$((echo $OUTPUT_JSON | jq -r -c '.[151:200]'; echo $OUTPUT_JSON | jq -r -c '.[451:500]'; echo $OUTPUT_JSON | jq -r -c '.[751:800]'; echo $OUTPUT_JSON | jq -r -c '.[1051:1100]'; echo $OUTPUT_JSON | jq -r -c '.[1351:1400]') | jq -s add)
+          OUTPUT_JSON5=$((echo $OUTPUT_JSON | jq -r -c '.[201:250]'; echo $OUTPUT_JSON | jq -r -c '.[501:550]'; echo $OUTPUT_JSON | jq -r -c '.[801:850]'; echo $OUTPUT_JSON | jq -r -c '.[1101:1150]'; echo $OUTPUT_JSON | jq -r -c '.[1401:1450]') | jq -s add)
+          OUTPUT_JSON6=$((echo $OUTPUT_JSON | jq -r -c '.[251:300]'; echo $OUTPUT_JSON | jq -r -c '.[551:600]'; echo $OUTPUT_JSON | jq -r -c '.[851:900]'; echo $OUTPUT_JSON | jq -r -c '.[1151:1200]'; echo $OUTPUT_JSON | jq -r -c '.[1451:1500]') | jq -s add)
+          echo ::set-output name=charts1::${OUTPUT_JSON1}
+          echo ::set-output name=charts2::${OUTPUT_JSON2}
+          echo ::set-output name=charts3::${OUTPUT_JSON3}
+          echo ::set-output name=charts4::${OUTPUT_JSON4}
+          echo ::set-output name=charts5::${OUTPUT_JSON5}
+          echo ::set-output name=charts6::${OUTPUT_JSON6}
+          if [[ $(echo ${OUTPUT_JSON1} | jq -c '. | length') -gt 0 ]]; then
+            echo "::set-output name=detected1::true"
+          fi
+          if [[ $(echo ${OUTPUT_JSON2} | jq -c '. | length') -gt 0 ]]; then
+            echo "::set-output name=detected2::true"
+          fi
+          if [[ $(echo ${OUTPUT_JSON3} | jq -c '. | length') -gt 0 ]]; then
+            echo "::set-output name=detected3::true"
+          fi
+          if [[ $(echo ${OUTPUT_JSON4} | jq -c '. | length') -gt 0 ]]; then
+            echo "::set-output name=detected4::true"
+          fi
+          if [[ $(echo ${OUTPUT_JSON5} | jq -c '. | length') -gt 0 ]]; then
+            echo "::set-output name=detected5::true"
+          fi
+          if [[ $(echo ${OUTPUT_JSON6} | jq -c '. | length') -gt 0 ]]; then
+            echo "::set-output name=detected6::true"
           fi
 
-      - name: Test and Fix Pre-Commit Issues
-        shell: bash
-        if: inputs.chartChangesDetected == 'true'
-        run: |
-          echo "Running pre-commit test-and-cleanup..."
-          pre-commit run --all ||:
-          # Fix sh files to always be executable
-          find . -name '*.sh' | xargs chmod +x
-          pre-commit run --all
-
-      - name: Fetch and Verify dependencies
-        shell: bash
-        if: steps.list-changed.outputs.detected == 'true'
-        env:
-          charts_path: "./"
-        run: |
-          CHANGED=$(echo '${{ steps.list-changed.outputs.CHANGED_CHARTS }}' | jq --raw-output '.[]')
-          for changed in ${CHANGED}; do
-            .github/scripts/fetch_helm_deps.sh "${changed}"
-          done
-
-      - name: Run Chart Linting
-        continue-on-error: true
-        id: lint
-        if: steps.list-changed.outputs.detected == 'true'
-        env:
-          result_file: /tmp/lint_result.txt
-        run: |
-          CHANGED=$(echo '${{ steps.list-changed.outputs.CHANGED_CHARTS }}' | jq --raw-output '.[]')
-          # If the github.base_ref is empty (eg it runs outside of a PR) it fails back to origin/master
-          .github/scripts/tc-lint.sh '${{ steps.list-changed.outputs.CHANGED_CHARTS }}' "origin/${{ github.base_ref }}"
-
-      - name: Create/Update comment
-        if: steps.list-changed.outputs.detected == 'true'
-        continue-on-error: true
-        uses: thollander/actions-comment-pull-request@632cf9ce90574d125be56b5f3405cda41a84e2fd # v2
+  lint-charts1:
+    needs:
+      - generate-lint-matrix
+    if: needs.generate-lint-matrix.outputs.detected1 == 'true'
+    name: Lint charts Part 1
+    strategy:
+      matrix: ${{ fromJson(needs.generate-lint-matrix.outputs.matrix1) }}
+      fail-fast: false
+      max-parallel: 10
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
         with:
-          filePath: /tmp/lint_result.txt
-          comment_tag: lint_results
-          mode: recreate
-          GITHUB_TOKEN: ${{ github.token }}
+          fetch-depth: 0
+          ref: ${{ inputs.checkoutCommit }}
 
-      - name: Lint Result
-        if: steps.list-changed.outputs.detected == 'true'
-        shell: bash
+      - name: lint Kubernetes tools
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
+        with:
+          setup-tools: |
+            helmv3
+          helm: "3.8.0"
+
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
+        with:
+          python-version: "3.10"
+
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
+
+      - name: Run chart-testing (lint)
+        run: ct lint --config ".github/ct-lint.yaml" --charts "${{ matrix.chart }}" || ct lint --config ".github/ct-lint.yaml" --charts "${{ matrix.chart }}"
+
+  lint-charts2:
+    needs:
+      - generate-lint-matrix
+    if: needs.generate-lint-matrix.outputs.detected2 == 'true'
+    name: Lint charts Part 2
+    strategy:
+      matrix: ${{ fromJson(needs.generate-lint-matrix.outputs.matrix2) }}
+      fail-fast: false
+      max-parallel: 10
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.checkoutCommit }}
+
+      - name: lint Kubernetes tools
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
+        with:
+          setup-tools: |
+            helmv3
+          helm: "3.8.0"
+
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
+        with:
+          python-version: "3.10"
+
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
+
+      - name: Run chart-testing (lint)
+        run: ct lint --config ".github/ct-lint.yaml" --charts "${{ matrix.chart }}" || ct lint --config ".github/ct-lint.yaml" --charts "${{ matrix.chart }}"
+
+  lint-charts3:
+    needs:
+      - generate-lint-matrix
+    if: needs.generate-lint-matrix.outputs.detected3 == 'true'
+    name: Lint charts Part 3
+    strategy:
+      matrix: ${{ fromJson(needs.generate-lint-matrix.outputs.matrix3) }}
+      fail-fast: false
+      max-parallel: 10
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.checkoutCommit }}
+
+      - name: lint Kubernetes tools
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
+        with:
+          setup-tools: |
+            helmv3
+          helm: "3.8.0"
+
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
+        with:
+          python-version: "3.10"
+
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
+
+      - name: Run chart-testing (lint)
+        run: ct lint --config ".github/ct-lint.yaml" --charts "${{ matrix.chart }}" || ct lint --config ".github/ct-lint.yaml" --charts "${{ matrix.chart }}"
+
+  lint-charts4:
+    needs:
+      - generate-lint-matrix
+    if: needs.generate-lint-matrix.outputs.detected4 == 'true'
+    name: Lint charts Part 4
+    strategy:
+      matrix: ${{ fromJson(needs.generate-lint-matrix.outputs.matrix4) }}
+      fail-fast: false
+      max-parallel: 10
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.checkoutCommit }}
+
+      - name: lint Kubernetes tools
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
+        with:
+          setup-tools: |
+            helmv3
+          helm: "3.8.0"
+
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
+        with:
+          python-version: "3.10"
+
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
+
+      - name: Run chart-testing (lint)
+        run: ct lint --config ".github/ct-lint.yaml" --charts "${{ matrix.chart }}" || ct lint --config ".github/ct-lint.yaml" --charts "${{ matrix.chart }}"
+
+  lint-charts5:
+    needs:
+      - generate-lint-matrix
+    if: needs.generate-lint-matrix.outputs.detected5 == 'true'
+    name: Lint charts Part 5
+    strategy:
+      matrix: ${{ fromJson(needs.generate-lint-matrix.outputs.matrix5) }}
+      fail-fast: false
+      max-parallel: 10
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.checkoutCommit }}
+
+      - name: lint Kubernetes tools
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
+        with:
+          setup-tools: |
+            helmv3
+          helm: "3.8.0"
+
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
+        with:
+          python-version: "3.10"
+
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
+
+      - name: Run chart-testing (lint)
+        run: ct lint --config ".github/ct-lint.yaml" --charts "${{ matrix.chart }}" || ct lint --config ".github/ct-lint.yaml" --charts "${{ matrix.chart }}"
+
+  lint-charts6:
+    needs:
+      - generate-lint-matrix
+    if: needs.generate-lint-matrix.outputs.detected6 == 'true'
+    name: Lint charts Part 6
+    strategy:
+      matrix: ${{ fromJson(needs.generate-lint-matrix.outputs.matrix6) }}
+      fail-fast: false
+      max-parallel: 10
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.checkoutCommit }}
+
+      - name: lint Kubernetes tools
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
+        with:
+          setup-tools: |
+            helmv3
+          helm: "3.8.0"
+
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
+        with:
+          python-version: "3.10"
+
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
+
+      - name: Run chart-testing (lint)
+        run: ct lint --config ".github/ct-lint.yaml" --charts "${{ matrix.chart }}" || ct lint --config ".github/ct-lint.yaml" --charts "${{ matrix.chart }}"
+
+  # Summarize matrix https://github.community/t/status-check-for-a-matrix-jobs/127354/7
+  lint_success:
+    needs:
+      - generate-lint-matrix
+      - lint-charts1
+      - lint-charts2
+      - lint-charts3
+      - lint-charts4
+      - lint-charts5
+      - lint-charts6
+    if: |
+      always()
+    name: Lint successful
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check lint matrix status
         run: |
-          if [ "${{ steps.lint.outcome }}" != "success" ]; then
-            echo "Linting failed"
+          res1="${{needs.lint-charts1.result}}"
+          res2="${{needs.lint-charts2.result}}"
+          res3="${{needs.lint-charts3.result}}"
+          res4="${{needs.lint-charts4.result}}"
+          res5="${{needs.lint-charts5.result}}"
+          res6="${{needs.lint-charts6.result}}"
+
+          if [[ $res1 == "success" || $res1 == "skipped" ]]; then
+            echo "lint tests 1 successfull..."
+          else
+            echo "lint tests 1 error, stopping due to failure..."
+            exit 1
+          fi
+
+          if [[ $res2 == "success" || $res2 == "skipped" ]]; then
+            echo "lint tests 2 successfull..."
+          else
+            echo "lint tests 2 error, stopping due to failure..."
+            exit 1
+          fi
+
+          if [[ $res3 == "success" || $res3 == "skipped" ]]; then
+            echo "lint tests 3 successfull..."
+          else
+            echo "lint tests 3 error, stopping due to failure..."
+            exit 1
+          fi
+
+          if [[ $res4 == "success" || $res4 == "skipped" ]]; then
+            echo "lint tests 4 successfull..."
+          else
+            echo "lint tests 4 error, stopping due to failure..."
+            exit 1
+          fi
+
+          if [[ $res5 == "success" || $res5 == "skipped" ]]; then
+            echo "lint tests 5 successfull..."
+          else
+            echo "lint tests 5 error, stopping due to failure..."
+            exit 1
+          fi
+
+          if [[ $res6 == "success" || $res6 == "skipped" ]]; then
+            echo "lint tests 6 successfull..."
+          else
+            echo "lint tests 6 error, stopping due to failure..."
             exit 1
           fi
 

.github/workflows/charts-release.yaml

@@ -11,17 +11,18 @@ on:
       - "charts/**"
 
 jobs:
+
   release-helm:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/truecharts/devcontainer:3.1.10@sha256:c239addf725eb5cedf79517f8089fdafdc32b5270d1893ee87ae6e511b9bcae3
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:44047909bbf54cb1ce3551ae0b342244a5bdcd62562a7f2f07caad4bf8856ee4
     steps:
       - name: Checkout
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
         with:
           token: ${{ secrets.BOT_TOKEN }}
           fetch-depth: 1
-
+          
       - name: Checkout Helm-Staging
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
         with:
@@ -29,7 +30,7 @@ jobs:
           repository: truecharts/helm-staging
           token: ${{ secrets.BOT_TOKEN }}
           path: helm
-
+          
       - name: Fix Pre-Commit issues
         shell: bash
         run: |
@@ -37,7 +38,7 @@ jobs:
           pre-commit run --all ||:
           # Fix sh files to always be executable
           find . -name '*.sh' | xargs chmod +x
-
+          
       - name: Commit Helm Changes
         run: |
           rm -rf helm/charts
@@ -59,7 +60,7 @@ jobs:
     outputs:
       ref: ${{ steps.save-commit-hash.outputs.commit_hash }}
     container:
-      image: ghcr.io/truecharts/devcontainer:3.1.10@sha256:c239addf725eb5cedf79517f8089fdafdc32b5270d1893ee87ae6e511b9bcae3
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:44047909bbf54cb1ce3551ae0b342244a5bdcd62562a7f2f07caad4bf8856ee4
     steps:
       - name: Install Kubernetes tools
         uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
@@ -72,24 +73,10 @@ jobs:
         run: |
           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 update
+          helm repo add bitnami https://charts.bitnami.com/bitnami
 
-      # Optional step if GPG signing is used
-      - name: Prepare GPG key
-        shell: bash
-        run: |
-          gpg_dir=.cr-gpg
-          mkdir -p "$gpg_dir"
-          keyring="$gpg_dir/secring.gpg"
-          base64 -d <<< "$GPG_KEYRING_BASE64" > "$keyring"
-          passphrase_file="$gpg_dir/passphrase"
-          echo "$GPG_PASSPHRASE" > "$passphrase_file"
-          echo "CR_PASSPHRASE_FILE=$passphrase_file" >> "$GITHUB_ENV"
-          echo "CR_KEYRING=$keyring" >> "$GITHUB_ENV"
-        env:
-          GPG_KEYRING_BASE64: "${{ secrets.GPG_KEYRING_BASE64 }}"
-          GPG_PASSPHRASE: "${{ secrets.GPG_PASSPHRASE }}"
+          helm repo add prometheus https://prometheus-community.github.io/helm-charts
+          helm repo update
 
       - name: Checkout
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
@@ -236,6 +223,7 @@ jobs:
           git add --all
           git commit -sm "Commit released docs for TrueCharts" || exit 0
           git push
+        
 
       - name: Checkout Catalog
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
@@ -284,22 +272,6 @@ jobs:
           git config user.name "TrueCharts-Bot"
           git config user.email "bot@truecharts.org"
 
-        # Optional step if GPG signing is used
-      - name: Prepare GPG key
-        shell: bash
-        run: |
-          gpg_dir=.cr-gpg
-          mkdir -p "$gpg_dir"
-          keyring="$gpg_dir/secring.gpg"
-          base64 -d <<< "$GPG_KEYRING_BASE64" > "$keyring"
-          passphrase_file="$gpg_dir/passphrase"
-          echo "$GPG_PASSPHRASE" > "$passphrase_file"
-          echo "CR_PASSPHRASE_FILE=$passphrase_file" >> "$GITHUB_ENV"
-          echo "CR_KEYRING=$keyring" >> "$GITHUB_ENV"
-        env:
-          GPG_KEYRING_BASE64: "${{ secrets.GPG_KEYRING_BASE64 }}"
-          GPG_PASSPHRASE: "${{ secrets.GPG_PASSPHRASE }}"
-
       - name: Run chart-releaser for dependency apps
         uses: helm/chart-releaser-action@be16258da8010256c6e82849661221415f031968 # v1.5.0
         if: |
@@ -307,7 +279,6 @@ jobs:
         with:
           charts_dir: charts/dependency
           charts_repo_url: https://deps.truecharts.org
-          config: cr.yaml
         env:
           CR_TOKEN: "${{ secrets.BOT_TOKEN }}"
           CR_SKIP_EXISTING: "true"

.github/workflows/charts-test.yaml

@@ -87,7 +87,7 @@ jobs:
           ref: ${{ inputs.checkoutCommit }}
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76 # v2.4.0
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed
@@ -152,12 +152,12 @@ jobs:
             helmv3
           helm: "3.8.0"
 
-      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
         with:
           python-version: "3.10"
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76 # v2.4.0
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
 
       - name: Create k3d cluster
         uses: nolar/setup-k3d-k3s@v1
@@ -197,12 +197,12 @@ jobs:
             helmv3
           helm: "3.8.0"
 
-      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
         with:
           python-version: "3.10"
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76 # v2.4.0
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
 
       - name: Create k3d cluster
         uses: nolar/setup-k3d-k3s@v1
@@ -243,12 +243,12 @@ jobs:
             helmv3
           helm: "3.8.0"
 
-      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
         with:
           python-version: "3.10"
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76 # v2.4.0
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
 
       - name: Create k3d cluster
         uses: nolar/setup-k3d-k3s@v1
@@ -288,12 +288,12 @@ jobs:
             helmv3
           helm: "3.8.0"
 
-      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
         with:
           python-version: "3.10"
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76 # v2.4.0
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
 
       - name: Create k3d cluster
         uses: nolar/setup-k3d-k3s@v1
@@ -333,12 +333,12 @@ jobs:
             helmv3
           helm: "3.8.0"
 
-      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
         with:
           python-version: "3.10"
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76 # v2.4.0
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
 
       - name: Create k3d cluster
         uses: nolar/setup-k3d-k3s@v1
@@ -378,12 +378,12 @@ jobs:
             helmv3
           helm: "3.8.0"
 
-      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
         with:
           python-version: "3.10"
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76 # v2.4.0
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
 
       - name: Create k3d cluster
         uses: nolar/setup-k3d-k3s@v1

.github/workflows/daily.yaml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "Generate readme files"
     container:
-      image: ghcr.io/truecharts/devcontainer:3.1.10@sha256:c239addf725eb5cedf79517f8089fdafdc32b5270d1893ee87ae6e511b9bcae3
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:44047909bbf54cb1ce3551ae0b342244a5bdcd62562a7f2f07caad4bf8856ee4
     steps:
       - name: Checkout
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
@@ -31,7 +31,7 @@ jobs:
       - name: generate readme.md
         shell: bash
         run: |
-          for train in stable operators SCALE incubator games enterprise develop non-free deprecated dependency core; do
+          for train in stable SCALE incubator games enterprise develop non-free deprecated dependency core; do
             for chart in charts/${train}/*; do
               if [ -d "${chart}" ]; then
                 echo "Generating readme.md for ${train}/${chart}"
@@ -44,7 +44,7 @@ jobs:
       - name: generate HelmIgnore
         shell: bash
         run: |
-          for train in stable operators SCALE incubator games enterprise develop non-free deprecated dependency core; do
+          for train in stable SCALE incubator games enterprise develop non-free deprecated dependency core; do
             for chart in charts/${train}/*; do
               if [ -d "${chart}" ]; then
                 echo "Attempting to sync HelmIgnore file for: ${chartname}"
@@ -196,22 +196,13 @@ jobs:
           }
           export -f sync_tag
 
-          for train in enterprise stable operators incubator dependency; do
+          for train in enterprise stable incubator dependency; do
             echo "Correcting Chart.yaml for Train: ${train}..."
             for chart in $(ls "charts/${train}"); do
               echo "Correcting Chart.yaml for Chart: ${chart}..."
               sync_tag "charts/${train}/${chart}" "${chart}" "${train}"
             done
           done
-          
-      - name: Fix Fixable Pre-Commit issues
-        shell: bash
-        if: inputs.chartChangesDetected == 'true'
-        run: |
-          echo "Running pre-commit test-and-cleanup..."
-          pre-commit run --all ||:
-          # Fix sh files to always be executable
-          find . -name '*.sh' | xargs chmod +x
 
       - name: Cleanup
         run: |
@@ -231,7 +222,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "Generate Security Reports"
     container:
-      image: ghcr.io/truecharts/devcontainer:3.1.10@sha256:c239addf725eb5cedf79517f8089fdafdc32b5270d1893ee87ae6e511b9bcae3
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:44047909bbf54cb1ce3551ae0b342244a5bdcd62562a7f2f07caad4bf8856ee4
     steps:
       - name: Install Kubernetes tools
         uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
@@ -244,7 +235,8 @@ jobs:
         run: |
           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 bitnami https://charts.bitnami.com/bitnami
+          helm repo add prometheus https://prometheus-community.github.io/helm-charts
           helm repo update
 
       - name: Checkout
@@ -334,7 +326,7 @@ jobs:
               sed -i 's|<hr>|<hr />|g' website/docs/charts/${train}/${chartname}/helm-security.md ||:
               sed -i 's|<hr>|<hr />|g' website/docs/charts/${train}/${chartname}/container-security.md ||:
               }
-          for train in enterprise stable operators incubator dependency; do
+          for train in enterprise stable incubator dependency; do
             echo "Processing Charts for Train: ${train}..."
             for chart in $(ls "charts/${train}"); do
               render "charts/${train}/${chart}" ${chart} ${train} || echo "rendering failed for ${chart}"

.github/workflows/meta-label-pr-ci-status.yaml

@@ -0,0 +1,105 @@
+---
+name: "Metadata: Label pull requests CI status"
+
+on:
+  workflow_run:
+    workflows:
+      - "Pull Request: Validate"
+    types:
+      - completed
+
+jobs:
+  label-ci-status:
+    name: Label CI status
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+        with:
+          token: ${{ secrets.BOT_TOKEN }}
+
+      - name: Download workflow artifact
+        uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # v2.27.0
+        with:
+          github_token: ${{ secrets.BOT_TOKEN }}
+          workflow: pr-validate.yaml
+          run_id: ${{ github.event.workflow_run.id }}
+          name: pr_metadata
+          path: ./pr_metadata
+
+      - name: Read the pr_number file
+        id: pr_num_reader
+        uses: juliangruber/read-file-action@02bbba9876a8f870efd4ad64e3b9088d3fb94d4b # tag=v1.1.6
+        with:
+          path: ./pr_metadata/pr_number.txt
+
+      - name: "Get workflow job status"
+        uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6
+        id: get-workflow-jobs
+        with:
+          github-token: ${{ secrets.BOT_TOKEN }}
+          # https://mhagemann.medium.com/the-ultimate-way-to-slugify-a-url-string-in-javascript-b8e4a0d849e1
+          script: |
+            function slugify(string) {
+              const a = 'àáâäæãåāăąçćčđďèéêëēėęěğǵḧîïíīįìıİłḿñńǹňôöòóœøōõőṕŕřßśšşșťțûüùúūǘůűųẃẍÿýžźż·/_,:;'
+              const b = 'aaaaaaaaaacccddeeeeeeeegghiiiiiiiilmnnnnoooooooooprrsssssttuuuuuuuuuwxyyzzz------'
+              const p = new RegExp(a.split('').join('|'), 'g')
+              return string.toString().toLowerCase()
+                .replace(/\s+/g, '-') // Replace spaces with -
+                .replace(p, c => b.charAt(a.indexOf(c))) // Replace special characters
+                .replace(/&/g, '-and-') // Replace & with 'and'
+                .replace(/[^\w\-]+/g, '') // Remove all non-word characters
+                .replace(/\-\-+/g, '-') // Replace multiple - with single -
+                .replace(/^-+/, '') // Trim - from start of text
+                .replace(/-+$/, '') // Trim - from end of text
+            }
+            let result = new Object
+            const wfJobs = await github.rest.actions.listJobsForWorkflowRun({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: context.payload.workflow_run.id,
+            })
+            for (const job of wfJobs.data.jobs) {
+              result[slugify(job.name)] = job.conclusion
+            }
+            console.log(result)
+            return result
+      - name: Label pre-commit status
+        uses: ./.github/actions/label-from-status
+        with:
+          token: ${{ secrets.BOT_TOKEN }}
+          issue-number: ${{ steps.pr_num_reader.outputs.content }}
+          prefix: precommit
+          job-status: |-
+            ${{ fromJSON(steps.get-workflow-jobs.outputs.result).pre-commit-check-run-pre-commit-checks || 'skipped' }}
+          remove-on-skipped: true
+
+      #- name: Label changelog status
+      #  uses: ./.github/actions/label-from-status
+      #  with:
+      #    token: ${{ secrets.BOT_TOKEN }}
+      #    issue-number: ${{ steps.pr_num_reader.outputs.content }}
+      #    prefix: changelog
+      #    job-status: |-
+      #      ${{ fromJSON(steps.get-workflow-jobs.outputs.result).charts-changelog-validate-changelog || 'skipped' }}
+      #    remove-on-skipped: true
+
+      - name: Label chart lint status
+        uses: ./.github/actions/label-from-status
+        with:
+          token: ${{ secrets.BOT_TOKEN }}
+          issue-number: ${{ steps.pr_num_reader.outputs.content }}
+          prefix: lint
+          job-status: |-
+            ${{ fromJSON(steps.get-workflow-jobs.outputs.result).charts-lint-lint-successful || 'skipped' }}
+          remove-on-skipped: true
+
+      - name: Label chart install status
+        uses: ./.github/actions/label-from-status
+        with:
+          token: ${{ secrets.BOT_TOKEN }}
+          issue-number: ${{ steps.pr_num_reader.outputs.content }}
+          prefix: install
+          job-status: |-
+            ${{ fromJSON(steps.get-workflow-jobs.outputs.result).charts-test-install-successful || 'skipped' }}
+          remove-on-skipped: true

.github/workflows/metadata-label-commenter.yaml

@@ -0,0 +1,32 @@
+---
+name: "Metadata: Label Commenter"
+
+on:
+  workflow_dispatch:
+  issues:
+    types:
+      - labeled
+      - unlabeled
+  pull_request_target:
+    types:
+      - labeled
+      - unlabeled
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  comment:
+    name: Label commenter
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+        with:
+          token: ${{ secrets.BOT_TOKEN }}
+          ref: master
+
+      - uses: peaceiris/actions-label-commenter@f0dbbef043eb1b150b566db36b0bdc8b7f505579 # tag=v1
+        with:
+          github_token: ${{ secrets.BOT_TOKEN }}

.github/workflows/metadata-label-pr.yaml

@@ -0,0 +1,33 @@
+---
+name: "Metadata: Label pull requests"
+
+on:
+  workflow_dispatch:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - closed
+      - reopened
+      - ready_for_review
+      - synchronize
+
+jobs:
+  label-size:
+    name: Label Size
+    runs-on: ubuntu-latest
+    steps:
+      - name: Label Size
+        uses: pascalgn/size-label-action@1619680c5ac1ef360b944bb56a57587ba4aa2af8 # tag=v0.4.3
+        env:
+          GITHUB_TOKEN: "${{ secrets.BOT_TOKEN }}"
+        with:
+          sizes: >
+            {
+              "0": "XS",
+              "20": "S",
+              "50": "M",
+              "200": "L",
+              "800": "XL",
+              "2000": "XXL"
+            }

.github/workflows/pr-metadata.yaml

@@ -0,0 +1,60 @@
+name: "Pull Request: Get metadata"
+
+on:
+  workflow_call:
+    outputs:
+      isRenovatePR:
+        description: "Is the PR coming from Renovate?"
+        value: ${{ jobs.pr-metadata.outputs.isRenovatePR }}
+      isFork:
+        description: "Is the PR coming from a forked repo?"
+        value: ${{ jobs.pr-metadata.outputs.isFork }}
+      addedOrModified:
+        description: "Does the PR contain any changes?"
+        value: ${{ jobs.pr-changes.outputs.addedOrModified }}
+      addedOrModifiedFiles:
+        description: "A list of the files changed in this PR"
+        value: ${{ jobs.pr-changes.outputs.addedOrModifiedFiles }}
+      addedOrModifiedCharts:
+        description: "A list of the charts changed in this PR"
+        value: ${{ jobs.pr-changes.outputs.addedOrModifiedCharts }}
+
+jobs:
+  pr-metadata:
+    name: Collect PR metadata
+    runs-on: ubuntu-latest
+    outputs:
+      isRenovatePR: ${{ startsWith(steps.branch-name.outputs.current_branch, 'renovate/') }}
+      isFork: ${{ github.event.pull_request.head.repo.full_name != github.repository }}
+    steps:
+      - name: Get branch name
+        id: branch-name
+        uses: tj-actions/branch-names@2e5354c6733793113f416314375826df030ada23 # v6.5
+
+      - name: Save PR data to file
+        env:
+          PR_NUMBER: ${{ github.event.number }}
+        run: |
+          echo $PR_NUMBER > pr_number.txt
+
+      - name: Store pr data in artifact
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
+        with:
+          name: pr_metadata
+          path: ./pr_number.txt
+          retention-days: 5
+
+  pr-changes:
+    name: Collect PR changes
+    runs-on: ubuntu-latest
+    outputs:
+      addedOrModified: ${{ steps.collect-changes.outputs.changesDetected }}
+      addedOrModifiedFiles: ${{ steps.collect-changes.outputs.addedOrModifiedFiles }}
+      addedOrModifiedCharts: ${{ steps.collect-changes.outputs.addedOrModifiedCharts }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+
+      - name: Collect changes
+        id: collect-changes
+        uses: ./.github/actions/collect-changes

.github/workflows/pr-validate.yaml

@@ -8,46 +8,52 @@ concurrency:
   # cancel-in-progress: true
 
 jobs:
-  pr-changes:
-    name: Collect PR changes
-    runs-on: ubuntu-latest
-    outputs:
-      addedOrModified: ${{ steps.collect-changes.outputs.changesDetected }}
-      addedOrModifiedFiles: ${{ steps.collect-changes.outputs.addedOrModifiedFiles }}
-      addedOrModifiedCharts: ${{ steps.collect-changes.outputs.addedOrModifiedCharts }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+  pr-metadata:
+    uses: ./.github/workflows/pr-metadata.yaml
 
-      - name: Collect changes
-        id: collect-changes
-        uses: ./.github/actions/collect-changes
+  pre-commit-check:
+    uses: truecharts/.github/.github/workflows/pre-commit-check.yaml@main
+    needs:
+      - pr-metadata
+    with:
+      modifiedFiles: ${{ needs.pr-metadata.outputs.addedOrModifiedFiles }}
+
+  #charts-changelog:
+  #  uses: ./.github/workflows/charts-changelog.yaml
+  #  needs:
+  #    - pr-metadata
+  #    - pre-commit-check
+  #  with:
+  #    isRenovatePR: ${{ needs.pr-metadata.outputs.isRenovatePR }}
+  #    modifiedCharts: ${{ needs.pr-metadata.outputs.addedOrModifiedCharts }}
 
   charts-lint:
     uses: ./.github/workflows/charts-lint.yaml
     needs:
-      - pr-changes
+      - pr-metadata
+    #  - charts-changelog
     with:
       checkoutCommit: ${{ needs.charts-changelog.outputs.commitHash }}
-      chartChangesDetected: ${{ needs.pr-changes.outputs.addedOrModified }}
-      modifiedFiles: ${{ needs.pr-metadata.outputs.addedOrModifiedFiles }}
+      chartChangesDetected: ${{ needs.pr-metadata.outputs.addedOrModified }}
 
   charts-test:
     uses: ./.github/workflows/charts-test.yaml
     needs:
-      - pr-changes
+      - pr-metadata
+      #  - charts-changelog
       - charts-lint
     with:
       checkoutCommit: ${{ needs.charts-changelog.outputs.commitHash }}
-      chartChangesDetected: ${{ needs.pr-changes.outputs.addedOrModified }}
+      chartChangesDetected: ${{ needs.pr-metadata.outputs.addedOrModified }}
 
   catalog-test:
     uses: ./.github/workflows/catalog-test.yaml
     needs:
-      - pr-changes
+      - pr-metadata
+    #  - charts-changelog
     with:
       checkoutCommit: ${{ needs.charts-changelog.outputs.commitHash }}
-      chartChangesDetected: ${{ needs.pr-changes.outputs.addedOrModified }}
+      chartChangesDetected: ${{ needs.pr-metadata.outputs.addedOrModified }}
 
   print_head_msg:
     name: print commit message
@@ -67,7 +73,7 @@ jobs:
 
   automerge-and-approve:
     needs:
-      - pr-changes
+      - pr-metadata
       - catalog-test
       - charts-test
       - charts-lint
@@ -85,4 +91,3 @@ jobs:
           GITHUB_TOKEN: "${{ secrets.BOT_TOKEN }}"
           UPDATE_RETRIES: 12
           UPDATE_RETRY_SLEEP: 60000
-          MERGE_METHOD: squash

.github/workflows/renovate-bump.yaml

@@ -12,7 +12,7 @@ jobs:
     name: Get changed Apps
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/truecharts/devcontainer:3.1.10@sha256:c239addf725eb5cedf79517f8089fdafdc32b5270d1893ee87ae6e511b9bcae3
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:44047909bbf54cb1ce3551ae0b342244a5bdcd62562a7f2f07caad4bf8856ee4
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
         name: Checkout

.github/workflows/renovate.yml

@@ -12,7 +12,7 @@ jobs:
         with:
           token: ${{ secrets.BOT_TOKEN }}
       - name: Self-hosted Renovate
-        uses: renovatebot/github-action@04894c0e6786581e789ebf7e6dbdf22dfc0061cd # v38.0.0
+        uses: renovatebot/github-action@95cbcd7e8b9d0d69e15ba26208631839ce7eee48 # v36.0.2
         with:
           configurationFile: .github/renovate-config.js
           token: ${{ secrets.BOT_TOKEN }}

.github/yaml-lint-conf.yaml

@@ -1,56 +0,0 @@
----
-rules:
-  anchors:
-    forbid-undeclared-aliases: true
-  braces:
-    forbid: non-empty
-    min-spaces-inside: 0
-    max-spaces-inside: 0
-    min-spaces-inside-empty: -1
-    max-spaces-inside-empty: -1
-  brackets:
-    forbid: false
-    min-spaces-inside: 0
-    max-spaces-inside: 0
-    min-spaces-inside-empty: -1
-    max-spaces-inside-empty: -1
-  colons:
-    max-spaces-before: 0
-    max-spaces-after: 1
-  commas:
-    max-spaces-before: 0
-    min-spaces-after: 1
-    max-spaces-after: 1
-  comments:
-    require-starting-space: true
-    min-spaces-from-content: 2
-  # No --- to start a file
-  document-start: disable
-  document-end: disable
-  empty-lines:
-    max: 1
-    max-start: 0
-    max-end: 0
-  float-values:
-    require-numeral-before-decimal: true
-    forbid-scientific-notation: true
-    forbid-nan: true
-    forbid-inf: true
-  hyphens:
-    max-spaces-after: 1
-  indentation:
-    spaces: 2
-    indent-sequences: true
-    check-multi-line-strings: false
-  key-duplicates: enable
-  # Lines can be any length
-  line-length: disable
-  new-line-at-end-of-file: enable
-  new-lines:
-    type: unix
-  octal-values:
-    forbid-implicit-octal: true
-    forbid-explicit-octal: true
-  trailing-spaces: enable
-  truthy:
-    allowed-values: ["true", "false"]

charts/dependency/clickhouse/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "23.4.2.11"
+appVersion: "23.2.1.253"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.10.2
+    version: 12.4.21
 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.29
+version: 5.0.12
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/clickhouse/questions.yaml

@@ -11,7 +11,6 @@ questions:
 # Include{containerAdvanced}
 
 # Include{containerConfig}
-# Include{podOptions}
   - variable: clickhouseDatabase
     group: "App Configuration"
     label: "Database Name"
@@ -70,6 +69,7 @@ questions:
                               default: 8123
                               required: true
 # Include{serviceExpertRoot}
+            default: false
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}

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: 23.2.1.2537@sha256:669278d98936a2d12bf8f331067afb6a34e5570fdcb37b854bb5d0b2d8f30108
 
 workload:
   main:

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

@@ -1,29 +0,0 @@
-apiVersion: v2
-appVersion: "2.8.2"
-dependencies:
-  - name: common
-    repository: https://library-charts.truecharts.org
-    version: 12.10.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
-icon: https://truecharts.org/img/hotlink-ok/chart-icons/kube-state-metrics.png
-keywords:
-  - prometheus
-  - kube-state-metrics
-  - monitoring
-kubeVersion: ">=1.16.0-0"
-maintainers:
-  - email: info@truecharts.org
-    name: TrueCharts
-    url: https://truecharts.org
-name: kube-state-metrics
-sources:
-  - https://github.com/truecharts/charts/tree/master/charts/dependency/kube-state-metrics
-type: application
-version: 1.0.7
-annotations:
-  truecharts.org/catagories: |
-    - metrics
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/grade: U

charts/dependency/kube-state-metrics/LICENSE

@@ -1,106 +0,0 @@
-Business Source License 1.1
-
-Parameters
-
-Licensor:             The TrueCharts Project, it's owner and it's contributors
-Licensed Work:        The TrueCharts "Grafana" Helm Chart
-Additional Use Grant: You may use the licensed work in production, as long
-                      as it is directly sourced from a TrueCharts provided
-                      official repository, catalog or source. You may also make private
-                      modification to the directly sourced licenced work,
-                      when used in production.
-
-                      The following cases are, due to their nature, also
-                      defined as 'production use' and explicitly prohibited:
-                      - Bundling, including or displaying the licensed work
-                      with(in) another work intended for production use,
-                      with the apparent intend of facilitating and/or
-                      promoting production use by third parties in
-                      violation of this license.
-
-Change Date:          2050-01-01
-
-Change License:       3-clause BSD license
-
-For information about alternative licensing arrangements for the Software,
-please contact: legal@truecharts.org
-
-Notice
-
-The Business Source License (this document, or the “License”) is not an Open
-Source license. However, the Licensed Work will eventually be made available
-under an Open Source License, as stated in this License.
-
-License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
-“Business Source License” is a trademark of MariaDB Corporation Ab.
-
------------------------------------------------------------------------------
-
-Business Source License 1.1
-
-Terms
-
-The Licensor hereby grants you the right to copy, modify, create derivative
-works, redistribute, and make non-production use of the Licensed Work. The
-Licensor may make an Additional Use Grant, above, permitting limited
-production use.
-
-Effective on the Change Date, or the fourth anniversary of the first publicly
-available distribution of a specific version of the Licensed Work under this
-License, whichever comes first, the Licensor hereby grants you rights under
-the terms of the Change License, and the rights granted in the paragraph
-above terminate.
-
-If your use of the Licensed Work does not comply with the requirements
-currently in effect as described in this License, you must purchase a
-commercial license from the Licensor, its affiliated entities, or authorized
-resellers, or you must refrain from using the Licensed Work.
-
-All copies of the original and modified Licensed Work, and derivative works
-of the Licensed Work, are subject to this License. This License applies
-separately for each version of the Licensed Work and the Change Date may vary
-for each version of the Licensed Work released by Licensor.
-
-You must conspicuously display this License on each original or modified copy
-of the Licensed Work. If you receive the Licensed Work in original or
-modified form from a third party, the terms and conditions set forth in this
-License apply to your use of that work.
-
-Any use of the Licensed Work in violation of this License will automatically
-terminate your rights under this License for the current and all other
-versions of the Licensed Work.
-
-This License does not grant you any right in any trademark or logo of
-Licensor or its affiliates (provided that you may use a trademark or logo of
-Licensor as expressly required by this License).
-
-TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
-AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
-EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
-TITLE.
-
-MariaDB hereby grants you permission to use this License’s text to license
-your works, and to refer to it using the trademark “Business Source License”,
-as long as you comply with the Covenants of Licensor below.
-
-Covenants of Licensor
-
-In consideration of the right to use this License’s text and the “Business
-Source License” name and trademark, Licensor covenants to MariaDB, and to all
-other recipients of the licensed work to be provided by Licensor:
-
-1. To specify as the Change License the GPL Version 2.0 or any later version,
-   or a license that is compatible with GPL Version 2.0 or a later version,
-   where “compatible” means that software provided under the Change License can
-   be included in a program with software provided under GPL Version 2.0 or a
-   later version. Licensor may specify additional Change Licenses without
-   limitation.
-
-2. To either: (a) specify an additional grant of rights to use that does not
-   impose any additional restriction on the right granted in this License, as
-   the Additional Use Grant; or (b) insert the text “None”.
-
-3. To specify a Change Date.
-
-4. Not to modify this License in any other way.

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

@@ -1,27 +0,0 @@
-# README
-
-## General Info
-
-TrueCharts can be installed as both *normal* Helm Charts or as Apps on TrueNAS SCALE.
-However only installations using the TrueNAS SCALE Apps system are supported.
-
-For more information about this App, please check the docs on the TrueCharts [website](https://truecharts.org/charts/dependency/)
-
-**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/truecharts/charts/issues/new/choose)**
-
-
-## Support
-
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
-- See the [Website](https://truecharts.org)
-- Check our [Discord](https://discord.gg/tVsPTHWTtr)
-- Open a [issue](https://github.com/truecharts/charts/issues/new/choose)
-
----
-
-## Sponsor TrueCharts
-
-TrueCharts can only exist due to the incredible effort of our staff.
-Please consider making a [donation](https://truecharts.org/sponsor) or contributing back to the project any way you can!
-
-*All Rights Reserved - The TrueCharts Project*

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

@@ -1,108 +0,0 @@
-# Include{groups}
-questions:
-# Include{global}
-# Include{workload}
-# Include{workloadDeployment}
-
-# Include{replicas1}
-# Include{podSpec}
-# Include{containerMain}
-# Include{containerBasic}
-# Include{containerAdvanced}
-
-
-# Include{containerConfig}
-# Include{podOptions}
-# Include{serviceRoot}
-        - variable: main
-          label: "Main Service"
-          description: "The Primary service on which the healthcheck runs, often the webUI"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-# Include{serviceSelectorClusterIP}
-# Include{serviceSelectorExtras}
-                    - variable: main
-                      label: "Main Service Port Configuration"
-                      schema:
-                        additional_attrs: true
-                        type: dict
-                        attrs:
-                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 8080
-                              required: true
-        - variable: selfmonitor
-          label: "selfmonitor Service"
-          description: "The Primary service on which the healthcheck runs, often the webUI"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-# Include{serviceSelectorClusterIP}
-# Include{serviceSelectorExtras}
-                    - variable: selfmonitor
-                      label: "selfmonitor Service Port Configuration"
-                      schema:
-                        additional_attrs: true
-                        type: dict
-                        attrs:
-                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 8081
-                              required: true
-# Include{serviceExpertRoot}
-# Include{serviceExpert}
-# Include{serviceList}
-# Include{persistenceList}
-# Include{ingressRoot}
-        - variable: main
-          label: "Main Ingress"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-# Include{ingressDefault}
-# Include{ingressTLS}
-# Include{ingressTraefik}
-# Include{ingressList}
-# Include{securityContextRoot}
-
-              - variable: runAsUser
-                label: "runAsUser"
-                description: "The UserID of the user running the application"
-                schema:
-                  type: int
-                  default: 568
-              - variable: runAsGroup
-                label: "runAsGroup"
-                description: "The groupID of the user running the application"
-                schema:
-                  type: int
-                  default: 568
-# Include{securityContextContainer}
-# Include{securityContextAdvanced}
-# Include{securityContextPod}
-              - variable: fsGroup
-                label: "fsGroup"
-                description: "The group that should own ALL storage."
-                schema:
-                  type: int
-                  default: 568
-
-# Include{resources}
-# Include{metrics}
-# Include{prometheusRule}
-# Include{advanced}
-# Include{addons}
-# Include{codeserver}
-# Include{netshoot}
-# Include{vpn}
-# Include{documentation}

charts/dependency/kube-state-metrics/templates/NOTES.txt

@@ -1 +0,0 @@
-{{- include "tc.v1.common.lib.chart.notes" $ -}}

charts/dependency/kube-state-metrics/templates/common.yaml

@@ -1 +0,0 @@
-{{ include "tc.v1.common.loader.all" . }}

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

@@ -1,313 +0,0 @@
-image:
-  repository: tccr.io/truecharts/kube-state-metrics
-  pullPolicy: IfNotPresent
-  tag: v2.8.2@sha256:35a4457d904190e4870a88d7955b26b6b2604a60ad82c108f9f672a3a6b09ab1
-
-service:
-  main:
-    ports:
-      main:
-        protocol: http
-        port: 8080
-  selfmonitor:
-    enabled: true
-    ports:
-      selfmonitor:
-        enabled: true
-        protocol: http
-        port: 8081
-
-workload:
-  main:
-    podSpec:
-      containers:
-        main:
-          args:
-            - --resources=certificatesigningrequests
-            - --resources=configmaps
-            - --resources=cronjobs
-            - --resources=daemonsets
-            - --resources=deployments
-            - --resources=endpoints
-            - --resources=horizontalpodautoscalers
-            - --resources=ingresses
-            - --resources=jobs
-            - --resources=limitranges
-            - --resources=mutatingwebhookconfigurations
-            - --resources=namespaces
-            - --resources=networkpolicies
-            - --resources=nodes
-            - --resources=persistentvolumeclaims
-            - --resources=persistentvolumes
-            - --resources=poddisruptionbudgets
-            - --resources=pods
-            - --resources=replicasets
-            - --resources=replicationcontrollers
-            - --resources=resourcequotas
-            - --resources=secrets
-            - --resources=services
-            - --resources=statefulsets
-            - --resources=storageclasses
-            - --resources=verticalpodautoscalers
-            - --resources=validatingwebhookconfigurations
-            - --resources=volumeattachments
-
-          probes:
-            liveness:
-              path: /healthz
-              port: main
-
-            readiness:
-              path: /healthz
-              port: main
-
-            startup:
-              type: tcp
-              port: main
-
-podOptions:
-  automountServiceAccountToken: true
-
-serviceAccount:
-  main:
-    enabled: true
-    primary: true
-
-rbac:
-  main:
-    enabled: true
-    primary: true
-    clusterWide: true
-    rules:
-      - apiGroups:
-          - certificates.k8s.io
-        resources:
-          - certificatesigningrequests
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - ""
-        resources:
-          - configmaps
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - batch
-        resources:
-          - cronjobs
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - extensions
-          - apps
-        resources:
-          - daemonsets
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - extensions
-          - apps
-        resources:
-          - deployments
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - ""
-        resources:
-          - endpoints
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - autoscaling
-        resources:
-          - horizontalpodautoscalers
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - extensions
-          - networking.k8s.io
-        resources:
-          - ingresses
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - batch
-        resources:
-          - jobs
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - ""
-        resources:
-          - limitranges
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - admissionregistration.k8s.io
-        resources:
-          - mutatingwebhookconfigurations
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - ""
-        resources:
-          - namespaces
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - networking.k8s.io
-        resources:
-          - networkpolicies
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - ""
-        resources:
-          - nodes
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - ""
-        resources:
-          - persistentvolumeclaims
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - ""
-        resources:
-          - persistentvolumes
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - policy
-        resources:
-          - poddisruptionbudgets
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - ""
-        resources:
-          - pods
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - extensions
-          - apps
-        resources:
-          - replicasets
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - ""
-        resources:
-          - replicationcontrollers
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - ""
-        resources:
-          - resourcequotas
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - ""
-        resources:
-          - secrets
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - ""
-        resources:
-          - services
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - apps
-        resources:
-          - statefulsets
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - storage.k8s.io
-        resources:
-          - storageclasses
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - autoscaling.k8s.io
-        resources:
-          - verticalpodautoscalers
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - admissionregistration.k8s.io
-        resources:
-          - validatingwebhookconfigurations
-        verbs:
-          - list
-          - watch
-      - apiGroups:
-          - storage.k8s.io
-        resources:
-          - volumeattachments
-        verbs:
-          - list
-          - watch
-
-metrics:
-  main:
-    # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
-    # @default -- See values.yaml
-    enabled: true
-    type: serviceMonitor
-    endpoints:
-      - port: main
-      - port: selfmonitor
-    # -- Enable and configure Prometheus Rules for the chart under this key.
-    # @default -- See values.yaml
-    prometheusRule:
-      enabled: false
-      labels: {}
-      # -- Configure additionial rules for the chart under this key.
-      # @default -- See prometheusrules.yaml
-      rules:
-        []
-        # - alert: UnifiPollerAbsent
-        #   annotations:
-        #     description: Unifi Poller has disappeared from Prometheus service discovery.
-        #     summary: Unifi Poller is down.
-        #   expr: |
-        #     absent(up{job=~".*unifi-poller.*"} == 1)
-        #   for: 5m
-        #   labels:
-        #     severity: critical
-
-portal:
-  open:
-    enabled: false

charts/dependency/mariadb/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "10.11.3"
+appVersion: "10.11.2"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.10.2
+    version: 12.4.21
 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.33
+version: 7.0.13
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/mariadb/questions.yaml

@@ -11,7 +11,6 @@ questions:
 # Include{containerAdvanced}
 
 # Include{containerConfig}
-# Include{podOptions}
   - variable: mariadbDatabase
     group: "App Configuration"
     label: "Database Name"
@@ -64,6 +63,7 @@ questions:
                               default: 3306
                               required: true
 # Include{serviceExpertRoot}
+            default: false
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}

charts/dependency/mariadb/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/mariadb
   pullPolicy: IfNotPresent
-  tag: v10.11.3@sha256:6644ba3144bf9956439b2c40ec6b645c16c9b83fdf1943a9b60a750f98ac7e3c
+  tag: 10.11.2@sha256:fc01102eef1de92155b5097636ef738700c8bef1735f52a397b1505cbf455c0f
 
 workload:
   main:

charts/dependency/memcached/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "1.6.20"
+appVersion: "1.6.18"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.10.2
+    version: 12.4.21
 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.44
+version: 6.0.23
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/memcached/questions.yaml

@@ -9,7 +9,6 @@ questions:
 # Include{containerBasic}
 # Include{containerAdvanced}
 # Include{containerConfig}
-# Include{podOptions}
 # Include{serviceRoot}
         - variable: main
           label: "Main Service"
@@ -34,6 +33,7 @@ questions:
                               default: 11211
                               required: true
 # Include{serviceExpertRoot}
+            default: false
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceList}

charts/dependency/memcached/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/memcached
   pullPolicy: IfNotPresent
-  tag: v1.6.20@sha256:424c5fc3f7f175d6fc3b61cead1698690eec6d9ba496a5f641fb23323373942a
+  tag: 1.6.18@sha256:49998f1e9bb4c1537c559c9e6a757c93a346d2ea6b03d03ecdca3bda3c8d4ab6
 
 service:
   main:

charts/dependency/mongodb/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "6.0.6"
+appVersion: "6.0.4"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.10.2
+    version: 12.4.21
 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.33
+version: 6.0.12
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/mongodb/questions.yaml

@@ -11,7 +11,6 @@ questions:
 # Include{containerAdvanced}
 
 # Include{containerConfig}
-# Include{podOptions}
   - variable: mongodbDatabase
     group: "App Configuration"
     label: "Database Name"
@@ -64,6 +63,7 @@ questions:
                               default: 27017
                               required: true
 # Include{serviceExpertRoot}
+            default: false
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}

charts/dependency/mongodb/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/mongodb
   pullPolicy: IfNotPresent
-  tag: v6.0.6@sha256:5fcbda39afd70ed0c4bb915c68ae9e827093877faa3833e632fbb739d6148030
+  tag: 6.0.4@sha256:3600c9f13d96311ddad4d2de6520d54c89a8708ee36798e4dc6fb93f59c1eab4
 
 workload:
   main:

charts/dependency/node-exporter/Chart.yaml

@@ -1,29 +0,0 @@
-apiVersion: v2
-appVersion: "1.5.0"
-dependencies:
-  - name: common
-    repository: https://library-charts.truecharts.org
-    version: 12.10.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
-icon: https://truecharts.org/img/hotlink-ok/chart-icons/node-exporter.png
-keywords:
-  - prometheus
-  - node-exporter
-  - monitoring
-kubeVersion: ">=1.16.0-0"
-maintainers:
-  - email: info@truecharts.org
-    name: TrueCharts
-    url: https://truecharts.org
-name: node-exporter
-sources:
-  - https://github.com/truecharts/charts/tree/master/charts/dependency/node-exporter
-type: application
-version: 1.0.6
-annotations:
-  truecharts.org/catagories: |
-    - metrics
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/grade: U

charts/dependency/node-exporter/LICENSE

@@ -1,106 +0,0 @@
-Business Source License 1.1
-
-Parameters
-
-Licensor:             The TrueCharts Project, it's owner and it's contributors
-Licensed Work:        The TrueCharts "Grafana" Helm Chart
-Additional Use Grant: You may use the licensed work in production, as long
-                      as it is directly sourced from a TrueCharts provided
-                      official repository, catalog or source. You may also make private
-                      modification to the directly sourced licenced work,
-                      when used in production.
-
-                      The following cases are, due to their nature, also
-                      defined as 'production use' and explicitly prohibited:
-                      - Bundling, including or displaying the licensed work
-                      with(in) another work intended for production use,
-                      with the apparent intend of facilitating and/or
-                      promoting production use by third parties in
-                      violation of this license.
-
-Change Date:          2050-01-01
-
-Change License:       3-clause BSD license
-
-For information about alternative licensing arrangements for the Software,
-please contact: legal@truecharts.org
-
-Notice
-
-The Business Source License (this document, or the “License”) is not an Open
-Source license. However, the Licensed Work will eventually be made available
-under an Open Source License, as stated in this License.
-
-License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
-“Business Source License” is a trademark of MariaDB Corporation Ab.
-
------------------------------------------------------------------------------
-
-Business Source License 1.1
-
-Terms
-
-The Licensor hereby grants you the right to copy, modify, create derivative
-works, redistribute, and make non-production use of the Licensed Work. The
-Licensor may make an Additional Use Grant, above, permitting limited
-production use.
-
-Effective on the Change Date, or the fourth anniversary of the first publicly
-available distribution of a specific version of the Licensed Work under this
-License, whichever comes first, the Licensor hereby grants you rights under
-the terms of the Change License, and the rights granted in the paragraph
-above terminate.
-
-If your use of the Licensed Work does not comply with the requirements
-currently in effect as described in this License, you must purchase a
-commercial license from the Licensor, its affiliated entities, or authorized
-resellers, or you must refrain from using the Licensed Work.
-
-All copies of the original and modified Licensed Work, and derivative works
-of the Licensed Work, are subject to this License. This License applies
-separately for each version of the Licensed Work and the Change Date may vary
-for each version of the Licensed Work released by Licensor.
-
-You must conspicuously display this License on each original or modified copy
-of the Licensed Work. If you receive the Licensed Work in original or
-modified form from a third party, the terms and conditions set forth in this
-License apply to your use of that work.
-
-Any use of the Licensed Work in violation of this License will automatically
-terminate your rights under this License for the current and all other
-versions of the Licensed Work.
-
-This License does not grant you any right in any trademark or logo of
-Licensor or its affiliates (provided that you may use a trademark or logo of
-Licensor as expressly required by this License).
-
-TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
-AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
-EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
-TITLE.
-
-MariaDB hereby grants you permission to use this License’s text to license
-your works, and to refer to it using the trademark “Business Source License”,
-as long as you comply with the Covenants of Licensor below.
-
-Covenants of Licensor
-
-In consideration of the right to use this License’s text and the “Business
-Source License” name and trademark, Licensor covenants to MariaDB, and to all
-other recipients of the licensed work to be provided by Licensor:
-
-1. To specify as the Change License the GPL Version 2.0 or any later version,
-   or a license that is compatible with GPL Version 2.0 or a later version,
-   where “compatible” means that software provided under the Change License can
-   be included in a program with software provided under GPL Version 2.0 or a
-   later version. Licensor may specify additional Change Licenses without
-   limitation.
-
-2. To either: (a) specify an additional grant of rights to use that does not
-   impose any additional restriction on the right granted in this License, as
-   the Additional Use Grant; or (b) insert the text “None”.
-
-3. To specify a Change Date.
-
-4. Not to modify this License in any other way.

charts/dependency/node-exporter/README.md

@@ -1,27 +0,0 @@
-# README
-
-## General Info
-
-TrueCharts can be installed as both *normal* Helm Charts or as Apps on TrueNAS SCALE.
-However only installations using the TrueNAS SCALE Apps system are supported.
-
-For more information about this App, please check the docs on the TrueCharts [website](https://truecharts.org/charts/dependency/)
-
-**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/truecharts/charts/issues/new/choose)**
-
-
-## Support
-
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE%20Apps/Important-MUST-READ).
-- See the [Website](https://truecharts.org)
-- Check our [Discord](https://discord.gg/tVsPTHWTtr)
-- Open a [issue](https://github.com/truecharts/charts/issues/new/choose)
-
----
-
-## Sponsor TrueCharts
-
-TrueCharts can only exist due to the incredible effort of our staff.
-Please consider making a [donation](https://truecharts.org/sponsor) or contributing back to the project any way you can!
-
-*All Rights Reserved - The TrueCharts Project*

charts/dependency/node-exporter/questions.yaml

@@ -1,86 +0,0 @@
-# Include{groups}
-questions:
-# Include{global}
-# Include{workload}
-# Include{workloadDeployment}
-
-# Include{replicas1}
-# Include{podSpec}
-# Include{containerMain}
-# Include{containerBasic}
-# Include{containerAdvanced}
-
-
-# Include{containerConfig}
-# Include{podOptions}
-# Include{serviceRoot}
-        - variable: main
-          label: "Main Service"
-          description: "The Primary service on which the healthcheck runs, often the webUI"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-# Include{serviceSelectorLoadBalancer}
-# Include{serviceSelectorExtras}
-                    - variable: main
-                      label: "Main Service Port Configuration"
-                      schema:
-                        additional_attrs: true
-                        type: dict
-                        attrs:
-                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 9100
-                              required: true
-# Include{serviceExpertRoot}
-# Include{serviceExpert}
-# Include{serviceList}
-# Include{persistenceList}
-# Include{ingressRoot}
-        - variable: main
-          label: "Main Ingress"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-# Include{ingressDefault}
-# Include{ingressTLS}
-# Include{ingressTraefik}
-# Include{ingressList}
-# Include{securityContextRoot}
-
-              - variable: runAsUser
-                label: "runAsUser"
-                description: "The UserID of the user running the application"
-                schema:
-                  type: int
-                  default: 568
-              - variable: runAsGroup
-                label: "runAsGroup"
-                description: "The groupID of the user running the application"
-                schema:
-                  type: int
-                  default: 568
-# Include{securityContextContainer}
-# Include{securityContextAdvanced}
-# Include{securityContextPod}
-              - variable: fsGroup
-                label: "fsGroup"
-                description: "The group that should own ALL storage."
-                schema:
-                  type: int
-                  default: 568
-
-# Include{resources}
-# Include{metrics}
-# Include{prometheusRule}
-# Include{advanced}
-# Include{addons}
-# Include{codeserver}
-# Include{netshoot}
-# Include{vpn}
-# Include{documentation}

charts/dependency/node-exporter/templates/NOTES.txt

@@ -1 +0,0 @@
-{{- include "tc.v1.common.lib.chart.notes" $ -}}

charts/dependency/node-exporter/templates/common.yaml

@@ -1 +0,0 @@
-{{ include "tc.v1.common.loader.all" . }}

charts/dependency/node-exporter/values.yaml

@@ -1,91 +0,0 @@
-image:
-  repository: tccr.io/truecharts/node-exporter
-  pullPolicy: IfNotPresent
-  tag: v1.5.0@sha256:3e66f61c18145bb2267e2caf74e8ac5dcf48f75ac276890838355ba8069952c9
-
-service:
-  main:
-    ports:
-      main:
-        protocol: http
-        port: 9910
-
-workload:
-  main:
-    type: DaemonSet
-    podSpec:
-      containers:
-        main:
-          args:
-            - --path.procfs=/host/proc
-            - --path.sysfs=/host/sys
-            - --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.netdev.device-exclude="^veth.*$"
-            - --collector.netclass.ignored-devices="^veth.*$"
-          probes:
-            liveness:
-              path: /
-              port: main
-
-            readiness:
-              path: /
-              port: main
-
-            startup:
-              type: tcp
-              port: main
-
-podOptions:
-  hostNetwork: true
-  hostPID: true
-
-persistence:
-  host:
-    enabled: true
-    hostPath: /
-    mountPath: /host
-    readOnly: true
-  proc:
-    enabled: true
-    hostPath: /proc
-    mountPath: /host/proc
-    readOnly: true
-  sys:
-    enabled: true
-    hostPath: /sys
-    mountPath: /host/sys
-    readOnly: true
-
-metrics:
-  main:
-    # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
-    # @default -- See values.yaml
-    enabled: true
-    type: serviceMonitor
-    endpoints:
-      - port: main
-        path: /metrics
-    # -- Enable and configure Prometheus Rules for the chart under this key.
-    # @default -- See values.yaml
-    prometheusRule:
-      enabled: false
-      labels: {}
-      # -- Configure additionial rules for the chart under this key.
-      # @default -- See prometheusrules.yaml
-      rules:
-        []
-        # - alert: UnifiPollerAbsent
-        #   annotations:
-        #     description: Unifi Poller has disappeared from Prometheus service discovery.
-        #     summary: Unifi Poller is down.
-        #   expr: |
-        #     absent(up{job=~".*unifi-poller.*"} == 1)
-        #   for: 5m
-        #   labels:
-        #     severity: critical
-
-portal:
-  open:
-    enabled: false

charts/dependency/redis/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "7.0.11"
+appVersion: "7.0.8"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.10.2
+    version: 12.4.21
 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.46
+version: 6.0.29
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/redis/questions.yaml

@@ -11,7 +11,6 @@ questions:
 # Include{containerAdvanced}
 
 # Include{containerConfig}
-# Include{podOptions}
   - variable: redisPassword
     group: "App Configuration"
     label: "Redis Password"
@@ -43,6 +42,7 @@ questions:
                               default: 6379
                               required: true
 # Include{serviceExpertRoot}
+            default: false
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{vctRoot}

charts/dependency/redis/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/redis
   pullPolicy: IfNotPresent
-  tag: 7.0.11@sha256:4653f0bff0f593ae2fd5782fbca41c15e0fbc631ab339ee74fb0e82ef37ed90a
+  tag: 7.0.8@sha256:13e0bbf5369ed2f219b96c0e7136b531eb1fdca1db7b7e2c72e13133adf26288
 
 workload:
   main:

charts/dependency/solr/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "9.2.1"
+appVersion: "9.1.1"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.10.2
+    version: 12.4.21
 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.33
+version: 4.0.12
 annotations:
   truecharts.org/catagories: |
     - search

charts/dependency/solr/questions.yaml

@@ -14,7 +14,6 @@ questions:
 # Include{containerAdvanced}
 
 # Include{containerConfig}
-# Include{podOptions}
   - variable: solrCores
     group: "App Configuration"
     label: "Solr Cores"
@@ -66,6 +65,7 @@ questions:
                               default: 8983
                               required: true
 # Include{serviceExpertRoot}
+            default: false
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}

charts/dependency/solr/values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/solr
   pullPolicy: IfNotPresent
-  tag: v9.2.1@sha256:87988fef502a8d4debe274fea68770a075f2c9277f86ccb6fbdca5e19d5888c5
+  tag: 9.1.1@sha256:4ac9d6e8120321349f0a3e5dbaff796192a9623de8fb164adf9f42de952479f1
 
 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.10.2
+    version: 12.4.21
   - condition: redis.enabled
     name: redis
     repository: https://deps.truecharts.org
-    version: 6.0.46
+    version: 6.0.29
 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.21
+version: 15.1.9
 annotations:
   truecharts.org/catagories: |
     - security

charts/enterprise/authelia/questions.yaml

@@ -12,7 +12,6 @@ questions:
 # Include{containerBasic}
 # Include{containerAdvanced}
 # Include{containerConfig}
-# Include{podOptions}
   - variable: domain
     group: "App Configuration"
     label: "Domain"
@@ -743,6 +742,7 @@ questions:
                               default: 9091
                               required: true
 # Include{serviceExpertRoot}
+            default: false
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}

charts/enterprise/authelia/values.yaml

@@ -2,8 +2,7 @@ image:
   repository: tccr.io/truecharts/authelia
   pullPolicy: IfNotPresent
   tag: 4.37.5@sha256:76a4617539534cec140fd98a12f721b878524f2df3a3653f3df8ff2b7eaab586
-manifestManager:
-  enabled: true
+
 workload:
   main:
     replicas: 2
@@ -11,10 +10,8 @@ workload:
     podSpec:
       containers:
         main:
-          command:
-            - authelia
-          args:
-            - --config=/configuration.yaml
+          command: ["authelia"]
+          args: ["--config=/configuration.yaml"]
           envFrom:
             - configMapRef:
                 name: authelia-paths

charts/enterprise/blocky/Chart.yaml

@@ -3,11 +3,11 @@ appVersion: "0.21.0"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.10.2
+    version: 12.4.21
   - condition: redis.enabled
     name: redis
     repository: https://deps.truecharts.org
-    version: 6.0.46
+    version: 6.0.29
 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.33
+version: 5.0.22
 annotations:
   truecharts.org/catagories: |
     - network

charts/enterprise/blocky/questions.yaml

@@ -723,7 +723,6 @@ questions:
                   type: string
                   default: ""
 # Include{containerConfig}
-# Include{podOptions}
 # Include{serviceRoot}
         - variable: main
           label: Main Service
@@ -814,6 +813,7 @@ questions:
                               default: 853
                               required: true
 # Include{serviceExpertRoot}
+            default: false
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceList}

charts/enterprise/blocky/values.yaml

@@ -6,9 +6,8 @@ image:
 k8sgatewayImage:
   repository: tccr.io/truecharts/k8s_gateway
   pullPolicy: IfNotPresent
-  tag: 0.3.4@sha256:c49645e7b263e5cfc8fc269db2aef7d90149cecc7a50e2c2fe77ef935dd35742
-manifestManager:
-  enabled: true
+  tag: 0.3.3@sha256:246e7006afaf57a398b02e417a31d6f14fb43562901388772778f60be586b807
+
 workload:
   main:
     replicas: 2

charts/enterprise/cert-manager/Chart.yaml

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

charts/enterprise/cert-manager/values.yaml

@@ -1,9 +1,8 @@
 image:
   repository: tccr.io/truecharts/scratch
-  tag: latest@sha256:9dd0f68d32ace452a3a75273bd8e3a074d0a14e4d38683389c73887432832fc3
+  tag: latest@sha256:180d25cc7a4f380758cd1e72864793c280f3e1728d800984c3287a709803e172
   pullPolicy: IfNotPresent
-manifestManager:
-  enabled: true
+
 workload:
   main:
     enabled: false

charts/enterprise/grafana/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "9.5.2"
+appVersion: "9.4.7"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.10.2
+    version: 12.4.21
 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.40
+version: 7.0.20
 annotations:
   truecharts.org/catagories: |
     - metrics

charts/enterprise/grafana/questions.yaml

@@ -56,7 +56,6 @@ questions:
 
 
 # Include{containerConfig}
-# Include{podOptions}
 # Include{serviceRoot}
         - variable: main
           label: "Main Service"
@@ -81,6 +80,7 @@ questions:
                               default: 10038
                               required: true
 # Include{serviceExpertRoot}
+            default: false
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}
@@ -131,6 +131,7 @@ questions:
 # Include{resources}
 # Include{metrics}
 # Include{prometheusRule}
+# Include{prometheusRule}
 # Include{advanced}
 # Include{addons}
 # Include{codeserver}

charts/enterprise/grafana/values.yaml

@@ -1,9 +1,8 @@
 image:
   repository: tccr.io/truecharts/grafana
   pullPolicy: IfNotPresent
-  tag: v9.5.2@sha256:2016c468cf2bee3a11263b9884cad2a9dc6dce642fd1c1aa8809c25c33308fc7
-manifestManager:
-  enabled: true
+  tag: 9.4.7@sha256:ff6de962c1a5ed647f44e2bbb941806dfe05a7623305fe0f5765ce56bd30ef2e
+
 securityContext:
   container:
     readOnlyRootFilesystem: false

charts/enterprise/metallb/Chart.yaml

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

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

@@ -2,12 +2,6 @@
 
 The guide walks through a basic configuration of MetalLB for a single address pool on a layer 2 network. This will allow assigning different IP addresses by app.
 
-:::warning
-
-With MetalLB installed, apps will not be reachable using the integrated loadbalancer. You cannot combine two different loadbalancers in TrueNAS SCALE.
-
-:::
-
 ## 1. Configure Address Pool & L2 Advertisement
 
 ![metallb-addpoolbasic](img/metallb_guide_addresspool_basic.png)
@@ -15,7 +9,7 @@ With MetalLB installed, apps will not be reachable using the integrated loadbala
 Create a new entry under `Configure IP Address Pools Object`
 
 - **Name**: Enter a general name for this IP range. Something like _apps_ or _charts_ for this field is fine.
-- **Auto Assign**: if you want MetalLB Services to auto-assign IPs from the configured address pool without needing to specify per app. Recommendation is to keep this checked. You can still specify an IP for apps as needed (see step 3).
+- **Auto Assign**: if you want MetalLB Services to auto-assign IPs from the configured address pool without needing to specify per app. Recommendation is to keep this checked. You can still specify an IP for apps as needed (see step 4).
 
 Create a single entry under `Configure Address Pools`
 
@@ -58,15 +52,21 @@ With MetalLB installed, you may optionally specify IP addresses for your apps.
 
 For each app, under **Networking and Services**, select `LoadBalancer` Service Type for the Main Service.
 
-In the **LoadBalancer IP** field, specify an IP address that is within the MetalLB address pool that you configured. Apply the same IP address to the **LoadBalancer IP** field on other services within the app.
+In the **LoadBalancer IP** field, specify an IP address that is within the MetalLB address pool that you configured.
+
+With the Main Service assigned, you do not need to specify an IP address for other services under the same app, unless you specifically want a different IP address for that service.
+
+:::info
+
+By default all services under a single app will be assigned the same IP address.
+
+:::
 
 You may need to stop & restart the app for the IP address to take affect.
 
 From your SCALE shell, run the command `k3s kubectl get svc -A` to verify the IP addresses assigned for each of your apps. The IPs will be listed under the `EXTERNAL-IP` column.
 
-If you have an IP conflict with a previously assigned address it will show as `<pending>`.
-
-**You may need to do a system reboot as well to properly resolve the conflict.**
+If you have an IP conflict with a previously assigned address it will show as `<pending>`. You may need to do a system reboot as well to properly resolve the conflict.
 
 :::caution
 

charts/enterprise/metallb/values.yaml

@@ -1,9 +1,8 @@
 image:
   repository: tccr.io/truecharts/scratch
-  tag: latest@sha256:9dd0f68d32ace452a3a75273bd8e3a074d0a14e4d38683389c73887432832fc3
+  tag: latest@sha256:180d25cc7a4f380758cd1e72864793c280f3e1728d800984c3287a709803e172
   pullPolicy: IfNotPresent
-manifestManager:
-  enabled: true
+
 workload:
   main:
     enabled: false

charts/enterprise/prometheus/Chart.yaml

@@ -1,17 +1,17 @@
 apiVersion: v2
-appVersion: "2.44.0"
+appVersion: "2.43.0"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.10.2
+    version: 12.4.21
   - condition: exporters.enabled,exporters.node-exporter.enabled
     name: node-exporter
-    repository: https://deps.truecharts.org
-    version: 1.0.6
+    repository: https://charts.bitnami.com/bitnami
+    version: 3.3.4
   - condition: exporters.enabled,exporters.kube-state-metrics.enabled
     name: kube-state-metrics
-    repository: https://deps.truecharts.org
-    version: 1.0.7
+    repository: https://charts.bitnami.com/bitnami
+    version: 3.4.0
 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.11
+version: 8.0.18
 annotations:
   truecharts.org/catagories: |
     - metrics

charts/enterprise/prometheus/questions.yaml

@@ -23,7 +23,6 @@ questions:
                 schema:
                   type: string
                   default: "info"
-
   - variable: prometheus
     group: "App Configuration"
     label: "Prometheus Settings"
@@ -80,37 +79,6 @@ questions:
                 schema:
                   type: boolean
                   default: false
-
-  - variable: exporters
-    group: "App Configuration"
-    label: "Exporter Settings"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: node-exporter
-          label: "node-exporter"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-              - variable: enabled
-                label: "Enable"
-                schema:
-                  type: boolean
-                  default: true
-        - variable: kube-state-metrics
-          label: "Kube-State-Metrics"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-              - variable: enabled
-                label: "Enable"
-                schema:
-                  type: boolean
-                  default: true
-
   - variable: alertmanager
     group: "App Configuration"
     label: "Alertmanager Settings"
@@ -183,6 +151,7 @@ questions:
                               default: 10087
                               required: true
 # Include{serviceExpertRoot}
+            default: false
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceList}

charts/enterprise/prometheus/values.yaml

@@ -1,16 +1,15 @@
 image:
   repository: tccr.io/truecharts/prometheus
-  tag: v2.44.0@sha256:48aa3e3b18118bea2ffddc916517a400f483f68bf2cdc48c75ebb2c6e84543fa
+  tag: 2.43.0@sha256:2f9b37b4823b2cb14e70714f5f0d7396aeacd8f18d96ff2a407ab2c655d64147
 
 thanosImage:
   repository: tccr.io/truecharts/thanos
-  tag: 0.31.0@sha256:28282d3e63f84cdeeb05e965b173b610d5597997acc7ce75d5849207b0f97b28
+  tag: 0.31.0@sha256:5fb6e900c9c94756a0296d9348e1d3e2fd731804d3be56461ea0189e48452299
 
 alertmanagerImage:
   repository: tccr.io/truecharts/alertmanager
-  tag: 0.25.0@sha256:6b534671b83aa7fbd91d1b10bf0f1b29b948e4b300f8359a86043d0deba07207
-manifestManager:
-  enabled: true
+  tag: 0.25.0@sha256:fe79dcef013284d16a053f624d0b9a73fdb7385bda191ea2a78f4c750e60301e
+
 global:
   labels: {}
 workload:
@@ -973,8 +972,7 @@ alertmanager:
     global:
       resolve_timeout: 5m
     route:
-      group_by:
-        - job
+      group_by: ["job"]
       group_wait: 30s
       group_interval: 5m
       repeat_interval: 12h
@@ -1131,14 +1129,37 @@ exporters:
     ## @param exporters.kube-state-metrics.enabled Enable kube-state-metrics
     ##
     enabled: true
-
+## @param node-exporter [object] Node Exporter deployment configuration
+##
+node-exporter:
+  service:
+    port: 9910
+    targetPort: 9910
+    labels:
+      jobLabel: node-exporter
+  serviceMonitor:
+    enabled: true
+    jobLabel: jobLabel
+  extraArgs:
+    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.netdev.device-exclude: "^veth.*$"
+    collector.netclass.ignored-devices: "^veth.*$"
+    path.rootfs: /host
+  extraVolumes:
+    - name: host
+      hostPath:
+        path: /
+  extraVolumeMounts:
+    - name: host
+      mountPath: /host
+      readOnly: true
 ## @param kube-state-metrics [object] Node Exporter deployment configuration
 ##
 kube-state-metrics:
   serviceMonitor:
     enabled: true
     honorLabels: true
-
 ## Component scraping for kubelet and kubelet hosted cAdvisor
 ##
 kubelet:

charts/enterprise/traefik/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "2.10.1"
+appVersion: "2.9.9"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.10.2
+    version: 12.4.21
 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.4
+version: 17.0.24
 annotations:
   truecharts.org/catagories: |
     - network

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

@@ -44,7 +44,7 @@ Ensure you are accessing your WebUI from the new ports before proceeding.
 
 :::note
 
-Traefik is part of the `enterprise` train, so make sure you have it enabled as specified in the [guide](https://truecharts.org/manual/SCALE/guides/getting-started#adding-truecharts).
+Traefik is part of the `enterprise` train, so make sure you have it enabled as specified in the [guide](https://truecharts.org/manual/guides/Adding-TrueCharts#adding-truecharts).
 
 :::
 

charts/enterprise/traefik/questions.yaml

@@ -15,7 +15,6 @@ questions:
 # Include{containerAdvanced}
 
 # Include{containerConfig}
-# Include{podOptions}
   - variable: ingressClass
     label: "ingressClass"
     group: "App Configuration"

charts/enterprise/traefik/templates/_args.tpl

@@ -67,7 +67,7 @@ args:
   - "--providers.kubernetesingress.namespaces={{ template "providers.kubernetesIngress.namespaces" . }}"
   {{- end }}
   {{- end }}
-  {{- if $.Values.ingressClass.enabled }}
+  {{- if .Values.ingressClass.enabled }}
   - "--providers.kubernetesingress.ingressclass={{ .Release.Name }}"
   {{- end }}
   {{- range $entrypoint, $config := $ports }}

charts/enterprise/traefik/templates/_ingressclass.tpl

@@ -1,7 +1,7 @@
 {{/* Define the ingressClass */}}
 {{- define "traefik.ingressClass" -}}
 ---
-{{ if $.Values.ingressClass.enabled }}
+{{ if .Values.ingressClass.enabled }}
   {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/IngressClass" }}
 apiVersion: networking.k8s.io/v1
   {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/IngressClass" }}

charts/enterprise/traefik/templates/_portalhook.tpl

@@ -1,13 +1,17 @@
 {{/* Define the portalHook */}}
 {{- define "traefik.portalhook" -}}
 {{- if .Values.portalhook.enabled }}
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 ---
 
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ ternary "portalhook" (printf "portalhook-%v" .Release.Name ) $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: portalhook
+  namespace: {{ $namespace }}
 data:
   {{- $ports := dict }}
   {{- range $.Values.service }}

charts/enterprise/traefik/templates/_tlsoptions.tpl

@@ -2,7 +2,7 @@
 {{- define "traefik.tlsOptions" -}}
 {{- range $name, $config := .Values.tlsOptions }}
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: TLSOption
 metadata:
   name: {{ $name }}

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

@@ -1,13 +1,16 @@
 {{- $values := .Values }}
-
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 {{- range $index, $middlewareData := .Values.middlewares.addPrefix }}
 
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: {{ $middlewareData.name }}
+  namespace: {{ $namespace }}
 spec:
   addPrefix:
     prefix: {{ $middlewareData.prefix }}

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

@@ -1,30 +1,34 @@
 {{- $values := .Values }}
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-compress" $.Release.Name) "compress" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: compress
+  namespace: {{ $namespace }}
 spec:
   compress: {}
 ---
 # Here, an average of 300 requests per second is allowed.
 # In addition, a burst of 200 requests is allowed.
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-basic-ratelimit" $.Release.Name) "basic-ratelimit" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: basic-ratelimit
+  namespace: {{ $namespace }}
 spec:
   rateLimit:
     average: 600
     burst: 400
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-basic-secure-headers" $.Release.Name) "basic-secure-headers" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: basic-secure-headers
+  namespace: {{ $namespace }}
 spec:
   headers:
     accessControlAllowMethods:
@@ -45,14 +49,14 @@ spec:
     customResponseHeaders:
       server: ''
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-chain-basic" $.Release.Name) "chain-basic" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: chain-basic
+  namespace: {{ $namespace }}
 spec:
   chain:
     middlewares:
-    - name: {{ ternary (printf "%v-basic-ratelimit" $.Release.Name) "basic-ratelimit" $.Values.ingressClass.enabled }}
-    - name: {{ ternary (printf "%v-basic-secure-headers" $.Release.Name) "basic-secure-headers" $.Values.ingressClass.enabled }}
-    - name: {{ ternary (printf "%v-compress" $.Release.Name) "compress" $.Values.ingressClass.enabled }}
+    - name: basic-ratelimit
+    - name: basic-secure-headers
+    - name: compress

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

@@ -1,17 +1,20 @@
 {{- $values := .Values }}
-
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 {{ range $index, $middlewareData := .Values.middlewares.basicAuth }}
 ---
 {{- $users := list }}
-{{- range $index, $userdata := $middlewareData.users }}
-  {{- $users = append $users (htpasswd $userdata.username $userdata.password) }}
-{{- end }}
+{{ 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
+  namespace: {{ $namespace }}
 type: Opaque
 stringData:
   users: |
@@ -20,12 +23,12 @@ stringData:
     {{- end }}
 ---
 # Declaring the user list
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: {{ $middlewareData.name }}
+  namespace: {{ $namespace }}
 spec:
   basicAuth:
-    secret: {{ printf "%v-%v" $middlewareData.name "secret" }}
+    secret: {{printf "%v-%v" $middlewareData.name "secret" }}
 {{ end }}

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

@@ -1,17 +1,17 @@
 {{- $values := .Values }}
-{{- $namespace := "tc-system" }}
-{{- if $.Values.ingressClass.enabled }}
-{{- $namespace := ( printf "tc-system-%s" .Release.Name ) }}
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
 {{- end }}
 {{ range $index, $middlewareData := .Values.middlewares.chain }}
 
 ---
 # Declaring the user list
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: {{ $middlewareData.name }}
+  namespace: {{ $namespace }}
 spec:
   chain:
     middlewares:

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

@@ -1,12 +1,15 @@
 {{- $values := .Values }}
-
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 {{ range $index, $middlewareData := .Values.middlewares.forwardAuth }}
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: {{ $middlewareData.name }}
+  namespace: {{ $namespace }}
 spec:
   forwardAuth:
     address: {{ $middlewareData.address }}

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

@@ -1,13 +1,16 @@
 {{- $values := .Values }}
-
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 {{- range $index, $middlewareData := .Values.middlewares.geoBlock }}
 
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: {{ $middlewareData.name }}
+  namespace: {{ $namespace }}
 spec:
   plugin:
     GeoBlock:

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

@@ -1,14 +1,17 @@
 {{- $values := .Values }}
-
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 {{ range $index, $middlewareData := .Values.middlewares.ipWhiteList }}
 
 ---
 # Declaring the user list
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: {{ $middlewareData.name }}
+  namespace: {{ $namespace }}
 spec:
   ipWhiteList:
     sourceRange:

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

@@ -1,14 +1,17 @@
 {{- $values := .Values }}
-
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 {{ range $index, $middlewareData := .Values.middlewares.rateLimit }}
 
 ---
 # Declaring the user list
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: {{ $middlewareData.name }}
+  namespace: {{ $namespace }}
 spec:
   rateLimit:
     average: {{ $middlewareData.average }}

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

@@ -1,13 +1,16 @@
 {{- $values := .Values }}
-
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 {{- range $index, $middlewareData := .Values.middlewares.realIP }}
 
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: {{ $middlewareData.name }}
+  namespace: {{ $namespace }}
 spec:
   plugin:
     traefik-real-ip:

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

@@ -1,14 +1,17 @@
 {{- $values := .Values }}
-
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 {{ range $index, $middlewareData := .Values.middlewares.redirectScheme }}
 
 ---
 # Declaring the user list
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: {{ $middlewareData.name }}
+  namespace: {{ $namespace }}
 spec:
   redirectScheme:
     scheme: {{ $middlewareData.scheme }}

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

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

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

@@ -1,13 +1,16 @@
 {{- $values := .Values }}
-
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 
 {{ range $index, $middlewareData := .Values.middlewares.stripPrefixRegex }}
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: {{ $middlewareData.name }}
+  namespace: {{ $namespace }}
 spec:
   stripPrefixRegex:
     regex:

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

@@ -1,26 +1,29 @@
 {{- $values := .Values }}
-
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name "tc-opencors-chain") "tc-opencors-chain" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: tc-opencors-chain
+  namespace: {{ $namespace }}
 spec:
   chain:
     middlewares:
-    - name: {{ ternary (printf "%v-%v" $.Release.Name "basic-ratelimit") "basic-ratelimit" $.Values.ingressClass.enabled }}
-    - name: {{ ternary (printf "%v-%v" $.Release.Name "tc-opencors-headers") "tc-opencors-headers" $.Values.ingressClass.enabled }}
-    - name: {{ ternary (printf "%v-%v" $.Release.Name "compress") "compress" $.Values.ingressClass.enabled }}
+    - name: basic-ratelimit
+    - name: tc-opencors-headers
+    - name: compress
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name "tc-closedcors-chain") "tc-closedcors-chain" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: tc-closedcors-chain
+  namespace: {{ $namespace }}
 spec:
   chain:
     middlewares:
-    - name: {{ ternary (printf "%v-%v" $.Release.Name "basic-ratelimit") "basic-ratelimit" $.Values.ingressClass.enabled }}
-    - name: {{ ternary (printf "%v-%v" $.Release.Name "tc-closedcors-headers") "tc-closedcors-headers" $.Values.ingressClass.enabled }}
-    - name: {{ ternary (printf "%v-%v" $.Release.Name "compress") "compress" $.Values.ingressClass.enabled }}
+    - name: basic-ratelimit
+    - name: tc-closedcors-headers
+    - name: compress

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

@@ -1,11 +1,14 @@
 {{- $values := .Values }}
-
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name "tc-opencors-headers") "tc-opencors-headers" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: tc-opencors-headers
+  namespace: {{ $namespace }}
 spec:
   headers:
     accessControlAllowHeaders:
@@ -31,11 +34,11 @@ spec:
     sslRedirect: true
     stsSeconds: 63072000
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name "tc-closedcors-headers") "tc-closedcors-headers" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: tc-closedcors-headers
+  namespace: {{ $namespace }}
 spec:
   headers:
     accessControlAllowMethods:

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

@@ -1,22 +1,25 @@
 {{- $values := .Values }}
-
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name "tc-nextcloud-redirectregex-dav") "tc-nextcloud-redirectregex-dav" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: tc-nextcloud-redirectregex-dav
+  namespace: {{ $namespace }}
 spec:
   redirectRegex:
     regex: "https://(.*)/.well-known/(card|cal)dav"
     replacement: "https://${1}/remote.php/dav/"
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name "tc-nextcloud-chain") "tc-nextcloud-chain" $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: tc-nextcloud-chain
+  namespace: {{ $namespace }}
 spec:
   chain:
     middlewares:
-    - name: {{ ternary (printf "%v-%v" $.Release.Name "tc-nextcloud-redirectregex-dav") "tc-nextcloud-redirectregex-dav" $.Values.ingressClass.enabled }}
+    - name: tc-nextcloud-redirectregex-dav

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

@@ -1,13 +1,16 @@
 {{- $values := .Values }}
-
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
 {{- range $index, $middlewareData := .Values.middlewares.themePark }}
 
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
-  namespace: tc-system
+  name: {{ $middlewareData.name }}
+  namespace: {{ $namespace }}
 spec:
   plugin:
     traefik-themepark:

charts/enterprise/traefik/values.yaml

@@ -1,9 +1,9 @@
 image:
   repository: tccr.io/truecharts/traefik
-  tag: 2.10.1@sha256:049aece2d3e7eddabed1e2e4c4bd03ceba372d3b9f461386b262b6cb69369fcf
+  # defaults to appVersion
+  tag: 2.9.9@sha256:4b9750e70b54df2a0c39c3262fe2963815a0304b7982fb8f80d0782a8e8021fa
   pullPolicy: IfNotPresent
-manifestManager:
-  enabled: true
+
 workload:
   main:
     replicas: 2
@@ -292,16 +292,15 @@ rbac:
           - update
       - apiGroups:
           - traefik.containo.us
-          - traefik.io
         resources:
-          - middlewares
-          - middlewaretcps
           - ingressroutes
-          - traefikservices
           - ingressroutetcps
           - ingressrouteudps
+          - middlewares
+          - middlewaretcps
           - tlsoptions
           - tlsstores
+          - traefikservices
           - serverstransports
         verbs:
           - get
@@ -414,3 +413,5 @@ portal:
   open:
     enabled: true
     path: /dashboard/
+    override:
+      protocol: http