chore(deps): update helm general non-major (#9156 )

This PR contains the following updates: | Package | Update | Change | |---|---|---| | [common](https://togithub.com/truecharts/apps/tree/master/charts/common) ([source](https://togithub.com/truecharts/library-charts)) | minor | `12.9.5` -> `12.10.2` | | [common](https://togithub.com/truecharts/apps/tree/master/charts/common) ([source](https://togithub.com/truecharts/library-charts)) | minor | `12.9.2` -> `12.10.2` | | [common](https://togithub.com/truecharts/apps/tree/master/charts/common) ([source](https://togithub.com/truecharts/library-charts)) | minor | `10.2.0` -> `10.9.7` | | [kube-state-metrics](https://truecharts.org/charts/dependency/kube-state-metrics) ([source](https://togithub.com/truecharts/charts)) | patch | `1.0.4` -> `1.0.7` | | [mariadb](https://truecharts.org/charts/dependency/mariadb) ([source](https://togithub.com/truecharts/charts)) | patch | `7.0.30` -> `7.0.33` | | [memcached](https://truecharts.org/charts/dependency/memcached) ([source](https://togithub.com/truecharts/charts)) | patch | `6.0.41` -> `6.0.44` | | [mongodb](https://truecharts.org/charts/dependency/mongodb) ([source](https://togithub.com/truecharts/charts)) | patch | `6.0.30` -> `6.0.33` | | [node-exporter](https://truecharts.org/charts/dependency/node-exporter) ([source](https://togithub.com/truecharts/charts)) | patch | `1.0.3` -> `1.0.6` | | [redis](https://truecharts.org/charts/dependency/redis) ([source](https://togithub.com/truecharts/charts)) | patch | `6.0.44` -> `6.0.46` | | [redis](https://truecharts.org/charts/dependency/redis) ([source](https://togithub.com/truecharts/charts)) | patch | `6.0.43` -> `6.0.46` | --- ### Release Notes <details> <summary>truecharts/library-charts</summary> ### [`v12.10.2`](https://togithub.com/truecharts/library-charts/releases/tag/common-12.10.2) [Compare Source](https://togithub.com/truecharts/library-charts/compare/common-12.10.1...common-12.10.2) Function library for TrueCharts ### [`v12.10.1`](https://togithub.com/truecharts/library-charts/releases/tag/common-12.10.1) [Compare Source](https://togithub.com/truecharts/library-charts/compare/common-12.10.0...common-12.10.1) Function library for TrueCharts ### [`v12.10.0`](https://togithub.com/truecharts/library-charts/releases/tag/common-12.10.0) [Compare Source](https://togithub.com/truecharts/library-charts/compare/common-12.9.5...common-12.10.0) Function library for TrueCharts </details> <details> <summary>truecharts/charts</summary> ### [`v1.0.7`](https://togithub.com/truecharts/charts/releases/tag/kube-state-metrics-1.0.7) [Compare Source](https://togithub.com/truecharts/charts/compare/kube-state-metrics-1.0.4...kube-state-metrics-1.0.7) kube-state-metrics is a simple service that listens to the Kubernetes API server and generates metrics about the state of the objects. </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 10pm on tuesday" in timezone Europe/Amsterdam, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate).
fix(traefik): fix context on middlewares (#9174 )
2023-05-26 09:39:42 +02:00 · 2023-05-26 09:32:55 +02:00 · 2023-05-26 07:50:36 +02:00 · 2023-05-26 03:04:07 +02:00 · 2023-05-26 03:04:03 +02:00 · 2023-05-26 00:24:36 +00:00
1113 changed files with 2854 additions and 12878 deletions
--- a/.github/actions/label-from-status/action.yaml
+++ b/.github/actions/label-from-status/action.yaml
@@ -1,48 +0,0 @@
-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"
--- a/.github/scripts/fetch_helm_deps.sh
+++ b/.github/scripts/fetch_helm_deps.sh
@@ -101,20 +101,34 @@ for idx in $(eval echo "{0..$length}"); do

            if [ ! $? ]; then
                echo "❌ wget encountered an error..."
-                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
+              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
            fi

            if [ -f "$cache_path/$repo_dir/$name-$version.tgz" ]; then
                echo "✅ Dependency Downloaded!"
-                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
+                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...
-                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
+              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
            fi
        fi
        echo ""
--- a/.github/workflows/charts-changelog.yaml
+++ b/.github/workflows/charts-changelog.yaml
@@ -1,89 +0,0 @@
-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
--- a/.github/workflows/charts-lint.yaml
+++ b/.github/workflows/charts-lint.yaml
@@ -9,6 +9,9 @@ on:
      chartChangesDetected:
        required: true
        type: string
+      modifiedFiles:
+        required: true
+        type: string

 jobs:
  lint-and-verify:
@@ -49,6 +52,16 @@ jobs:
            echo "detected=true" >> "$GITHUB_OUTPUT"
          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'
@@ -73,11 +86,13 @@ jobs:

      - name: Create/Update comment
        if: steps.list-changed.outputs.detected == 'true'
+        continue-on-error: true
        uses: thollander/actions-comment-pull-request@632cf9ce90574d125be56b5f3405cda41a84e2fd # v2
        with:
          filePath: /tmp/lint_result.txt
          comment_tag: lint_results
          mode: recreate
+          GITHUB_TOKEN: ${{ github.token }}

      - name: Lint Result
        if: steps.list-changed.outputs.detected == 'true'
--- a/.github/workflows/charts-test.yaml
+++ b/.github/workflows/charts-test.yaml
@@ -152,7 +152,7 @@ jobs:
            helmv3
          helm: "3.8.0"

-      - uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b # v4
+      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
        with:
          python-version: "3.10"

@@ -197,7 +197,7 @@ jobs:
            helmv3
          helm: "3.8.0"

-      - uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b # v4
+      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
        with:
          python-version: "3.10"

@@ -243,7 +243,7 @@ jobs:
            helmv3
          helm: "3.8.0"

-      - uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b # v4
+      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
        with:
          python-version: "3.10"

@@ -288,7 +288,7 @@ jobs:
            helmv3
          helm: "3.8.0"

-      - uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b # v4
+      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
        with:
          python-version: "3.10"

@@ -333,7 +333,7 @@ jobs:
            helmv3
          helm: "3.8.0"

-      - uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b # v4
+      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
        with:
          python-version: "3.10"

@@ -378,7 +378,7 @@ jobs:
            helmv3
          helm: "3.8.0"

-      - uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b # v4
+      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4
        with:
          python-version: "3.10"

--- a/.github/workflows/daily.yaml
+++ b/.github/workflows/daily.yaml
@@ -203,6 +203,15 @@ jobs:
              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: |
--- a/.github/workflows/pr-metadata.yaml
+++ b/.github/workflows/pr-metadata.yaml
@@ -1,60 +0,0 @@
-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
--- a/.github/workflows/pr-validate.yaml
+++ b/.github/workflows/pr-validate.yaml
@@ -8,52 +8,46 @@ concurrency:
  # cancel-in-progress: true

 jobs:
-  pr-metadata:
-    uses: ./.github/workflows/pr-metadata.yaml
+  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

-  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 }}
+      - name: Collect changes
+        id: collect-changes
+        uses: ./.github/actions/collect-changes

  charts-lint:
    uses: ./.github/workflows/charts-lint.yaml
    needs:
-      - pr-metadata
-    #  - charts-changelog
+      - pr-changes
    with:
      checkoutCommit: ${{ needs.charts-changelog.outputs.commitHash }}
-      chartChangesDetected: ${{ needs.pr-metadata.outputs.addedOrModified }}
+      chartChangesDetected: ${{ needs.pr-changes.outputs.addedOrModified }}
+      modifiedFiles: ${{ needs.pr-metadata.outputs.addedOrModifiedFiles }}

  charts-test:
    uses: ./.github/workflows/charts-test.yaml
    needs:
-      - pr-metadata
-      #  - charts-changelog
+      - pr-changes
      - charts-lint
    with:
      checkoutCommit: ${{ needs.charts-changelog.outputs.commitHash }}
-      chartChangesDetected: ${{ needs.pr-metadata.outputs.addedOrModified }}
+      chartChangesDetected: ${{ needs.pr-changes.outputs.addedOrModified }}

  catalog-test:
    uses: ./.github/workflows/catalog-test.yaml
    needs:
-      - pr-metadata
-    #  - charts-changelog
+      - pr-changes
    with:
      checkoutCommit: ${{ needs.charts-changelog.outputs.commitHash }}
-      chartChangesDetected: ${{ needs.pr-metadata.outputs.addedOrModified }}
+      chartChangesDetected: ${{ needs.pr-changes.outputs.addedOrModified }}

  print_head_msg:
    name: print commit message
@@ -73,7 +67,7 @@ jobs:

  automerge-and-approve:
    needs:
-      - pr-metadata
+      - pr-changes
      - catalog-test
      - charts-test
      - charts-lint
--- a/.github/workflows/renovate.yml
+++ b/.github/workflows/renovate.yml
@@ -12,7 +12,7 @@ jobs:
        with:
          token: ${{ secrets.BOT_TOKEN }}
      - name: Self-hosted Renovate
-        uses: renovatebot/github-action@4cc203c40dc0eb6b356306893cabda6ff9d42f33 # v37.0.0
+        uses: renovatebot/github-action@04894c0e6786581e789ebf7e6dbdf22dfc0061cd # v38.0.0
        with:
          configurationFile: .github/renovate-config.js
          token: ${{ secrets.BOT_TOKEN }}
--- a/charts/dependency/clickhouse/Chart.yaml
+++ b/charts/dependency/clickhouse/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "23.4.2.11"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
 deprecated: false
 description: ClickHouse is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).
 home: https://truecharts.org/charts/dependency/clickhouse
