Merge pull request #7016 from truecharts/renovate/tccr.io-truecharts-adminer-latest

Merge pull request #7062 from truecharts/renovate/rdesktop
Merge pull request #7063 from truecharts/renovate/webtop
2023-02-06 15:15:09 +01:00 · 2023-02-06 15:10:42 +01:00 · 2023-02-06 15:10:37 +01:00 · 2023-02-06 15:06:30 +01:00 · 2023-02-06 13:41:37 +00:00 · 2023-02-06 13:41:19 +00:00
1347 changed files with 11021 additions and 3977 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1302,6 +1302,24 @@
      "contributions": [
        "doc"
      ]
+    },
+    {
+      "login": "robherley",
+      "name": "Rob Herley",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16991201?v=4",
+      "profile": "https://reb.gg",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "oblivioncth",
+      "name": "Christian Heimlich",
+      "avatar_url": "https://avatars.githubusercontent.com/u/24661585?v=4",
+      "profile": "https://github.com/oblivioncth",
+      "contributions": [
+        "doc"
+      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.github/README.md
+++ b/.github/README.md
@@ -124,7 +124,7 @@ A lot of our work is based on the great effort of others. We would love to exten
 ## Contributors ✨

 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-138-orange.svg?style=for-the-badge)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-140-orange.svg?style=for-the-badge)](#contributors)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@@ -313,6 +313,8 @@ 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/MaverickD650"><img src="https://avatars.githubusercontent.com/u/92877124?v=4?s=100" width="100px;" alt="MaverickD650"/><br /><sub><b>MaverickD650</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=MaverickD650" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Grogdor"><img src="https://avatars.githubusercontent.com/u/6863613?v=4?s=100" width="100px;" alt="Grogdor"/><br /><sub><b>Grogdor</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=Grogdor" title="Documentation">📖</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rgooler"><img src="https://avatars.githubusercontent.com/u/1108200?v=4?s=100" width="100px;" alt="Ryan Gooler"/><br /><sub><b>Ryan Gooler</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=rgooler" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://reb.gg"><img src="https://avatars.githubusercontent.com/u/16991201?v=4?s=100" width="100px;" alt="Rob Herley"/><br /><sub><b>Rob Herley</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=robherley" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/oblivioncth"><img src="https://avatars.githubusercontent.com/u/24661585?v=4?s=100" width="100px;" alt="Christian Heimlich"/><br /><sub><b>Christian Heimlich</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=oblivioncth" title="Documentation">📖</a></td>
    </tr>
  </tbody>
 </table>
--- a/.github/SUPPORT.md
+++ b/.github/SUPPORT.md
@@ -11,17 +11,17 @@ 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` | :white_check_mark:     | :x:        | :x:    | Advised to update to 22.12.0 release of [TrueNAS SCALE](https://www.truenas.com/docs/scale/scalereleasenotes/) |  |
+| ---------------- | -------- | ---------------------- | ------------------------- | --------------------- | -------------------------------------------------------------------------------------------------------------- | --- |
+| 22.02.4 or prior | `master` | :white_check_mark:     | :x:                       | :x:                   | Advised to update to 22.12.0 release of [TrueNAS SCALE](https://www.truenas.com/docs/scale/scalereleasenotes/) |     |
 | 22.12.0          | `master` | :white_check_mark:     | :white_check_mark:        | :white_check_mark:    | Most Stable Release as of 2022-12-13                                                                           |
 | Nightly          | `master` | :white_check_mark:     | :x:                       | :white_check_mark:    | Please only submit bug reports during codefreeze                                                               |
+
 ::: warning Support Guidelines

 Our [Discord](https://discord.gg/tVsPTHWTtr) support (the ticketing system inside #support) is primarily limited to what is covered by our written guides. This includes installing, linking and editing apps. This doesn't mean the actual setup of the application. All #support tickets covered by the staff are done so in a **best effort** policy.

 :::

-
 ## Stable Train Charts

 We provide direct support for getting `stable` train charts working on our [discord](https://discord.gg/tVsPTHWTtr) inside the **#support** channel.
--- a/.github/ct-install.yaml
+++ b/.github/ct-install.yaml
@@ -13,46 +13,34 @@ chart-dirs:
  - charts/SCALE
 excluded-charts:
  - charts/dependency/subchart
-  - charts/incubator/sdtd
+  - charts/incubator/frigate
+  - charts/incubator/orbital-sync
+  - charts/incubator/plex-meta-manager
+  - charts/library/common
+  - charts/stable/alertmanager-bot
  - charts/stable/alertmanager-bot
  - charts/stable/alertmanager-discord
  - charts/stable/amcrest2mqtt
+  - charts/stable/discordgsm
  - charts/stable/facebox
-  - charts/stable/rdesktop
  - charts/stable/foundryvtt
+  - charts/stable/foundryvtt
+  - charts/stable/frigate
  - charts/stable/heimdall
  - charts/stable/multus
+  - charts/stable/orbital-sync
+  - charts/stable/plex-meta-manager
  - charts/stable/pod-gateway
  - charts/stable/promcord
+  - charts/stable/promcord
+  - charts/stable/rdesktop
  - charts/stable/reg
  - charts/stable/ser2sock
+  - charts/stable/storj-node
+  - charts/stable/tailscale
+  - charts/stable/webtop
  - charts/stable/zalando-postgres-cluster
  - charts/stable/zigbee2mqtt
-  - charts/stable/alertmanager-bot
-  - charts/stable/storj-node
-  - charts/incubator/frigate
-  - charts/stable/frigate
-  - charts/stable/orbital-sync
-  - charts/incubator/orbital-sync
-  - charts/incubator/amcrest2mqtt
-  - charts/library/common
-  - charts/stable/foundryvtt
-  - charts/stable/promcord
-  - charts/stable/tailscale
-  - charts/incubator/zigbee2mqtt
-  - charts/dev/alienswarm-reactivedrop
-  - charts/dev/arksurvivalevolved
-  - charts/dev/arma3
-  - charts/dev/arma3exilemod
-  - charts/dev/assettocorsa
-  - charts/dev/server-7daystodie
-  - charts/dev/craftopia
-  - charts/dev/alienswarm
-  - charts/dev/csgo
-  - charts/dev/cstrike1-6
-  - charts/dev/cstrikeconditionzero
-  - charts/stable/plex-meta-manager
-  - charts/incubator/plex-meta-manager
 chart-repos:
  - truecharts=https://charts.truecharts.org
  - truecharts-library=https://library-charts.truecharts.org
--- a/.github/renovate-config.js
+++ b/.github/renovate-config.js
@@ -1,7 +1,7 @@
 module.exports = {
  dryRun: false,
-  username: 'truecharts-admin',
-  gitAuthor: 'truecharts-admin <bot@truecharts.org>',
+  username: "truecharts-admin",
+  gitAuthor: "truecharts-admin <bot@truecharts.org>",
  onboarding: false,
  platform: "github",
  repositories: ["truecharts/charts"],
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -8,7 +8,7 @@
  "commitMessageExtra": "to {{newVersion}}",
  "commitMessageSuffix": "",
  "rebaseWhen": "conflicted",
-  "prConcurrentLimit": 25,
+  "prConcurrentLimit": 50,
  "timezone":"Europe/Amsterdam",
  "pinDigests": true,
  "automerge": true,
@@ -181,17 +181,109 @@
    {
      "matchDatasources": ["docker"],
      "versioning": "regex:^v(?<major>\\d+)-(?<minor>\\d+)$",
-      "matchPackagePrefixes": ["tccr.io/truecharts/jupyter-"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/jupyter"],
+      "groupName": "jupyter",
    },
    {
      "matchDatasources": ["docker"],
      "versioning": "regex:^(?<major>\\d{1})(?<minor>\\d{1})(?<patch>\\d{2})$",
-      "matchPackagePrefixes": ["tccr.io/truecharts/jitsi-"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/jitsi"],
+      "groupName": "jitsi",
    },
    {
      "matchDatasources": ["docker"],
-      "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)_\\d+$",
-      "matchPackagePrefixes": ["tccr.io/truecharts/immich-"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/immich"],
+      "groupName": "immich",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/neko"],
+      "groupName": "neko",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/webtop"],
+      "groupName": "webtop",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/zabbix"],
+      "groupName": "zabbix",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/vikunja"],
+      "groupName": "vikunja",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/ml-workspace"],
+      "groupName": "ml-workspace",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/bungeecord"],
+      "groupName": "bungeecord",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/minecraft-java"],
+      "groupName": "minecraft-java",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/mealie"],
+      "groupName": "mealie",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/librephotos"],
+      "groupName": "librephotos",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/kitchenowl"],
+      "groupName": "kitchenowl",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/authentik"],
+      "groupName": "authentik",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/lama-cleaner"],
+      "groupName": "lama-cleaner",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/rickroll"],
+      "groupName": "rickroll",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/docspell"],
+      "groupName": "docspell",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/restreamer"],
+      "groupName": "restreamer",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/penpot"],
+      "groupName": "penpot",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/rdesktop"],
+      "groupName": "rdesktop",
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/ersatztv"],
+      "groupName": "ersatztv",
    }
  ]
 }
--- a/.github/scripts/build-catalog.sh
+++ b/.github/scripts/build-catalog.sh
@@ -92,7 +92,7 @@ patch_apps() {
    echo "---" >> ${target}/app-readme.md
    echo "" >> ${target}/app-readme.md
    echo "TrueCharts can only exist due to the incredible effort of our staff." >> ${target}/app-readme.md
-    echo "Please consider making a [donation](https://truecharts.org/about/sponsor) or contributing back to the project any way you can!" >> ${target}/app-readme.md
+    echo "Please consider making a [donation](https://truecharts.org/sponsor) or contributing back to the project any way you can!" >> ${target}/app-readme.md
 }
 export -f patch_apps

--- a/.github/scripts/updateTraefikMiddlewareVersions.sh
+++ b/.github/scripts/updateTraefikMiddlewareVersions.sh
@@ -1,10 +1,10 @@
 #! /bin/bash

 trainsPath="./charts"
-traefikTrain="stable"
+traefikTrain="enterprise"

 get_latest_release() {
-    # Get latest release from GitHub api
+    # Get latest release from GitHub api, NOTE: Remove the header when running locally (or add a valid token)
    curl --silent \
         --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
         --url "https://api.github.com/repos/$1/releases/latest" |
--- a/.github/workflows/catalog-test.yaml
+++ b/.github/workflows/catalog-test.yaml
@@ -15,7 +15,7 @@ jobs:
    name: Test SCALE Catalog
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:f0ecaa533663f88346b745eb497f6f6acf63561ad88e345cd71c8280963b8c1e
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:3b53132c6c6e14393f8f69e64e2237c8460a466753c285542324aa993ed1795d
    steps:
      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
        name: Checkout
--- a/.github/workflows/charts-lint.yaml
+++ b/.github/workflows/charts-lint.yaml
@@ -119,7 +119,7 @@ jobs:
            helmv3
          helm: "3.8.0"

-      - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
        with:
          python-version: "3.10"

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

-      - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
        with:
          python-version: "3.10"

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

-      - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
        with:
          python-version: "3.10"

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

-      - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
        with:
          python-version: "3.10"

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

-      - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
        with:
          python-version: "3.10"

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

-      - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
        with:
          python-version: "3.10"

@@ -322,42 +322,42 @@ jobs:
          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
--- a/.github/workflows/charts-release.yaml
+++ b/.github/workflows/charts-release.yaml
@@ -16,7 +16,7 @@ jobs:
    outputs:
      ref: ${{ steps.save-commit-hash.outputs.commit_hash }}
    container:
-      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:f0ecaa533663f88346b745eb497f6f6acf63561ad88e345cd71c8280963b8c1e
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:3b53132c6c6e14393f8f69e64e2237c8460a466753c285542324aa993ed1795d
    steps:
      - name: Install Kubernetes tools
        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
@@ -121,13 +121,13 @@ jobs:
                mv -f website/docs/charts/${train}/${chart}/CHANGELOG.md tmp/website/docs/charts/${train}/${chart}/CHANGELOG.md || :
                mv -f website/docs/charts/${train}/${chart}/helm-security.md tmp/website/docs/charts/${train}/${chart}/helm-security.md || :
                mv -f website/docs/charts/${train}/${chart}/container-security.md tmp/website/docs/charts/${train}/${chart}/container-security.md || :
-                
+
                # remove old docs everywhere and recreate based on charts repo
                rm -rf website/docs/charts/*/${chart} || :
                mkdir -p website/docs/charts/${train}/${chart} || echo "chart path already exists, continuing..."
                yes | cp -rf charts/${train}/${chart}/docs/* website/docs/charts/${train}/${chart}/ 2>/dev/null || :
                yes | cp -rf charts/${train}/${chart}/icon.png website/static/img/hotlink-ok/chart-icons/${chart}.png 2>/dev/null || :
-                
+
                # Copy over kept documents
                mv -f tmp/website/docs/charts/${train}/${chart}/CHANGELOG.md website/docs/charts/${train}/${chart}/CHANGELOG.md 2>/dev/null || :
                mv -f tmp/website/docs/charts/${train}/${chart}/helm-security.md website/docs/charts/${train}/${chart}/helm-security.md 2>/dev/null || :
--- 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@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
        with:
          python-version: "3.10"

@@ -163,7 +163,9 @@ jobs:
        uses: nolar/setup-k3d-k3s@v1
        with:
          version: v1.24
-          k3d-args: -p 31990-31999:31990-31999@server:0
+          # Flags found here https://github.com/k3d-io/k3d
+          k3d-args: --k3s-arg --disable=metrics-server@server:*
+          github-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Remove node taints
        run: |
          kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true
@@ -195,7 +197,7 @@ jobs:
            helmv3
          helm: "3.8.0"

-      - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
        with:
          python-version: "3.10"

@@ -206,7 +208,9 @@ jobs:
        uses: nolar/setup-k3d-k3s@v1
        with:
          version: v1.24
-          k3d-args: -p 31990-31999:31990-31999@server:0
+          # Flags found here https://github.com/k3d-io/k3d
+          k3d-args: --k3s-arg --disable=metrics-server@server:*
+          github-token: ${{ secrets.GITHUB_TOKEN }}

      - name: Remove node taints
        run: |
@@ -239,7 +243,7 @@ jobs:
            helmv3
          helm: "3.8.0"

-      - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
        with:
          python-version: "3.10"

@@ -250,7 +254,9 @@ jobs:
        uses: nolar/setup-k3d-k3s@v1
        with:
          version: v1.24
-          k3d-args: -p 31990-31999:31990-31999@server:0
+          # Flags found here https://github.com/k3d-io/k3d
+          k3d-args: --k3s-arg --disable=metrics-server@server:*
+          github-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Remove node taints
        run: |
          kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true
@@ -282,7 +288,7 @@ jobs:
            helmv3
          helm: "3.8.0"

-      - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
        with:
          python-version: "3.10"

@@ -293,7 +299,9 @@ jobs:
        uses: nolar/setup-k3d-k3s@v1
        with:
          version: v1.24
-          k3d-args: -p 31990-31999:31990-31999@server:0
+          # Flags found here https://github.com/k3d-io/k3d
+          k3d-args: --k3s-arg --disable=metrics-server@server:*
+          github-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Remove node taints
        run: |
          kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true
@@ -325,7 +333,7 @@ jobs:
            helmv3
          helm: "3.8.0"

-      - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
        with:
          python-version: "3.10"

@@ -336,7 +344,9 @@ jobs:
        uses: nolar/setup-k3d-k3s@v1
        with:
          version: v1.24
-          k3d-args: -p 31990-31999:31990-31999@server:0
+          # Flags found here https://github.com/k3d-io/k3d
+          k3d-args: --k3s-arg --disable=metrics-server@server:*
+          github-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Remove node taints
        run: |
          kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true
@@ -368,7 +378,7 @@ jobs:
            helmv3
          helm: "3.8.0"

-      - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 # v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
        with:
          python-version: "3.10"

@@ -379,7 +389,9 @@ jobs:
        uses: nolar/setup-k3d-k3s@v1
        with:
          version: v1.24
-          k3d-args: -p 31990-31999:31990-31999@server:0
+          # Flags found here https://github.com/k3d-io/k3d
+          k3d-args: --k3s-arg --disable=metrics-server@server:*
+          github-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Remove node taints
        run: |
          kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true
@@ -409,42 +421,42 @@ jobs:
          res4="${{needs.install-charts4.result}}"
          res5="${{needs.install-charts5.result}}"
          res6="${{needs.install-charts6.result}}"
-          
+
          if [[ $res1 == "success" || $res1 == "skipped" ]]; then
            echo "install tests 1 successfull..."
          else
            echo "install tests 1 error, stopping due to failure..."
            exit 1
          fi
-          
+
          if [[ $res2 == "success" || $res2 == "skipped" ]]; then
            echo "install tests 2 successfull..."
          else
            echo "install tests 2 error, stopping due to failure..."
            exit 1
          fi
-          
+
          if [[ $res3 == "success" || $res3 == "skipped" ]]; then
            echo "install tests 3 successfull..."
          else
            echo "install tests 3 error, stopping due to failure..."
            exit 1
          fi
-          
+
          if [[ $res4 == "success" || $res4 == "skipped" ]]; then
            echo "install tests 4 successfull..."
          else
            echo "install tests 4 error, stopping due to failure..."
            exit 1
          fi
-          
+
          if [[ $res5 == "success" || $res5 == "skipped" ]]; then
            echo "install tests 5 successfull..."
          else
            echo "install tests 5 error, stopping due to failure..."
            exit 1
          fi
-          
+
          if [[ $res6 == "success" || $res6 == "skipped" ]]; then
            echo "install tests 6 successfull..."
          else
--- a/.github/workflows/daily.yaml
+++ b/.github/workflows/daily.yaml
@@ -1,24 +1,33 @@
 name: "Chore: Daily Tasks"

 on:
+  schedule:
+    - cron: '0 0 * * *'
  workflow_dispatch:

+permissions:
+  issues: write
+  pull-requests: write
+
+concurrency:
+  group: lock
+
 jobs:
  generate-readme:
    runs-on: ubuntu-latest
    name: "Generate readme files"
    container:
-      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:f0ecaa533663f88346b745eb497f6f6acf63561ad88e345cd71c8280963b8c1e
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:3b53132c6c6e14393f8f69e64e2237c8460a466753c285542324aa993ed1795d
    steps:
      - name: Checkout
        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
        with:
          token: ${{ secrets.BOT_TOKEN }}
-          fetch-depth: 0
-          
+          fetch-depth: 1
+
      - name: Setting repo parent dir as safe safe.directory
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
-        
+
      - name: generate readme.md
        shell: bash
        run: |
@@ -44,7 +53,15 @@ jobs:
              fi
            done
          done
-          
+
+      - name: Checkout
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+        with:
+          repository: truecharts/website
+          path: website
+          fetch-depth: 1
+          token: ${{ secrets.BOT_TOKEN }}
+
      - name: Bump and Sync
        shell: bash
        run: |
@@ -79,11 +96,40 @@ jobs:
              echo "Attempting to update sources of ${chartname}..."
              echo "Using go-yq verion: <$(go-yq -V)>"
              # Get all sources (except truecharts)
-              curr_sources=$(go-yq '.sources[] | select(. != "https://github.com/truecharts*")' "${chart}/Chart.yaml")
+              curr_sources=$(go-yq '.sources[] | select(. != "https://github.com/truecharts*" and . != "https://ghcr*" and . != "docker.io*" and . != "https://docker.io*" and . != "https://hub.docker*" and . != "https://fleet.*" and . != "https://github.com/truecharts/containers/tree/master/mirror/*" and . != "https://public.ecr.aws*" and . != "https://ocir.io*" and . != "https://gcr*" and . != "https://azurecr*"  and . != "https://quay*" and . != "https://lscr*" and . != "https://github.com/truecharts/containers*" and . == "http*")' "${chart}/Chart.yaml")
              # Empty sources list in-place
              go-yq -i 'del(.sources.[])' "${chart}/Chart.yaml"
              # Add truechart source
              tcsource="https://github.com/truecharts/charts/tree/master/charts/$train/$chartname" go-yq -i '.sources += env(tcsource)' "${chart}/Chart.yaml"
+              container=$(cat website/docs/charts/description_list.md | grep "\[${chartname}\]" | cut -f3 -d '|' | grep -v 'Not Found' || echo "")
+              if [ ! -z "$container" ]; then
+                prefix="https://hub.docker.com/"
+                container=${container#https://}
+                if echo ${container} | grep 'tccr'; then
+                container=${container#tccr.io}
+                container="https://github.com/truecharts/containers/tree/master/mirror"
+                prefix=""
+                elif echo ${container} | grep 'lscr'; then
+                container="https://fleet.linuxserver.io/"
+                prefix=""
+                elif echo ${container} | grep 'gcr'; then
+                prefix="https://"
+                elif echo ${container} | grep 'azurecr'; then
+                prefix="https://"
+                elif echo ${container} | grep 'public.ecr.aws'; then
+                prefix="https://"
+                elif echo ${container} | grep 'ocir.io'; then
+                prefix="https://"
+                elif echo ${container} | grep 'hub.docker'; then
+                prefix="https://"
+                elif echo ${container} | grep 'docker.io'; then
+                container=${container#docker.io}
+                prefix="https://hub.docker.com"
+                elif echo ${container} | grep 'hub.docker'; then
+                prefix="https://"
+                fi
+                container="${prefix}${container}" go-yq -i '.sources += env(container) | .sources |= unique' "${chart}/Chart.yaml"
+              fi
              # Add the rest of the sources
              while IFS= read -r line; do
                src="$line" go-yq -i '.sources += env(src)' "${chart}/Chart.yaml" || echo "src set error"
@@ -91,7 +137,7 @@ jobs:
              echo "Sources of ${chartname} updated!"
              }
          export -f sync_tag
-          
+
          for train in enterprise stable incubator dependency; do
            echo "Correcting Chart.yaml for Train: ${train}..."
            for chart in $(ls "charts/${train}"); do
@@ -99,7 +145,7 @@ jobs:
              sync_tag "charts/${train}/${chart}" "${chart}" "${train}"
            done
          done
-          
+
      - name: Cleanup
        run: |
          rm -rf changes.json
@@ -113,12 +159,12 @@ jobs:
          git add --all
          git commit -sm "Commit daily changes" || exit 0
          git push
-          
+
  generate-security-reports:
    runs-on: ubuntu-latest
    name: "Generate Security Reports"
    container:
-      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:f0ecaa533663f88346b745eb497f6f6acf63561ad88e345cd71c8280963b8c1e
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:3b53132c6c6e14393f8f69e64e2237c8460a466753c285542324aa993ed1795d
    steps:
      - name: Install Kubernetes tools
        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
@@ -139,7 +185,7 @@ jobs:
        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
        with:
          token: ${{ secrets.BOT_TOKEN }}
-          fetch-depth: 0
+          fetch-depth: 1

      - name: Setting repo parent dir as safe safe.directory
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
@@ -151,7 +197,7 @@ jobs:
          repository: truecharts/website
          token: ${{ secrets.BOT_TOKEN }}
          path: website
-          
+
      - name: fetch dependencies
        shell: bash
        run: |
@@ -182,7 +228,7 @@ jobs:
              echo "" >> website/docs/charts/${train}/${chartname}/helm-security.md
              echo "##### Scan Results" >> website/docs/charts/${train}/${chartname}/helm-security.md
              echo "" >> website/docs/charts/${train}/${chartname}/helm-security.md
-              trivy config -f template --template "@./templates/trivy-config.tpl" ${chart}/render >> website/docs/charts/${train}/${chartname}/helm-security.md || echo "trivy scan failed..."
+              trivy config --namespaces builtin.kubernetes.* -f template --template "@./templates/trivy-config.tpl" ${chart}/render >> website/docs/charts/${train}/${chartname}/helm-security.md || echo "trivy scan failed..."
              }
          container_sec_scan() {
              local chart="$1"
@@ -217,15 +263,20 @@ jobs:
              local train="$3"
              echo "sanitising website output for ${chartname}..."
              rm -rf ${chart}/render
-              sed -i 's|<br>|<br />|g' website/docs/charts/${train}/${chartname}/helm-security.md
-              # sed -i 's|<br>|<br />|g' website/docs/charts/${train}/${chartname}/container-security.md
-              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
+              sed -i 's|<br>|<br />|g' website/docs/charts/${train}/${chartname}/helm-security.md ||:
+              sed -i 's|<br>|<br />|g' website/docs/charts/${train}/${chartname}/container-security.md ||:
+              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 incubator dependency; do
            echo "Processing Charts for Train: ${train}..."
            for chart in $(ls "charts/${train}"); do
-              render "charts/${train}/${chart}" ${chart} ${train} && helm_sec_scan "charts/${train}/${chart}" ${chart} ${train} && cleanfiles "charts/${train}/${chart}" ${chart} ${train} || echo "processing failed for ${chart}"
+              render "charts/${train}/${chart}" ${chart} ${train} || echo "rendering failed for ${chart}"
+             helm_sec_scan "charts/${train}/${chart}" ${chart} ${train} || echo "helm chart processing failed for ${chart}"
+              if [ ${train} == "enterprise" ]; then
+                container_sec_scan "charts/${train}/${chart}" ${chart} ${train} || echo "container processing failed for ${chart}"
+              fi
+              cleanfiles "charts/${train}/${chart}" ${chart} ${train} || echo "cleaning failed for ${chart}"
            done
          done
          echo "finsihed security scan"
@@ -239,3 +290,18 @@ jobs:
          git add --all
          git commit -sm "Commit released docs for TrueCharts" || exit 0
          git push
+
+  lock-threads:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v4
+        with:
+          github-token: ${{ secrets.BOT_TOKEN }}
+          issue-inactive-days: '7'
+          exclude-any-issue-labels: ''
+          issue-comment: 'This issue is locked to prevent necro-posting on closed issues. Please create a new issue or contact staff on discord of the problem persists'
+          issue-lock-reason: ''
+          pr-inactive-days: '7'
+          pr-comment: 'This PR is locked to prevent necro-posting on closed PRs. Please create a issue or contact staff on discord if you want to further discuss this'
+          pr-lock-reason: 'resolved'
+          log-output: true
--- a/.github/workflows/pr-validate.yaml
+++ b/.github/workflows/pr-validate.yaml
@@ -78,7 +78,7 @@ jobs:
      - charts-test
      - charts-lint
      - print_head_msg
-    if: needs.print_head_msg.outputs.head-commit-message == 'Commit bumped Chart Version' 
+    if: needs.print_head_msg.outputs.head-commit-message == 'Commit bumped Chart Version'
    name: Automerge build
    runs-on: ubuntu-latest
    steps:
--- a/.github/workflows/renovate-bump.yaml
+++ b/.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:v3.1.1@sha256:f0ecaa533663f88346b745eb497f6f6acf63561ad88e345cd71c8280963b8c1e
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:3b53132c6c6e14393f8f69e64e2237c8460a466753c285542324aa993ed1795d
    steps:
      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
        name: Checkout
--- 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@cf443181a287e16154f0261dc9a756a19f16b035 # v34.97.5
+        uses: renovatebot/github-action@0fce79bdbacb2bf5e92fc93944dc94e351868eb3 # v34.124.3
        with:
          configurationFile: .github/renovate-config.js
          token: ${{ secrets.BOT_TOKEN }}
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -23,7 +23,7 @@ repos:
      - id: requirements-txt-fixer # sorts entries in requirements.txt.
      - id: check-added-large-files # prevents giant files from being committed.
      - id: check-yaml # checks yaml files for parseable syntax.
-        exclude: (templates\/.*|questions.yaml|chart_schema.yaml)
+        exclude: (templates\/.*|crds\/.*|questions.yaml|chart_schema.yaml)
      - id: detect-private-key # detects the presence of private keys.

  - repo: https://github.com/pre-commit/pygrep-hooks
@@ -36,5 +36,5 @@ repos:
    rev: v2.5.1
    hooks:
      - id: prettier
-        exclude: (templates\/.*|README.md|CHANGELOG.md|questions.yaml|devcontainer.json)
+        exclude: (templates\/.*|crds\/.*|README.md|CHANGELOG.md|questions.yaml|devcontainer.json)
        files: \.(js|ts|jsx|tsx|css|less|html|json|markdown|md|yaml|yml)$
--- a/charts/dependency/clickhouse/Chart.yaml
+++ b/charts/dependency/clickhouse/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "22.12.3.5"
+appVersion: "23.1.3.5"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
@@ -20,10 +20,10 @@ maintainers:
 name: clickhouse
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/clickhouse
+  - https://hub.docker.com/clickhouse/clickhouse-server
  - https://clickhouse.com/
-  - https://hub.docker.com/r/yandex/clickhouse-server
 type: application
-version: 3.0.15
+version: 3.0.19
 annotations:
  truecharts.org/catagories: |
    - database
--- a/charts/dependency/clickhouse/values.yaml
+++ b/charts/dependency/clickhouse/values.yaml
@@ -1,7 +1,7 @@
 image:
  repository: tccr.io/truecharts/clickhouse
  pullPolicy: IfNotPresent
-  tag: 22.12.3.5@sha256:539315e8dcdc99674581fc285da14176cb92cfef6efb742d9ee1f7a1d744aa03
+  tag: 23.1.3.5@sha256:3da895503f8a0e59fb66a730b312b81fced672d85d1eced4cbaec4a772178daa

 controller:
  type: statefulset
@@ -68,3 +68,6 @@ env:

 portal:
  enabled: false
+
+manifests:
+  enabled: false
--- a/charts/dependency/collabora-online/Chart.yaml
+++ b/charts/dependency/collabora-online/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "22.05.9.2"
+appVersion: "22.05.10.1"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
@@ -18,11 +18,10 @@ maintainers:
 name: collabora-online
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/collabora-online
-  - https://hub.docker.com/r/collabora/code
  - https://sdk.collaboraonline.com/contents.html
  - https://github.com/CollaboraOnline/online/tree/master/kubernetes/helm
 type: application
-version: 14.0.14
+version: 14.0.16
 annotations:
  truecharts.org/catagories: |
    - office
--- a/charts/dependency/collabora-online/values.yaml
+++ b/charts/dependency/collabora-online/values.yaml
@@ -1,6 +1,6 @@
 image:
  repository: tccr.io/truecharts/collabora
-  tag: 22.05.9.2.1@sha256:2dc2fd91a9899a67f62899c16a466d955675b4fef163de1072b5569fcc4691c1
+  tag: 22.05.10.1.1@sha256:e5ccc448db2b0cce93cf14c5feb02cd7ba7e3a42deaa7abaff63b6a74e527ccf
  pullPolicy: IfNotPresent

 controller:
--- a/charts/dependency/mariadb/Chart.yaml
+++ b/charts/dependency/mariadb/Chart.yaml
@@ -21,11 +21,12 @@ maintainers:
 name: mariadb
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/mariadb
+  - https://hub.docker.com/bitnami/mariadb
  - https://github.com/bitnami/bitnami-docker-mariadb
  - https://github.com/prometheus/mysqld_exporter
  - https://mariadb.org
 type: application
-version: 5.0.21
+version: 5.0.27
 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: 10.10.2@sha256:08719a665302a3c3244b7df8d91f3f5b8919a5fa8b28a0383526e2634240a161
+  tag: 10.10.2@sha256:f6f907c682a38a9f9abf3f6a376bc65f184351fdecea8e5edf272821e9915b6f

 controller:
  # -- Set the controller type.
@@ -122,3 +122,6 @@ existingSecret: ""

 portal:
  enabled: false
+
+manifests:
+  enabled: false
--- a/charts/dependency/memcached/Chart.yaml
+++ b/charts/dependency/memcached/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "1.6.17"
+appVersion: "1.6.18"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
@@ -20,10 +20,11 @@ maintainers:
 name: memcached
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/memcached
+  - https://hub.docker.com/bitnami/memcached
  - https://github.com/bitnami/bitnami-docker-memcached
  - http://memcached.org/
 type: application
-version: 5.0.19
+version: 5.0.26
 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: 1.6.17@sha256:9107bb1876ee8cfe6d62c07abda9610af6cbde2b44c1b831c2d3e59e27aa8b1b
+  tag: 1.6.18@sha256:b83214bffc05340d5a896fdb326be8eaa8a4bac9c4b64e35c0dfc934f504c034

 service:
  main:
@@ -12,3 +12,6 @@ service:

 portal:
  enabled: false
+
+manifests:
+  enabled: false
--- a/charts/dependency/mongodb/Chart.yaml
+++ b/charts/dependency/mongodb/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "6.0.3"
+appVersion: "6.0.4"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
@@ -20,11 +20,11 @@ maintainers:
 name: mongodb
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/mongodb
-  - https://hub.docker.com/r/bitnami/mongodb
+  - https://hub.docker.com/bitnami/mongodb
  - https://github.com/bitnami/bitnami-docker-mongodb
  - https://www.mongodb.com
 type: application
-version: 4.0.22
+version: 4.0.29
 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: 6.0.3@sha256:1bc1281b8d8c9728a0b629b44a89f5aaf1bb548a92a1404f924022741e75990a
+  tag: 6.0.4@sha256:0b02531b780d72d16c39c819b44320be50c33e58c24d0419636909ec4f971c5e

 controller:
  # -- Set the controller type.
@@ -123,3 +123,6 @@ env:

 portal:
  enabled: false
+
+manifests:
+  enabled: false
--- a/charts/dependency/postgresql/Chart.yaml
+++ b/charts/dependency/postgresql/Chart.yaml
@@ -21,9 +21,10 @@ maintainers:
 name: postgresql
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/postgresql
+  - https://hub.docker.com/bitnami/postgresql
  - https://www.postgresql.org/
 type: application
-version: 11.0.18
+version: 11.0.24
 annotations:
  truecharts.org/catagories: |
    - database
--- a/charts/dependency/postgresql/values.yaml
+++ b/charts/dependency/postgresql/values.yaml
@@ -1,7 +1,7 @@
 image:
  repository: tccr.io/truecharts/postgresql
  pullPolicy: IfNotPresent
-  tag: 14.6.0@sha256:fe70c43d2770d08bd23db6adc25dce8b2ee2812d7bd821a2dfa9d0f79fe135f7
+  tag: 14.6.0@sha256:80f8f4d90e915540a783d4f32f14506abad433403aa1e3bd77705fda5ce3fc0a

 controller:
  # -- Set the controller type.
@@ -127,3 +127,6 @@ env:

 portal:
  enabled: false
+
+manifests:
+  enabled: false
--- a/charts/dependency/promtail/Chart.yaml
+++ b/charts/dependency/promtail/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "2.7.1"
+appVersion: "2.7.3"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
@@ -19,11 +19,12 @@ maintainers:
 name: promtail
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/promtail
+  - https://hub.docker.com/grafana/promtail
  - https://github.com/grafana/loki
  - https://grafana.com/oss/loki/
  - https://grafana.com/docs/loki/latest/
 type: application
-version: 6.0.10
+version: 6.0.14
 annotations:
  truecharts.org/catagories: |
    - metrics
--- a/charts/dependency/promtail/values.yaml
+++ b/charts/dependency/promtail/values.yaml
@@ -1,6 +1,6 @@
 image:
  repository: ghcr.io/truecharts/promtail
-  tag: 2.7.1@sha256:94be035cd342c5d4a088394fd68e3bb3f1071eeb1ab20aeb1886b7f14d842cce
+  tag: 2.7.3@sha256:0ebced1842adafae322f7acd4236442d7dc7d7870cbe956f41cd78158c2f0d2b

 # controller:
 #   # -- Set the controller type.
@@ -253,3 +253,6 @@ config:
    scrape_configs:
      {{- tpl .Values.config.snippets.scrapeConfigs . | nindent 2 }}
      {{- tpl .Values.config.snippets.extraScrapeConfigs . | nindent 2 }}
+
+manifests:
+  enabled: false
--- a/charts/dependency/redis/Chart.yaml
+++ b/charts/dependency/redis/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "7.0.7"
+appVersion: "7.0.8"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
@@ -20,10 +20,11 @@ maintainers:
 name: redis
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/redis
+  - https://hub.docker.com/bitnami/redis
  - https://github.com/bitnami/bitnami-docker-redis
  - http://redis.io/
 type: application
-version: 5.0.24
+version: 5.0.30
 annotations:
  truecharts.org/catagories: |
    - database
--- a/charts/dependency/redis/values.yaml
+++ b/charts/dependency/redis/values.yaml
@@ -1,7 +1,7 @@
 image:
  repository: tccr.io/truecharts/redis
  pullPolicy: IfNotPresent
-  tag: 7.0.7@sha256:b585665b978f53aac8c40452acf0110a58e1caa7cbb251590b3e63ba4e0275c9
+  tag: 7.0.8@sha256:ba0da0977791dae5c5df0114f13caa596d99b57aa16a2eb43efaa27ebe933faa

 controller:
  # -- Set the controller type.
@@ -207,3 +207,6 @@ persistence:

 portal:
  enabled: false
+
+manifests:
+  enabled: false
--- a/charts/dependency/solr/Chart.yaml
+++ b/charts/dependency/solr/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "9.1.0"
+appVersion: "9.1.1"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
@@ -20,10 +20,10 @@ maintainers:
 name: solr
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/solr
+  - https://hub.docker.com/bitnami/solr
  - https://github.com/apache/solr
-  - https://hub.docker.com/r/bitnami/solr/
 type: application
-version: 2.0.20
+version: 2.0.28
 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: 9.1.0@sha256:749abaf8b33374642c7eaa9309e9aacda10d23231fab2d9857791f418624c09c
+  tag: 9.1.1@sha256:678ca033852415c0d8a8bc77e0fd51f6edee01fc0fa755d8576d8d60b6dfb343

 controller:
  # -- Set the controller type.
@@ -138,3 +138,6 @@ env:

 portal:
  enabled: true
+
+manifests:
+  enabled: false
--- a/charts/enterprise/blocky/Chart.yaml
+++ b/charts/enterprise/blocky/Chart.yaml
@@ -7,7 +7,7 @@ dependencies:
  - condition: redis.enabled
    name: redis
    repository: https://charts.truecharts.org
-    version: 5.0.24
+    version: 5.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
@@ -22,11 +22,11 @@ maintainers:
 name: blocky
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/enterprise/blocky
+  - https://hub.docker.com/spx01/blocky
  - https://0xerr0r.github.io/blocky/
  - https://github.com/0xERR0R/blocky
  - https://github.com/Mozart409/blocky-frontend
-  - https://hub.docker.com/r/spx01/blocky
-version: 4.0.16
+version: 4.0.20
 annotations:
  truecharts.org/catagories: |
    - network
--- a/charts/enterprise/blocky/values.yaml
+++ b/charts/enterprise/blocky/values.yaml
@@ -13,7 +13,7 @@ WebUIImage:
 k8sgatewayImage:
  repository: tccr.io/truecharts/k8s_gateway
  pullPolicy: IfNotPresent
-  tag: 0.3.2@sha256:594fd6990eb2e0af1df7df8ba76cb3ca66232f46c5df5ebf786a45dd19777ae5
+  tag: 0.3.3@sha256:246e7006afaf57a398b02e417a31d6f14fb43562901388772778f60be586b807

 controller:
  # -- Set additional annotations on the deployment/statefulset/daemonset
--- a/charts/enterprise/cert-manager/.helmignore
+++ b/charts/enterprise/cert-manager/.helmignore
--- a/charts/enterprise/cert-manager/CHANGELOG.md
+++ b/charts/enterprise/cert-manager/CHANGELOG.md
--- a/charts/enterprise/cert-manager/Chart.yaml
+++ b/charts/enterprise/cert-manager/Chart.yaml
@@ -0,0 +1,29 @@
+apiVersion: v2
+appVersion: "latest"
+deprecated: false
+description: Certificate management for Kubernetes
+home: https://truecharts.org/charts/enterprise/cert-manager
+icon: https://truecharts.org/img/hotlink-ok/chart-icons/cert-manager.png
+keywords:
+  - metallb
+  - loadbalancer
+dependencies:
+  - name: common
+    repository: https://library-charts.truecharts.org
+    version: 11.1.2
+kubeVersion: ">=1.16.0-0"
+maintainers:
+  - email: info@truecharts.org
+    name: TrueCharts
+    url: https://truecharts.org
+name: cert-manager
+sources:
+  - https://github.com/truecharts/charts/tree/master/charts/enterprise/cert-manager
+  - https://cert-manager.io/
+type: application
+version: 0.0.5
+annotations:
+  truecharts.org/catagories: |
+    - core
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/grade: U
--- a/charts/enterprise/cert-manager/README.md
+++ b/charts/enterprise/cert-manager/README.md
@@ -0,0 +1,27 @@
+# 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/enterprise/)
+
+**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*
--- a/charts/enterprise/cert-manager/ci/CA-values.yaml
+++ b/charts/enterprise/cert-manager/ci/CA-values.yaml
@@ -0,0 +1,8 @@
+clusterIssuer:
+  selfSigned:
+    enabled: true
+    name: "selfsigned"
+  CA:
+    - name: myca
+      selfSigned: true
+      selfSignedCommonName: "my-selfsigned-ca"
--- a/charts/enterprise/cert-manager/ci/basic-values.yaml
+++ b/charts/enterprise/cert-manager/ci/basic-values.yaml
--- a/charts/enterprise/cert-manager/crds/cert-manager.yaml
+++ b/charts/enterprise/cert-manager/crds/cert-manager.yaml
--- a/charts/enterprise/cert-manager/icon.png
+++ b/charts/enterprise/cert-manager/icon.png
--- a/charts/enterprise/cert-manager/questions.yaml
+++ b/charts/enterprise/cert-manager/questions.yaml
@@ -0,0 +1,273 @@
+# Include{groups}
+questions:
+# Include{global}
+  - variable: clusterIssuer
+    group: App Configuration
+    label: Cluster Certificate Issuer
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: ACME
+          label: 'ACME Issuer'
+          schema:
+            type: list
+            default: []
+            items:
+              - variable: ACMEEntry
+                label: 'ACME Issuer Entry'
+                schema:
+                  additional_attrs: true
+                  type: dict
+                  attrs:
+                    - variable: name
+                      label: Name
+                      description: "Name to give the issuer"
+                      schema:
+                        type: string
+                        required: true
+                        default: ""
+                    - variable: type
+                      label: Type or DNS-Provider
+                      description: DNS Provider
+                      schema:
+                        type: string
+                        default: cloudflare
+                        enum:
+                          - value: cloudflare
+                            description: Cloudflare
+                          - value: route53
+                            description: Route53
+                          - value: akamai
+                            description: Akamai
+                          - value: digitalocean
+                            description: Digitalocean
+                          - value: rfc2136
+                            description: rfc2136 (Advanced)
+                          - value: HTTP01
+                            description: HTTP01 (Experimental)
+                    - variable: server
+                      label: Server
+                      description: "Server for ACME, for example: letsencrypt"
+                      schema:
+                        type: string
+                        show_if: [["type", "!=", "HTTP01"]]
+                        default: 'Letsencrypt-Production'
+                        enum:
+                          - value: 'https://acme-v02.api.letsencrypt.org/directory'
+                            description: Letsencrypt-Production
+                          - value: 'https://acme-staging-v02.api.letsencrypt.org/directory'
+                            description: Letsencrypt-Staging
+                          - value: 'https://api.buypass.no/acme-v02/directory'
+                            description: BuyPass-Production
+                          - value: 'https://api.test4.buypass.no/acme-v02/directory'
+                            description: BuyPass-Staging
+                          - value: custom
+                            description: Custom
+                    - variable: customServer
+                      label: Custom ACME Server (Advanced)
+                      description: "This can be used to enter your own custom ACME server"
+                      schema:
+                        type: string
+                        show_if: [["server", "=", "custom"]]
+                        default: 'https://acme-staging-v02.api.letsencrypt.org/directory'
+                    - variable: email
+                      label: Email
+                      description: "Email adress to use for certificate issuing must match your DNS provider email when required"
+                      schema:
+                        type: string
+                        required: true
+                        show_if: [["type", "!=", "HTTP01"]]
+                        default: "something@example.com"
+                    - variable: cfapikey
+                      label: CloudFlare API key
+                      description: "CloudFlare API Key"
+                      schema:
+                        show_if: [["type", "=", "cloudflare"]]
+                        type: string
+                        default: ""
+                    - variable: cfapitoken
+                      label: CloudFlare API Token
+                      description: "CloudFlare API Token"
+                      schema:
+                        show_if: [["type", "=", "cloudflare"]]
+                        type: string
+                        default: ""
+                    - variable: region
+                      label: Route53 Region
+                      description: "Route 53 Region"
+                      schema:
+                        show_if: [["type", "=", "route53"]]
+                        type: string
+                        required: true
+                        default: "us-west-1"
+                    - variable: accessKeyID
+                      label: Route53 accessKeyID
+                      description: "Route53 accessKeyID"
+                      schema:
+                        show_if: [["type", "=", "route53"]]
+                        type: string
+                        required: true
+                        default: ""
+                    - variable: route53SecretAccessKey
+                      label: Route53 Secret Access Key
+                      description: "Route53 Secret Access Key"
+                      schema:
+                        show_if: [["type", "=", "route53"]]
+                        type: string
+                        required: true
+                        default: ""
+                    - variable: role
+                      label: Route53 Role (optional)
+                      description: "Route53 Role"
+                      schema:
+                        show_if: [["type", "=", "route53"]]
+                        type: string
+                        default: ""
+                    - variable: serviceConsumerDomain
+                      label: Akamai Service Consumer Domain
+                      description: "Akamai Service Consumer Domain"
+                      schema:
+                        show_if: [["type", "=", "akamai"]]
+                        type: string
+                        required: true
+                        default: ""
+                    - variable: akclientToken
+                      label: Akamai Client Token
+                      description: "Client Token"
+                      schema:
+                        show_if: [["type", "=", "akamai"]]
+                        type: string
+                        required: true
+                        default: ""
+                    - variable: akclientSecret
+                      label: Akamai Client Secret
+                      description: "Akamai Client Secret"
+                      schema:
+                        show_if: [["type", "=", "akamai"]]
+                        type: string
+                        required: true
+                        default: ""
+                    - variable: akaccessToken
+                      label: Akamai Access Token
+                      description: "Akamai Access Token"
+                      schema:
+                        show_if: [["type", "=", "akamai"]]
+                        type: string
+                        required: true
+                        default: ""
+                    - variable: doaccessToken
+                      label: Digitalocean Access Token
+                      description: "Digitalocean Access Token"
+                      schema:
+                        show_if: [["type", "=", "digitalocean"]]
+                        type: string
+                        required: true
+                        default: ""
+                    - variable: nameserver
+                      label: rfc2136 Namesever
+                      description: "rfc2136 Namesever"
+                      schema:
+                        show_if: [["type", "=", "digitalocean"]]
+                        type: string
+                        required: true
+                        default: ""
+                    - variable: tsigKeyName
+                      label: rfc2136 tsig Key Name
+                      description: "rfc2136 tsig Key Name"
+                      schema:
+                        show_if: [["type", "=", "digitalocean"]]
+                        type: string
+                        required: true
+                        default: ""
+                    - variable: tsigAlgorithm
+                      label: rfc2136 tsig Algorithm
+                      description: "rfc2136 tsig Algorithm"
+                      schema:
+                        show_if: [["type", "=", "digitalocean"]]
+                        type: string
+                        required: true
+                        default: ""
+                    - variable: rfctsigSecret
+                      label: rfc2136 sig Secret
+                      description: "rfc2136 sig Secret"
+                      schema:
+                        show_if: [["type", "=", "digitalocean"]]
+                        type: string
+                        required: true
+                        default: ""
+
+        - variable: CA
+          label: Certiticate Authority Issuer
+          schema:
+            type: list
+            default: []
+            items:
+              - variable: CAEntry
+                label: 'CA Issuer Entry'
+                schema:
+                  additional_attrs: true
+                  type: dict
+                  attrs:
+                    - variable: name
+                      label: Name
+                      description: "Name to give the issuer"
+                      schema:
+                        type: string
+                        required: true
+                        default: ""
+                    - variable: selfSigned
+                      label: selfSigned
+                      description: "Create Self Signed CA cert"
+                      schema:
+                        type: boolean
+                        default: true
+                    - variable: selfSignedCommonName
+                      label: selfSigned CommonName
+                      description: "Common name for selfSigned Certiticate Authority"
+                      schema:
+                        type: string
+                        required: true
+                        show_if: [["selfSigned", "=", "true"]]
+                        default: "my-selfsigned-ca"
+                    - variable: crt
+                      label: "Custom CA cert (experimental)"
+                      description: "certificate for Certiticate Authority"
+                      schema:
+                        type: string
+                        required: true
+                        show_if: [["selfSigned", "=", "false"]]
+                        default: ""
+                    - variable: key
+                      label: "Custom CA key (experimental)"
+                      description: "key Certiticate Authority"
+                      schema:
+                        type: string
+                        required: true
+                        show_if: [["selfSigned", "=", "false"]]
+                        default: ""
+                        
+        - variable: selfSigned
+          label: 'SelfSigned Issuer'
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+              - variable: enabled
+                label: enabled
+                description: "Enable self-signed issuer"
+                schema:
+                  type: boolean
+                  default: true
+              - variable: name
+                label: Name
+                description: "Name to give the issuer"
+                schema:
+                  type: string
+                  required: true
+                  default: "selfSigned"
+
+
+
+# Include{metrics}
+# Include{documentation}
--- a/charts/enterprise/cert-manager/templates/_metrics.tpl
+++ b/charts/enterprise/cert-manager/templates/_metrics.tpl
@@ -0,0 +1,25 @@
+{{- define "certmanager.metrics" -}}
+{{- if .Values.metrics.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: cert-manager
+  namespace: cert-manager
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+spec:
+  jobLabel: app.kubernetes.io/name
+  selector:
+    matchLabels:
+      app: cert-manager
+      app.kubernetes.io/name: cert-manager
+      app.kubernetes.io/instance: cert-manager
+      app.kubernetes.io/component: "controller"
+  podMetricsEndpoints:
+    - port: http
+      honorLabels: true
+{{- end }}
+{{- end -}}
--- a/charts/enterprise/cert-manager/templates/_wait.tpl
+++ b/charts/enterprise/cert-manager/templates/_wait.tpl
@@ -0,0 +1,85 @@
+{{- define "certmanager.wait" }}
+{{- $fullName := include "tc.common.names.fullname" . }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ $fullName }}-wait
+  annotations:
+    "helm.sh/hook": pre-install, pre-upgrade
+    "helm.sh/hook-weight": "-1"
+    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
+spec:
+  template:
+    spec:
+      serviceAccountName: {{ $fullName }}-wait
+      containers:
+        - name: {{ $fullName }}-wait
+          image: {{ .Values.kubectlImage.repository }}:v1.26.0
+          securityContext:
+            runAsUser: 568
+            runAsGroup: 568
+            readOnlyRootFilesystem: true
+            runAsNonRoot: true
+          command:
+            - "/bin/sh"
+            - "-c"
+            - |
+              /bin/sh <<'EOF'
+              kubectl wait --namespace metallb-system --for=condition=ready pod --selector=app=metallb --timeout=90s || echo "metallb-system wait failed..."
+              kubectl wait --namespace cert-manager --for=condition=ready pod --selector=app=cert-manager --timeout=90s || echo "cert-manager wait failed..."
+              cmctl check api --wait=2m || echo "cmctl wait failed..."
+              EOF
+          volumeMounts:
+            - name: {{ $fullName }}-manifests-temp
+              mountPath: /tmp
+            - name: {{ $fullName }}-manifests-home
+              mountPath: /home/apps/
+      restartPolicy: Never
+      volumes:
+        - name: {{ $fullName }}-manifests-temp
+          emptyDir: {}
+        - name: {{ $fullName }}-manifests-home
+          emptyDir: {}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ $fullName }}-wait
+  annotations:
+    "helm.sh/hook": pre-install, pre-upgrade
+    "helm.sh/hook-weight": "-2"
+    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
+rules:
+  - apiGroups:  ["*"]
+    resources:  ["*"]
+    verbs:  ["*"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ $fullName }}-wait
+  annotations:
+    "helm.sh/hook": pre-install, pre-upgrade
+    "helm.sh/hook-weight": "-2"
+    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ $fullName }}-wait
+subjects:
+  - kind: ServiceAccount
+    name: {{ $fullName }}-wait
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ $fullName }}-wait
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-install, pre-upgrade
+    "helm.sh/hook-weight": "-2"
+    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
+{{- end }}
--- a/charts/enterprise/cert-manager/templates/clusterissuer/_ACME.tpl
+++ b/charts/enterprise/cert-manager/templates/clusterissuer/_ACME.tpl
@@ -0,0 +1,88 @@
+{{- define "certmanager.clusterissuer.acme" -}}
+{{- range .Values.clusterIssuer.acme }}
+---
+apiVersion: cert-manager.io/v1
+kind: ClusterIssuer
+metadata:
+  name: {{ .name }}
+spec:
+  acme:
+    email: {{ .email }}
+    server: {{ if eq .server "custom" }}{{ .customServer }}{{ else }}{{ .server }}{{ end }}
+    privateKeySecretRef:
+      name: {{ .name }}-acme-clusterissuer-account-key
+    solvers:
+    {{- if eq .type "HTTP01" }}
+    - http01:
+        ingress:
+    {{- else }}
+    - dns01:
+      {{- if eq .type "cloudflare" }}
+        cloudflare:
+          email: {{ .email }}
+         {{- if .cfapitoken }}
+          apiTokenSecretRef:
+            name: {{ .name }}-clusterissuer-secret
+            key: cf-api-token
+         {{- else if .cfapikey }}
+            name: {{ .name }}-clusterissuer-secret
+            key: cf-api-key
+         {{ else }}
+         {{- fail "A cloudflare API key or token is required" }}
+         {{- end }}
+      {{- else if eq .type "route53" }}
+        route53:
+          region: {{ .region }}
+          accessKeyID: {{ .accessKeyID }}
+          {{- if .role }}
+          role: {{ .role }}
+          {{- end }}
+          secretAccessKeySecretRef:
+            name: prod-route53-credentials-secret
+            key: route53-secret-access-key
+      {{- else if eq .type "akamai" }}
+        akamai:
+          serviceConsumerDomain: {{ .serviceConsumerDomain }}
+          clientTokenSecretRef:
+            name: {{ .name }}-clusterissuer-secret
+            key: akclientToken
+          clientSecretSecretRef:
+            name: {{ .name }}-clusterissuer-secret
+            key: akclientSecret
+          accessTokenSecretRef:
+            name: {{ .name }}-clusterissuer-secret
+            key: akaccessToken
+      {{- else if eq .type "digitalocean" }}
+        digitalocean:
+          tokenSecretRef:
+            name: {{ .name }}-clusterissuer-secret
+            key: doaccessToken
+      {{- else if eq .type "rfc2136" }}
+        rfc2136:
+          nameserver: {{ .nameserver }}
+          tsigKeyName: {{ .tsigKeyName }}
+          tsigAlgorithm: {{ .tsigAlgorithm }}
+          tsigSecretSecretRef:
+            name: {{ .name }}-clusterissuer-secret
+            key: rfctsigSecret
+      {{- else }}
+      {{- fail "No correct ACME type entered..." }}
+      {{- end }}
+    {{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .name }}-clusterissuer-secret
+type: Opaque
+stringData:
+  cf-api-token: {{ .cfapitoken | default "" }}
+  cf-api-key: {{ .cfapikey | default "" }}
+  route53-secret-access-key: {{ .route53SecretAccessKey | default "" }}
+  akclientToken: {{ .akclientToken | default "" }}
+  akclientSecret: {{ .akclientSecret | default "" }}
+  akaccessToken: {{ .akaccessToken | default "" }}
+  doaccessToken: {{ .doaccessToken | default "" }}
+  rfctsigSecret: {{ .rfctsigSecret | default "" }}
+{{- end }}
+{{- end -}}
--- a/charts/enterprise/cert-manager/templates/clusterissuer/_CA.tpl
+++ b/charts/enterprise/cert-manager/templates/clusterissuer/_CA.tpl
@@ -0,0 +1,48 @@
+{{- define "certmanager.clusterissuer.ca" -}}
+{{- range .Values.clusterIssuer.CA }}
+{{- if .selfSigned }}
+---
+apiVersion: cert-manager.io/v1
+kind: ClusterIssuer
+metadata:
+  name: {{ .name }}-selfsigned-ca-issuer
+spec:
+  selfSigned: {}
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .name }}-selfsigned-ca
+  namespace: cert-manager
+spec:
+  isCA: true
+  commonName: {{ .selfSignedCommonName }}
+  secretName: {{ .name }}-ca
+  privateKey:
+    algorithm: ECDSA
+    size: 256
+  issuerRef:
+    name: selfsigned-ca-issuer
+    kind: ClusterIssuer
+    group: cert-manager.io
+{{- else }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .name }}-ca
+  namespace: cert-manager
+data:
+  tls.crt: {{ .crt | b64enc }}
+  tls.key: {{ .key | b64enc }}
+{{- end }}
+---
+apiVersion: cert-manager.io/v1
+kind: ClusterIssuer
+metadata:
+  name: {{ .name }}
+spec:
+  ca:
+    secretName: {{ .name }}-ca
+{{- end }}
+{{- end -}}
--- a/charts/enterprise/cert-manager/templates/clusterissuer/_selfSigned.tpl
+++ b/charts/enterprise/cert-manager/templates/clusterissuer/_selfSigned.tpl
@@ -0,0 +1,11 @@
+{{- define "certmanager.clusterissuer.selfsigned" -}}
+{{- if .Values.clusterIssuer.selfSigned.enabled }}
+---
+apiVersion: cert-manager.io/v1
+kind: ClusterIssuer
+metadata:
+  name: {{ .Values.clusterIssuer.selfSigned.name }}
+spec:
+  selfSigned: {}
+{{- end }}
+{{- end -}}
--- a/charts/enterprise/cert-manager/templates/common.yaml
+++ b/charts/enterprise/cert-manager/templates/common.yaml
@@ -0,0 +1,11 @@
+{{/* Make sure all variables are set properly */}}
+{{- include "tc.common.loader.init" . }}
+
+{{/* Render the templates */}}
+{{ include "tc.common.loader.apply" . }}
+
+{{- include "certmanager.clusterissuer.acme" . }}
+{{- include "certmanager.clusterissuer.selfsigned" . }}
+{{- include "certmanager.clusterissuer.ca" . }}
+{{- include "certmanager.metrics" . }}
+{{- include "certmanager.wait" . }}
--- a/charts/enterprise/cert-manager/values.yaml
+++ b/charts/enterprise/cert-manager/values.yaml
@@ -0,0 +1,74 @@
+image:
+  repository: tccr.io/truecharts/scratch
+  tag: latest@sha256:081c282586148e62f1324d86257eaf36226faa209a3975079c68fafaeab59b0a
+  pullPolicy: IfNotPresent
+
+controller:
+  enabled: false
+
+service:
+  main:
+    enabled: false
+    ports:
+      main:
+        enabled: false
+        port: 9999
+
+portal:
+  enabled: false
+
+probes:
+  liveness:
+    enabled: false
+  readiness:
+    enabled: false
+  startup:
+    enabled: false
+
+clusterIssuer:
+  selfSigned:
+    enabled: true
+    name: "selfsigned"
+  CA: []
+  #   - name: myca
+  #     selfSigned: true
+  #     selfSignedCommonName: "my-selfsigned-ca"
+  #     # Used to manually define a CA-crt not used when selfSigned is enabled
+  #     crt: ""
+  #     key: ""
+  #     # TODO: Add option to use SCALE CA certs
+
+  ACME: []
+#   - name: letsencrypt
+#     # Used for both logging in to the DNS provider AND ACME registration
+#     email: ""
+#     server: 'https://acme-staging-v02.api.letsencrypt.org/directory'
+#     # Used primarily for the SCALE GUI
+#     customServer: 'https://acme-staging-v02.api.letsencrypt.org/directory'
+#     email: ""
+#     # Options: HTTP01, cloudflare, route53
+#     type: ""
+#     # for cloudflare
+#     cfapikey: ""
+#     cfapitoken: ""
+#     # for route53
+#     region: ""
+#     accessKeyID: ""
+#     route53SecretAccessKey: ""
+#     # optional for route53
+#     role: ""
+#     # for akamai
+#     serviceConsumerDomain: ""
+#     akclientToken: ""
+#     akclientSecret: ""
+#     akaccessToken: ""
+#     # for digitalocean
+#     doaccessToken: ""
+#     # for rfc2136
+#     nameserver: ""
+#     tsigKeyName: ""
+#     tsigAlgorithm: ""
+#     rfctsigSecret: ""
+
+metrics:
+  enabled: true
--- a/charts/incubator/discordgsm/.helmignore
+++ b/charts/incubator/discordgsm/.helmignore
--- a/charts/enterprise/grafana/CHANGELOG.md
+++ b/charts/enterprise/grafana/CHANGELOG.md
--- a/charts/enterprise/grafana/Chart.yaml
+++ b/charts/enterprise/grafana/Chart.yaml
@@ -6,7 +6,7 @@ dependencies:
    version: 11.1.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/stable/grafana
+home: https://truecharts.org/charts/enterprise/grafana
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/grafana.png
 keywords:
  - analytics
@@ -20,11 +20,12 @@ maintainers:
    url: https://truecharts.org
 name: grafana
 sources:
-  - https://github.com/truecharts/charts/tree/master/charts/stable/grafana
+  - https://github.com/truecharts/charts/tree/master/charts/enterprise/grafana
+  - https://hub.docker.com/bitnami/grafana
  - https://github.com/bitnami/bitnami-docker-grafana
  - https://grafana.com/
 type: application
-version: 6.0.22
+version: 6.0.25
 annotations:
  truecharts.org/catagories: |
    - metrics
--- a/charts/enterprise/grafana/README.md
+++ b/charts/enterprise/grafana/README.md
@@ -0,0 +1,27 @@
+# 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/enterprise/)
+
+**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*
--- a/charts/enterprise/grafana/icon.png
+++ b/charts/enterprise/grafana/icon.png
--- a/charts/enterprise/grafana/questions.yaml
+++ b/charts/enterprise/grafana/questions.yaml
--- a/charts/enterprise/grafana/templates/common.yaml
+++ b/charts/enterprise/grafana/templates/common.yaml
--- a/charts/enterprise/grafana/templates/prometheusrules.yaml
+++ b/charts/enterprise/grafana/templates/prometheusrules.yaml
--- a/charts/enterprise/grafana/templates/servicemonitor.yaml
+++ b/charts/enterprise/grafana/templates/servicemonitor.yaml
--- 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: 9.3.2@sha256:f20322ced94e07ab536b9dca1f7fd45c24918eaa4f1543381ce1a1d076248f5b
+  tag: 9.3.2@sha256:631cb131d086967d38a8b67457fc480997a5d9d376a59050403f42cac900d1c4

 securityContext:
  readOnlyRootFilesystem: false
--- a/charts/enterprise/metallb/Chart.yaml
+++ b/charts/enterprise/metallb/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "upstream"
+appVersion: "latest"
 deprecated: false
 description: A network load-balancer implementation for Kubernetes using standard routing protocols
 home: https://truecharts.org/charts/enterprise/metallb
@@ -22,7 +22,7 @@ sources:
  - https://github.com/metallb/metallb
  - https://metallb.universe.tf
 type: application
-version: 7.0.8
+version: 7.0.10
 annotations:
  truecharts.org/catagories: |
    - core
--- a/charts/enterprise/metallb/values.yaml
+++ b/charts/enterprise/metallb/values.yaml
@@ -1,6 +1,6 @@
 image:
-  repository: placeholder
-  tag: upstream
+  repository: tccr.io/truecharts/scratch
+  tag: latest@sha256:081c282586148e62f1324d86257eaf36226faa209a3975079c68fafaeab59b0a
  pullPolicy: IfNotPresent

 controller:
--- a/charts/incubator/lama-cleaner/.helmignore
+++ b/charts/incubator/lama-cleaner/.helmignore
--- a/charts/enterprise/prometheus/CHANGELOG.md
+++ b/charts/enterprise/prometheus/CHANGELOG.md
--- a/charts/enterprise/prometheus/Chart.yaml
+++ b/charts/enterprise/prometheus/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "2.41.0"
+appVersion: "2.42.0"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
@@ -7,15 +7,15 @@ dependencies:
  - condition: exporters.enabled,exporters.node-exporter.enabled
    name: node-exporter
    repository: https://charts.bitnami.com/bitnami
-    version: 3.2.6
+    version: 3.2.8
  - condition: exporters.enabled,exporters.kube-state-metrics.enabled
    name: kube-state-metrics
    repository: https://charts.bitnami.com/bitnami
-    version: 3.2.7
+    version: 3.2.8
 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
-home: https://truecharts.org/charts/stable/prometheus
+home: https://truecharts.org/charts/enterprise/prometheus
 keywords:
  - metrics
 kubeVersion: ">=1.16.0-0"
@@ -25,11 +25,12 @@ maintainers:
    url: https://truecharts.org
 name: prometheus
 sources:
-  - https://github.com/truecharts/charts/tree/master/charts/stable/prometheus
+  - https://github.com/truecharts/charts/tree/master/charts/enterprise/prometheus
+  - https://hub.docker.com/bitnami/prometheus
  - https://github.com/prometheus-community/helm-charts
  - https://github.com/prometheus-operator/kube-prometheus
 type: application
-version: 7.0.40
+version: 7.0.51
 annotations:
  truecharts.org/catagories: |
    - metrics
--- a/charts/enterprise/prometheus/README.md
+++ b/charts/enterprise/prometheus/README.md
@@ -0,0 +1,27 @@
+# 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/enterprise/)
+
+**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*
--- a/charts/enterprise/prometheus/icon.png
+++ b/charts/enterprise/prometheus/icon.png
--- a/charts/enterprise/prometheus/questions.yaml
+++ b/charts/enterprise/prometheus/questions.yaml
--- a/charts/enterprise/prometheus/templates/_helpers.tpl
+++ b/charts/enterprise/prometheus/templates/_helpers.tpl
--- a/charts/enterprise/prometheus/templates/alertmanager/_alertmanager.tpl
+++ b/charts/enterprise/prometheus/templates/alertmanager/_alertmanager.tpl
--- a/charts/enterprise/prometheus/templates/alertmanager/secrets.yaml
+++ b/charts/enterprise/prometheus/templates/alertmanager/secrets.yaml
--- a/charts/enterprise/prometheus/templates/alertmanager/serviceaccount.yaml
+++ b/charts/enterprise/prometheus/templates/alertmanager/serviceaccount.yaml
--- a/charts/enterprise/prometheus/templates/alertmanager/servicemonitor.yaml
+++ b/charts/enterprise/prometheus/templates/alertmanager/servicemonitor.yaml
--- a/charts/enterprise/prometheus/templates/common.yaml
+++ b/charts/enterprise/prometheus/templates/common.yaml
--- a/charts/enterprise/prometheus/templates/exporters/core-dns/service.yaml
+++ b/charts/enterprise/prometheus/templates/exporters/core-dns/service.yaml
--- a/charts/enterprise/prometheus/templates/exporters/core-dns/servicemonitor.yaml
+++ b/charts/enterprise/prometheus/templates/exporters/core-dns/servicemonitor.yaml
--- a/charts/enterprise/prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml
+++ b/charts/enterprise/prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml
--- a/charts/enterprise/prometheus/templates/exporters/kube-controller-manager/endpoints.yaml
+++ b/charts/enterprise/prometheus/templates/exporters/kube-controller-manager/endpoints.yaml
--- a/charts/enterprise/prometheus/templates/exporters/kube-controller-manager/service.yaml
+++ b/charts/enterprise/prometheus/templates/exporters/kube-controller-manager/service.yaml
--- a/charts/enterprise/prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml
+++ b/charts/enterprise/prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml
--- a/charts/enterprise/prometheus/templates/exporters/kube-scheduler/endpoints.yaml
+++ b/charts/enterprise/prometheus/templates/exporters/kube-scheduler/endpoints.yaml
--- a/charts/enterprise/prometheus/templates/exporters/kube-scheduler/service.yaml
+++ b/charts/enterprise/prometheus/templates/exporters/kube-scheduler/service.yaml
--- a/charts/enterprise/prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml
+++ b/charts/enterprise/prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml
--- a/charts/enterprise/prometheus/templates/exporters/kubelet/servicemonitor.yaml
+++ b/charts/enterprise/prometheus/templates/exporters/kubelet/servicemonitor.yaml
--- a/charts/enterprise/prometheus/templates/prometheus/_additionalPrometheusRules.tpl
+++ b/charts/enterprise/prometheus/templates/prometheus/_additionalPrometheusRules.tpl
--- a/charts/enterprise/prometheus/templates/prometheus/_additionalScrapeJobs.tpl
+++ b/charts/enterprise/prometheus/templates/prometheus/_additionalScrapeJobs.tpl
--- a/charts/enterprise/prometheus/templates/prometheus/_prometheus.tpl
+++ b/charts/enterprise/prometheus/templates/prometheus/_prometheus.tpl
--- a/charts/enterprise/prometheus/templates/prometheus/_servicemonitor.tpl
+++ b/charts/enterprise/prometheus/templates/prometheus/_servicemonitor.tpl
--- a/charts/enterprise/prometheus/templates/prometheus/clusterrole.yaml
+++ b/charts/enterprise/prometheus/templates/prometheus/clusterrole.yaml
--- a/charts/enterprise/prometheus/templates/prometheus/clusterrolebinding.yaml
+++ b/charts/enterprise/prometheus/templates/prometheus/clusterrolebinding.yaml
--- a/charts/enterprise/prometheus/templates/prometheus/serviceaccount.yaml
+++ b/charts/enterprise/prometheus/templates/prometheus/serviceaccount.yaml
--- a/charts/enterprise/prometheus/values.yaml
+++ b/charts/enterprise/prometheus/values.yaml
@@ -1,14 +1,14 @@
 image:
  repository: tccr.io/truecharts/prometheus
-  tag: 2.41.0@sha256:83b59595311e02371f86ab5333018962330186d84cf6a0cc9f9dbc52449a3850
+  tag: 2.42.0@sha256:a34d06e66a0379ea3d77210917613490bb63d69097eaf056ee1e742fcf419365

 thanosImage:
  repository: tccr.io/truecharts/thanos
-  tag: 0.30.1@sha256:fd6a136b51fba314dc91b7ddd92db42c4de2b73e48d638c8bc6b67d007300086
+  tag: 0.30.2@sha256:6fbcb600042a97617f775afd5eecceb0b4e5dfa6fc1df8bf7034d4e2de529d08

 alertmanagerImage:
  repository: tccr.io/truecharts/alertmanager
-  tag: 0.25.0@sha256:ab80a68005b86a75d6a616be025fa16580d1454663e4fe4fe401f577d0d45cef
+  tag: 0.25.0@sha256:9c5ad31bf0da8ef2a60b434716630da001ac3896b8c896e733bf6dd0a64b6191

 global:
  labels: {}
--- a/charts/enterprise/traefik/.helmignore
+++ b/charts/enterprise/traefik/.helmignore
--- a/charts/enterprise/traefik/CHANGELOG.md
+++ b/charts/enterprise/traefik/CHANGELOG.md
--- a/charts/enterprise/traefik/Chart.yaml
+++ b/charts/enterprise/traefik/Chart.yaml
@@ -6,7 +6,7 @@ dependencies:
    version: 11.1.2
 deprecated: false
 description: Traefik is a flexible reverse proxy and Ingress Provider.
-home: https://truecharts.org/charts/stable/traefik
+home: https://truecharts.org/charts/enterprise/traefik
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/traefik.png
 keywords:
  - traefik
@@ -18,12 +18,13 @@ maintainers:
    url: https://truecharts.org
 name: traefik
 sources:
-  - https://github.com/truecharts/charts/tree/master/charts/stable/traefik
+  - https://github.com/truecharts/charts/tree/master/charts/enterprise/traefik
+  - https://hub.docker.com/traefik
  - https://github.com/traefik/traefik
  - https://github.com/traefik/traefik-helm-chart
  - https://traefik.io/
 type: application
-version: 16.0.10
+version: 16.0.11
 annotations:
  truecharts.org/catagories: |
    - network
--- a/charts/enterprise/traefik/README.md
+++ b/charts/enterprise/traefik/README.md
@@ -0,0 +1,27 @@
+# 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/enterprise/)
+
+**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*
--- a/charts/enterprise/traefik/docs/how-to.md
+++ b/charts/enterprise/traefik/docs/how-to.md
--- a/Show More
+++ b/Show More