@@ -22,7 +22,7 @@ sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/clickhouse
  - https://clickhouse.com/
 type: application
-version: 5.0.27
+version: 5.0.29
 annotations:
  truecharts.org/catagories: |
    - database
--- a/charts/dependency/kube-state-metrics/Chart.yaml
+++ b/charts/dependency/kube-state-metrics/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "2.8.2"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    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
@@ -21,7 +21,7 @@ name: kube-state-metrics
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/kube-state-metrics
 type: application
-version: 1.0.4
+version: 1.0.7
 annotations:
  truecharts.org/catagories: |
    - metrics
--- a/charts/dependency/kube-state-metrics/README.md
+++ b/charts/dependency/kube-state-metrics/README.md
@@ -5,7 +5,7 @@
 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/enterprise/)
+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)**

--- a/charts/dependency/kube-state-metrics/values.yaml
+++ b/charts/dependency/kube-state-metrics/values.yaml
@@ -1,7 +1,7 @@
 image:
  repository: tccr.io/truecharts/kube-state-metrics
  pullPolicy: IfNotPresent
-  tag: v2.8.2@sha256:e7b9fbc67f29bb72043238ebaa397d5161f9e3d5cdb16ac888e2ffe152015700
+  tag: v2.8.2@sha256:35a4457d904190e4870a88d7955b26b6b2604a60ad82c108f9f672a3a6b09ab1

 service:
  main:
--- a/charts/dependency/mariadb/Chart.yaml
+++ b/charts/dependency/mariadb/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "10.11.3"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
 deprecated: false
 description: Fast, reliable, scalable, and easy to use open-source relational database system.
 home: https://truecharts.org/charts/dependency/mariadb
@@ -25,7 +25,7 @@ sources:
  - https://github.com/prometheus/mysqld_exporter
  - https://mariadb.org
 type: application
-version: 7.0.30
+version: 7.0.33
 annotations:
  truecharts.org/catagories: |
    - database
--- a/charts/dependency/mariadb/values.yaml
+++ b/charts/dependency/mariadb/values.yaml
@@ -1,7 +1,7 @@
 image:
  repository: tccr.io/truecharts/mariadb
  pullPolicy: IfNotPresent
-  tag: v10.11.3@sha256:357b6ab922eac2ce823e6581e6580e1df4bba8d5859462c918a12c50b36881b8
+  tag: v10.11.3@sha256:6644ba3144bf9956439b2c40ec6b645c16c9b83fdf1943a9b60a750f98ac7e3c

 workload:
  main:
--- a/charts/dependency/memcached/Chart.yaml
+++ b/charts/dependency/memcached/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.6.20"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
 deprecated: false
 description: Memcached is a memory-backed database caching solution
 home: https://truecharts.org/charts/dependency/memcached
@@ -23,7 +23,7 @@ sources:
  - https://github.com/bitnami/bitnami-docker-memcached
  - http://memcached.org/
 type: application
-version: 6.0.41
+version: 6.0.44
 annotations:
  truecharts.org/catagories: |
    - database
--- a/charts/dependency/memcached/values.yaml
+++ b/charts/dependency/memcached/values.yaml
@@ -1,7 +1,7 @@
 image:
  repository: tccr.io/truecharts/memcached
  pullPolicy: IfNotPresent
-  tag: v1.6.20@sha256:6e11823db1555e766c5eda1b7725f4cc5cc5513da404644541d38a8432820117
+  tag: v1.6.20@sha256:424c5fc3f7f175d6fc3b61cead1698690eec6d9ba496a5f641fb23323373942a

 service:
  main:
--- a/charts/dependency/mongodb/Chart.yaml
+++ b/charts/dependency/mongodb/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "6.0.6"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
 deprecated: false
 description: Fast, reliable, scalable, and easy to use open-source no-sql database system.
 home: https://truecharts.org/charts/dependency/mongodb
@@ -23,7 +23,7 @@ sources:
  - https://github.com/bitnami/bitnami-docker-mongodb
  - https://www.mongodb.com
 type: application
-version: 6.0.30
+version: 6.0.33
 annotations:
  truecharts.org/catagories: |
    - database
--- a/charts/dependency/mongodb/values.yaml
+++ b/charts/dependency/mongodb/values.yaml
@@ -1,7 +1,7 @@
 image:
  repository: tccr.io/truecharts/mongodb
  pullPolicy: IfNotPresent
-  tag: v6.0.6@sha256:9d10c8a26a1b98d7212bbc2fef5dd7bf35275390dad10e6b4680c8f01c8177e4
+  tag: v6.0.6@sha256:5fcbda39afd70ed0c4bb915c68ae9e827093877faa3833e632fbb739d6148030

 workload:
  main:
--- a/charts/dependency/node-exporter/Chart.yaml
+++ b/charts/dependency/node-exporter/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.5.0"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    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
@@ -21,7 +21,7 @@ name: node-exporter
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/node-exporter
 type: application
-version: 1.0.3
+version: 1.0.6
 annotations:
  truecharts.org/catagories: |
    - metrics
--- a/charts/dependency/node-exporter/README.md
+++ b/charts/dependency/node-exporter/README.md
@@ -5,7 +5,7 @@
 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/enterprise/)
+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)**

--- a/charts/dependency/node-exporter/values.yaml
+++ b/charts/dependency/node-exporter/values.yaml
@@ -1,7 +1,7 @@
 image:
  repository: tccr.io/truecharts/node-exporter
  pullPolicy: IfNotPresent
-  tag: v1.5.0@sha256:674e04af703ffb85daf5cbddc64c5fc92e75ba49a5e2b0c0d14a2a8ccace3590
+  tag: v1.5.0@sha256:3e66f61c18145bb2267e2caf74e8ac5dcf48f75ac276890838355ba8069952c9

 service:
  main:
--- a/charts/dependency/redis/Chart.yaml
+++ b/charts/dependency/redis/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "7.0.11"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
 deprecated: false
 description: Open source, advanced key-value store.
 home: https://truecharts.org/charts/dependency/redis
@@ -23,7 +23,7 @@ sources:
  - https://github.com/bitnami/bitnami-docker-redis
  - http://redis.io/
 type: application
-version: 6.0.44
+version: 6.0.46
 annotations:
  truecharts.org/catagories: |
    - database
--- a/charts/dependency/solr/Chart.yaml
+++ b/charts/dependency/solr/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "9.2.1"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
 deprecated: false
 description: Apache Solr
 home: https://truecharts.org/charts/dependency/solr
@@ -22,7 +22,7 @@ sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/solr
  - https://github.com/apache/solr
 type: application
-version: 4.0.29
+version: 4.0.33
 annotations:
  truecharts.org/catagories: |
    - search
--- a/charts/dependency/solr/values.yaml
+++ b/charts/dependency/solr/values.yaml
@@ -1,7 +1,7 @@
 image:
  repository: tccr.io/truecharts/solr
  pullPolicy: IfNotPresent
-  tag: v9.2.1@sha256:ac86d55cb5c338e59a4672d620253be93afea8b5bc453a375415230312d0aa16
+  tag: v9.2.1@sha256:87988fef502a8d4debe274fea68770a075f2c9277f86ccb6fbdca5e19d5888c5

 workload:
  main:
--- a/charts/enterprise/authelia/Chart.yaml
+++ b/charts/enterprise/authelia/Chart.yaml
@@ -3,11 +3,11 @@ appVersion: "4.37.5"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
  - condition: redis.enabled
    name: redis
    repository: https://deps.truecharts.org
-    version: 6.0.44
+    version: 6.0.46
 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.20
+version: 15.1.21
 annotations:
  truecharts.org/catagories: |
    - security
--- a/charts/enterprise/blocky/Chart.yaml
+++ b/charts/enterprise/blocky/Chart.yaml
@@ -3,11 +3,11 @@ appVersion: "0.21.0"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
  - condition: redis.enabled
    name: redis
    repository: https://deps.truecharts.org
-    version: 6.0.44
+    version: 6.0.46
 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.32
+version: 5.0.33
 annotations:
  truecharts.org/catagories: |
    - network
--- a/charts/enterprise/cert-manager/Chart.yaml
+++ b/charts/enterprise/cert-manager/Chart.yaml
@@ -10,7 +10,7 @@ keywords:
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
 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.35
+version: 1.0.36
 annotations:
  truecharts.org/catagories: |
    - core
--- a/charts/enterprise/grafana/Chart.yaml
+++ b/charts/enterprise/grafana/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "9.5.2"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
 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.38
+version: 7.0.40
 annotations:
  truecharts.org/catagories: |
    - metrics
--- a/charts/enterprise/grafana/values.yaml
+++ b/charts/enterprise/grafana/values.yaml
@@ -1,7 +1,7 @@
 image:
  repository: tccr.io/truecharts/grafana
  pullPolicy: IfNotPresent
-  tag: v9.5.2@sha256:2835129a3364407fb10ce370ff5f83087373dbf99b067190e84bde8db2a77d5e
+  tag: v9.5.2@sha256:2016c468cf2bee3a11263b9884cad2a9dc6dce642fd1c1aa8809c25c33308fc7
 manifestManager:
  enabled: true
 securityContext:
--- a/charts/enterprise/metallb/Chart.yaml
+++ b/charts/enterprise/metallb/Chart.yaml
@@ -10,7 +10,7 @@ keywords:
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
 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.30
+version: 8.0.31
 annotations:
  truecharts.org/catagories: |
    - core
--- a/charts/enterprise/prometheus/Chart.yaml
+++ b/charts/enterprise/prometheus/Chart.yaml
@@ -3,15 +3,15 @@ appVersion: "2.44.0"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
  - condition: exporters.enabled,exporters.node-exporter.enabled
    name: node-exporter
    repository: https://deps.truecharts.org
-    version: 1.0.3
+    version: 1.0.6
  - condition: exporters.enabled,exporters.kube-state-metrics.enabled
    name: kube-state-metrics
    repository: https://deps.truecharts.org
-    version: 1.0.4
+    version: 1.0.7
 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.9
+version: 9.0.11
 annotations:
  truecharts.org/catagories: |
    - metrics
--- a/charts/enterprise/prometheus/values.yaml
+++ b/charts/enterprise/prometheus/values.yaml
@@ -1,6 +1,6 @@
 image:
  repository: tccr.io/truecharts/prometheus
-  tag: v2.44.0@sha256:555b25b68c1c0c6d9744771a0e33cd05a701b8741374e50b73aa5f275be976c5
+  tag: v2.44.0@sha256:48aa3e3b18118bea2ffddc916517a400f483f68bf2cdc48c75ebb2c6e84543fa

 thanosImage:
  repository: tccr.io/truecharts/thanos
--- a/charts/enterprise/traefik/Chart.yaml
+++ b/charts/enterprise/traefik/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "2.9.10"
+appVersion: "2.10.1"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
 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.0
+version: 18.0.4
 annotations:
  truecharts.org/catagories: |
    - network
--- a/charts/enterprise/traefik/templates/_args.tpl
+++ b/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 }}
--- a/charts/enterprise/traefik/templates/_ingressclass.tpl
+++ b/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" }}
--- a/charts/enterprise/traefik/templates/_portalhook.tpl
+++ b/charts/enterprise/traefik/templates/_portalhook.tpl
@@ -6,7 +6,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: portalhook{{ if .Values.ingressClass.enabled }}-{{ .Release.Name }}{{ end }}
+  name: {{ ternary "portalhook" (printf "portalhook-%v" .Release.Name ) $.Values.ingressClass.enabled }}
  namespace: tc-system
 data:
  {{- $ports := dict }}
--- a/charts/enterprise/traefik/templates/middlewares/addPrefix.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/addPrefix.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  addPrefix:
--- a/charts/enterprise/traefik/templates/middlewares/basic-middleware.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/basic-middleware.yaml
@@ -1,10 +1,9 @@
 {{- $values := .Values }}
-
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
+  name: {{ ternary (printf "%v-compress" $.Release.Name) "compress" $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  compress: {}
@@ -14,7 +13,7 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
+  name: {{ ternary (printf "%v-basic-ratelimit" $.Release.Name) "basic-ratelimit" $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  rateLimit:
@@ -24,7 +23,7 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-secure-headers
+  name: {{ ternary (printf "%v-basic-secure-headers" $.Release.Name) "basic-secure-headers" $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  headers:
@@ -49,11 +48,11 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}chain-basic
+  name: {{ ternary (printf "%v-chain-basic" $.Release.Name) "chain-basic" $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  chain:
    middlewares:
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-secure-headers
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
+    - 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 }}
--- a/charts/enterprise/traefik/templates/middlewares/basicauth.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/basicauth.yaml
@@ -3,9 +3,9 @@
 {{ 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
@@ -23,9 +23,9 @@ stringData:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  basicAuth:
-    secret: {{printf "%v-%v" $middlewareData.name "secret" }}
+    secret: {{ printf "%v-%v" $middlewareData.name "secret" }}
 {{ end }}
--- a/charts/enterprise/traefik/templates/middlewares/chain.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/chain.yaml
@@ -1,6 +1,6 @@
 {{- $values := .Values }}
 {{- $namespace := "tc-system" }}
-{{- if .Values.ingressClass.enabled }}
+{{- if $.Values.ingressClass.enabled }}
 {{- $namespace := ( printf "tc-system-%s" .Release.Name ) }}
 {{- end }}
 {{ range $index, $middlewareData := .Values.middlewares.chain }}
@@ -10,7 +10,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  chain:
--- a/charts/enterprise/traefik/templates/middlewares/forwardauth.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/forwardauth.yaml
@@ -5,7 +5,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  forwardAuth:
--- a/charts/enterprise/traefik/templates/middlewares/geoblock.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/geoblock.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  plugin:
--- a/charts/enterprise/traefik/templates/middlewares/ipwhitelist.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/ipwhitelist.yaml
@@ -7,7 +7,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  ipWhiteList:
--- a/charts/enterprise/traefik/templates/middlewares/ratelimit.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/ratelimit.yaml
@@ -7,7 +7,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  rateLimit:
--- a/charts/enterprise/traefik/templates/middlewares/real-ip.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/real-ip.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  plugin:
--- a/charts/enterprise/traefik/templates/middlewares/redirectScheme.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/redirectScheme.yaml
@@ -7,7 +7,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  redirectScheme:
--- a/charts/enterprise/traefik/templates/middlewares/redirectregex.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/redirectregex.yaml
@@ -7,7 +7,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  redirectRegex:
--- a/charts/enterprise/traefik/templates/middlewares/stripPrefixRegex.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/stripPrefixRegex.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  stripPrefixRegex:
--- a/charts/enterprise/traefik/templates/middlewares/tc-chains.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/tc-chains.yaml
@@ -4,23 +4,23 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-opencors-chain
+  name: {{ ternary (printf "%v-%v" $.Release.Name "tc-opencors-chain") "tc-opencors-chain" $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  chain:
    middlewares:
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-opencors-headers
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
+    - 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 }}
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: tc-closedcors-chain
+  name: {{ ternary (printf "%v-%v" $.Release.Name "tc-closedcors-chain") "tc-closedcors-chain" $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  chain:
    middlewares:
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-closedcors-headers
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
+    - 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 }}
--- a/charts/enterprise/traefik/templates/middlewares/tc-headers.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/tc-headers.yaml
@@ -4,7 +4,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-opencors-headers
+  name: {{ ternary (printf "%v-%v" $.Release.Name "tc-opencors-headers") "tc-opencors-headers" $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  headers:
@@ -34,7 +34,7 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-closedcors-headers
+  name: {{ ternary (printf "%v-%v" $.Release.Name "tc-closedcors-headers") "tc-closedcors-headers" $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  headers:
--- a/charts/enterprise/traefik/templates/middlewares/tc-nextcloud.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/tc-nextcloud.yaml
@@ -4,7 +4,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-nextcloud-redirectregex-dav
+  name: {{ ternary (printf "%v-%v" $.Release.Name "tc-nextcloud-redirectregex-dav") "tc-nextcloud-redirectregex-dav" $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  redirectRegex:
@@ -14,9 +14,9 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-nextcloud-chain
+  name: {{ ternary (printf "%v-%v" $.Release.Name "tc-nextcloud-chain") "tc-nextcloud-chain" $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  chain:
    middlewares:
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-nextcloud-redirectregex-dav
+    - name: {{ ternary (printf "%v-%v" $.Release.Name "tc-nextcloud-redirectregex-dav") "tc-nextcloud-redirectregex-dav" $.Values.ingressClass.enabled }}
--- a/charts/enterprise/traefik/templates/middlewares/theme-park.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/theme-park.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
  namespace: tc-system
 spec:
  plugin:
--- a/charts/enterprise/vaultwarden/Chart.yaml
+++ b/charts/enterprise/vaultwarden/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.28.1"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
 deprecated: false
 description: Unofficial Bitwarden compatible server written in Rust
 home: https://truecharts.org/charts/enterprise/vaultwarden
@@ -25,7 +25,7 @@ sources:
  - https://github.com/truecharts/charts/tree/master/charts/enterprise/vaultwarden
  - https://github.com/dani-garcia/vaultwarden
 type: application
-version: 20.0.26
+version: 20.0.27
 annotations:
  truecharts.org/catagories: |
    - security
--- a/charts/operators/placeholder/.helmignore
+++ b/charts/operators/placeholder/.helmignore
--- a/charts/incubator/authentik/CHANGELOG.md
+++ b/charts/incubator/authentik/CHANGELOG.md
--- a/charts/incubator/authentik/Chart.yaml
+++ b/charts/incubator/authentik/Chart.yaml
@@ -13,7 +13,7 @@ dependencies:
    repository: https://deps.truecharts.org
    version: 5.0.33
 description: authentik is an open-source Identity Provider focused on flexibility and versatility.
-home: https://truecharts.org/charts/stable/authentik
+home: https://truecharts.org/charts/incubator/authentik
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/authentik.png
 keywords:
  - authentik
@@ -24,10 +24,10 @@ maintainers:
    url: https://truecharts.org
 name: authentik
 sources:
-  - https://github.com/truecharts/charts/tree/master/charts/stable/authentik
+  - https://github.com/truecharts/charts/tree/master/charts/incubator/authentik
  - https://github.com/goauthentik/authentik
  - https://goauthentik.io/docs/
-version: 10.0.46
+version: 11.0.0
 annotations:
  truecharts.org/catagories: |
    - authentication
--- a/charts/incubator/authentik/LICENSE
+++ b/charts/incubator/authentik/LICENSE
--- a/charts/incubator/authentik/README.md
+++ b/charts/incubator/authentik/README.md
@@ -5,7 +5,7 @@
 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/stable/)
+For more information about this App, please check the docs on the TrueCharts [website](https://truecharts.org/charts/incubator/)

 **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)**

--- a/charts/incubator/authentik/docs/how_to.md
+++ b/charts/incubator/authentik/docs/how_to.md
--- a/charts/incubator/authentik/docs/img/Applications-Screen.png
+++ b/charts/incubator/authentik/docs/img/Applications-Screen.png
--- a/charts/incubator/authentik/docs/img/Create-Applications-2.png
+++ b/charts/incubator/authentik/docs/img/Create-Applications-2.png
--- a/charts/incubator/authentik/docs/img/Create-Applications-3.png
+++ b/charts/incubator/authentik/docs/img/Create-Applications-3.png
--- a/charts/incubator/authentik/docs/img/Create-Applications.png
+++ b/charts/incubator/authentik/docs/img/Create-Applications.png
--- a/charts/incubator/authentik/docs/img/Ingress-Auth.png
+++ b/charts/incubator/authentik/docs/img/Ingress-Auth.png
--- a/charts/incubator/authentik/docs/img/New-Provider-1.png
+++ b/charts/incubator/authentik/docs/img/New-Provider-1.png
--- a/charts/incubator/authentik/docs/img/New-Provider-2.png
+++ b/charts/incubator/authentik/docs/img/New-Provider-2.png
--- a/charts/incubator/authentik/docs/img/Outposts.png
+++ b/charts/incubator/authentik/docs/img/Outposts.png
--- a/charts/incubator/authentik/docs/img/Providers.png
+++ b/charts/incubator/authentik/docs/img/Providers.png
--- a/charts/incubator/authentik/docs/img/Traefik-Middleware.png
+++ b/charts/incubator/authentik/docs/img/Traefik-Middleware.png
--- a/charts/incubator/authentik/docs/img/Traefik-forwardAuth.png
+++ b/charts/incubator/authentik/docs/img/Traefik-forwardAuth.png
--- a/charts/incubator/authentik/docs/img/Update-Outpost.png
+++ b/charts/incubator/authentik/docs/img/Update-Outpost.png
--- a/charts/incubator/authentik/docs/img/Verify-2.png
+++ b/charts/incubator/authentik/docs/img/Verify-2.png
--- a/charts/incubator/authentik/docs/img/Verify-Outpost.png
+++ b/charts/incubator/authentik/docs/img/Verify-Outpost.png
--- a/charts/incubator/authentik/docs/img/Verify.png
+++ b/charts/incubator/authentik/docs/img/Verify.png
--- a/charts/incubator/authentik/docs/installation_notes.md
+++ b/charts/incubator/authentik/docs/installation_notes.md
--- a/charts/incubator/authentik/icon.png
+++ b/charts/incubator/authentik/icon.png
--- a/charts/incubator/authentik/questions.yaml
+++ b/charts/incubator/authentik/questions.yaml
--- a/charts/incubator/authentik/templates/_config.tpl
+++ b/charts/incubator/authentik/templates/_config.tpl
--- a/charts/incubator/authentik/templates/_geoip.tpl
+++ b/charts/incubator/authentik/templates/_geoip.tpl
--- a/charts/incubator/authentik/templates/_ldap.tpl
+++ b/charts/incubator/authentik/templates/_ldap.tpl
--- a/charts/incubator/authentik/templates/_proxy.tpl
+++ b/charts/incubator/authentik/templates/_proxy.tpl
--- a/charts/incubator/authentik/templates/_secret.tpl
+++ b/charts/incubator/authentik/templates/_secret.tpl
--- a/charts/incubator/authentik/templates/_worker.tpl
+++ b/charts/incubator/authentik/templates/_worker.tpl
--- a/charts/incubator/authentik/templates/common.yaml
+++ b/charts/incubator/authentik/templates/common.yaml
--- a/charts/incubator/authentik/templates/prometheusrules.yaml
+++ b/charts/incubator/authentik/templates/prometheusrules.yaml
--- a/charts/incubator/authentik/templates/servicemonitor.yaml
+++ b/charts/incubator/authentik/templates/servicemonitor.yaml
--- a/charts/incubator/authentik/values.yaml
+++ b/charts/incubator/authentik/values.yaml
--- a/charts/incubator/channels-dvr/Chart.yaml
+++ b/charts/incubator/channels-dvr/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "latest"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 12.9.5
+    version: 12.10.2
 deprecated: false
 description: Channels DVR Server
 home: https://truecharts.org/charts/incubator/channels-dvr
@@ -19,7 +19,7 @@ name: channels-dvr
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/incubator/channels-dvr
 type: application
-version: 1.0.3
+version: 1.0.4
 annotations:
  truecharts.org/catagories: |
    - media
--- a/charts/incubator/cloudflared/.helmignore
+++ b/charts/incubator/cloudflared/.helmignore
--- a/charts/incubator/cloudflared/CHANGELOG.md
+++ b/charts/incubator/cloudflared/CHANGELOG.md
--- a/charts/incubator/cloudflared/Chart.yaml
+++ b/charts/incubator/cloudflared/Chart.yaml
@@ -6,7 +6,7 @@ dependencies:
    version: 11.1.2
 deprecated: false
 description: Client for Cloudflare Tunnel, a daemon that exposes private services through the Cloudflare edge.
-home: https://truecharts.org/charts/stable/cloudflared
+home: https://truecharts.org/charts/incubator/cloudflared
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/cloudflared.png
 keywords:
  - cloudflared
@@ -18,9 +18,9 @@ maintainers:
    url: https://truecharts.org
 name: cloudflared
 sources:
-  - https://github.com/truecharts/charts/tree/master/charts/stable/cloudflared
+  - https://github.com/truecharts/charts/tree/master/charts/incubator/cloudflared
 type: application
-version: 3.0.17
+version: 4.0.0
 annotations:
  truecharts.org/catagories: |
    - network
--- a/charts/incubator/cloudflared/README.md
+++ b/charts/incubator/cloudflared/README.md
@@ -5,7 +5,7 @@
 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/stable/)
+For more information about this App, please check the docs on the TrueCharts [website](https://truecharts.org/charts/incubator/)

 **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)**

--- a/charts/incubator/cloudflared/ci/test-values.yaml
+++ b/charts/incubator/cloudflared/ci/test-values.yaml
--- a/charts/incubator/cloudflared/docs/imgs/cf-tunnel-access.png
+++ b/charts/incubator/cloudflared/docs/imgs/cf-tunnel-access.png
--- a/charts/incubator/cloudflared/docs/imgs/cf-tunnel-create.png
+++ b/charts/incubator/cloudflared/docs/imgs/cf-tunnel-create.png
--- a/charts/incubator/cloudflared/docs/imgs/cf-tunnel-hostname.png
+++ b/charts/incubator/cloudflared/docs/imgs/cf-tunnel-hostname.png
--- a/charts/incubator/cloudflared/docs/imgs/cf-tunnel-priv-network.png
+++ b/charts/incubator/cloudflared/docs/imgs/cf-tunnel-priv-network.png
--- a/charts/incubator/cloudflared/docs/imgs/cf-tunnel-token.png
+++ b/charts/incubator/cloudflared/docs/imgs/cf-tunnel-token.png
--- a/charts/incubator/cloudflared/docs/installation_notes.md
+++ b/charts/incubator/cloudflared/docs/installation_notes.md
--- a/Show More
+++ b/Show More