fix(Incubator): Port Questions M - Z (#8802 )

**Description** incubator apps -port env section of questions.yaml ⚒️ Fixes #  **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [X] 🔃 Refactor of current code **🧪 How Has This Been Tested?**  **📃 Notes:**  **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._
fix(Incubator): Fix Questions A - L (#8794 )
2023-05-07 09:44:52 +02:00 · 2023-05-06 08:45:45 +02:00 · 2023-03-24 09:24:14 +01:00 · 2023-03-21 21:56:59 +02:00 · 2023-03-08 19:04:49 +01:00 · 2023-03-01 23:25:10 +01:00
3192 changed files with 49664 additions and 52535 deletions
@@ -1320,6 +1320,51 @@
      "contributions": [
        "doc"
      ]
+    },
+    {
+      "login": "l-moon-git",
+      "name": "l-moon-git",
+      "avatar_url": "https://avatars.githubusercontent.com/u/103282929?v=4",
+      "profile": "https://github.com/l-moon-git",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "hughes5",
+      "name": "hughes5",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6740468?v=4",
+      "profile": "https://github.com/hughes5",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "sdimovv",
+      "name": "sdimovv",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36302090?v=4",
+      "profile": "https://github.com/sdimovv",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AllieQpzm",
+      "name": "AllieQpzm",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2895565?v=4",
+      "profile": "https://github.com/AllieQpzm",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dominch",
+      "name": "Dominik",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10815109?v=4",
+      "profile": "http://www.dominik.net.pl",
+      "contributions": [
+        "bug"
+      ]
    }
  ],
  "contributorsPerLine": 7,
@@ -1,11 +1,9 @@
 # Default code owners
-*      @ornias1993
-*      @truecharts-bot
-/charts/stable/     @stavros-k
-/charts/incubator/       @stavros-k
-/charts/SCALE/      @ornias1993
-/charts/core/      @ornias1993
-/charts/dependency/      @ornias1993
-/charts/enterprise/      @ornias1993
-/charts/dev/      @ornias1993
-/docs/      @ornias1993 @stavros-k
+*                       @ornias1993
+/charts/stable/         @truecharts/stable-maintainers @ornias1993
+/charts/incubator/      @truecharts/incubator-maintainers @Ornias1993
+/charts/dependency/     @truecharts/enterprise-maintainers @ornias1993
+/charts/enterprise/     @truecharts/enterprise-maintainers @ornias1993
+/charts/dev/            @ornias1993
+/.github/               @truecharts/ci-maintainers @ornias1993 
+docs/                   @truecharts/docs-maintainers @ornias1993
@@ -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-140-orange.svg?style=for-the-badge)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-145-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)):
@@ -316,6 +316,13 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
      <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>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/l-moon-git"><img src="https://avatars.githubusercontent.com/u/103282929?v=4?s=100" width="100px;" alt="l-moon-git"/><br /><sub><b>l-moon-git</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=l-moon-git" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hughes5"><img src="https://avatars.githubusercontent.com/u/6740468?v=4?s=100" width="100px;" alt="hughes5"/><br /><sub><b>hughes5</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=hughes5" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/sdimovv"><img src="https://avatars.githubusercontent.com/u/36302090?v=4?s=100" width="100px;" alt="sdimovv"/><br /><sub><b>sdimovv</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=sdimovv" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AllieQpzm"><img src="https://avatars.githubusercontent.com/u/2895565?v=4?s=100" width="100px;" alt="AllieQpzm"/><br /><sub><b>AllieQpzm</b></sub></a><br /><a href="https://github.com/truecharts/charts/commits?author=AllieQpzm" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.dominik.net.pl"><img src="https://avatars.githubusercontent.com/u/10815109?v=4?s=100" width="100px;" alt="Dominik"/><br /><sub><b>Dominik</b></sub></a><br /><a href="https://github.com/truecharts/charts/issues?q=author%3Adominch" title="Bug reports">🐛</a></td>
+    </tr>
  </tbody>
 </table>

@@ -260,6 +260,11 @@
      "matchPackagePrefixes": ["tccr.io/truecharts/rickroll"],
      "groupName": "rickroll",
    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackagePrefixes": ["tccr.io/truecharts/scrypted"],
+      "groupName": "scrypted",
+    },
    {
      "matchDatasources": ["docker"],
      "matchPackagePrefixes": ["tccr.io/truecharts/docspell"],
@@ -14,7 +14,7 @@ if [[ -d "charts/${1}" ]]; then
    rm -rf ${chart}/app-changelog.md || echo "changelog not found..."
    echo "Generating changelogs for: ${chartname}"
    # SCALE "Changelog" containing only last change
-    git-chglog --next-tag ${chartname}-${chartversion} --tag-filter-pattern ${chartname} --path ${chart} -o ${chart}/app-changelog.md ${chartname}-${chartversion} || echo "changelog generation failed..."
+    git-chglog --next-tag ${chartname}-${chartversion} --tag-filter-pattern "^${chartname}-\d+\.\d+\.\d+\$" --path ${chart} -o ${chart}/app-changelog.md ${chartname}-${chartversion} || echo "changelog generation failed..."
 else
    echo "Chart 'charts/${1}' no longer exists in repo. Skipping it..."
 fi
@@ -15,7 +15,7 @@ jobs:
    name: Test SCALE Catalog
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:3b53132c6c6e14393f8f69e64e2237c8460a466753c285542324aa993ed1795d
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:44047909bbf54cb1ce3551ae0b342244a5bdcd62562a7f2f07caad4bf8856ee4
    steps:
      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
        name: Checkout
@@ -50,7 +50,7 @@ jobs:

      - name: Install Kubernetes tools
        if: inputs.isRenovatePR == 'true'
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            yq
@@ -113,7 +113,7 @@ jobs:
          ref: ${{ inputs.checkoutCommit }}

      - name: lint Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -147,7 +147,7 @@ jobs:
          ref: ${{ inputs.checkoutCommit }}

      - name: lint Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -181,7 +181,7 @@ jobs:
          ref: ${{ inputs.checkoutCommit }}

      - name: lint Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -215,7 +215,7 @@ jobs:
          ref: ${{ inputs.checkoutCommit }}

      - name: lint Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -249,7 +249,7 @@ jobs:
          ref: ${{ inputs.checkoutCommit }}

      - name: lint Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -283,7 +283,7 @@ jobs:
          ref: ${{ inputs.checkoutCommit }}

      - name: lint Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -11,15 +11,59 @@ on:
      - "charts/**"

 jobs:
+
+  release-helm:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:44047909bbf54cb1ce3551ae0b342244a5bdcd62562a7f2f07caad4bf8856ee4
+    steps:
+      - name: Checkout
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+        with:
+          token: ${{ secrets.BOT_TOKEN }}
+          fetch-depth: 1
+          
+      - name: Checkout Helm-Staging
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+        with:
+          fetch-depth: 1
+          repository: truecharts/helm-staging
+          token: ${{ secrets.BOT_TOKEN }}
+          path: helm
+          
+      - name: Fix Pre-Commit issues
+        shell: bash
+        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: Commit Helm Changes
+        run: |
+          rm -rf helm/charts
+          mkdir helm/charts
+          cp -rf charts helm
+
+      - name: Commit Helm Changes
+        run: |
+          cd helm
+          git config user.name "TrueCharts-Bot"
+          git config user.email "[email protected]"
+          git add --all
+          git commit -sm "Commit released Helm Charts for TrueCharts" || exit 0
+          git push
+          cd -
+
  release-scale:
    runs-on: ubuntu-latest
    outputs:
      ref: ${{ steps.save-commit-hash.outputs.commit_hash }}
    container:
-      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:3b53132c6c6e14393f8f69e64e2237c8460a466753c285542324aa993ed1795d
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:44047909bbf54cb1ce3551ae0b342244a5bdcd62562a7f2f07caad4bf8856ee4
    steps:
      - name: Install Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -179,6 +223,7 @@ jobs:
          git add --all
          git commit -sm "Commit released docs for TrueCharts" || exit 0
          git push
+        

      - name: Checkout Catalog
        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
@@ -233,7 +278,7 @@ jobs:
          steps.collect-changes.outputs.changesDetectedAfterTag == 'true'
        with:
          charts_dir: charts/dependency
-          charts_repo_url: https://charts.truecharts.org
+          charts_repo_url: https://deps.truecharts.org
        env:
          CR_TOKEN: "${{ secrets.BOT_TOKEN }}"
          CR_SKIP_EXISTING: "true"
@@ -22,7 +22,7 @@ jobs:
          ref: ${{ inputs.checkoutCommit }}

      - name: Install Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -146,7 +146,7 @@ jobs:
          ref: ${{ inputs.checkoutCommit }}

      - name: Install Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -171,7 +171,7 @@ jobs:
          kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true

      - name: Run chart-testing (install)
-        run: ct install --config ".github/ct-install.yaml" --charts "${{ matrix.chart }}" --upgrade
+        run: ct install --config ".github/ct-install.yaml" --charts "${{ matrix.chart }}" #--upgrade

  install-charts2:
    needs:
@@ -191,7 +191,7 @@ jobs:
          ref: ${{ inputs.checkoutCommit }}

      - name: Install Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -217,7 +217,7 @@ jobs:
          kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true

      - name: Run chart-testing (install)
-        run: ct install --config ".github/ct-install.yaml" --charts "${{ matrix.chart }}" --upgrade
+        run: ct install --config ".github/ct-install.yaml" --charts "${{ matrix.chart }}" #--upgrade

  install-charts3:
    needs:
@@ -237,7 +237,7 @@ jobs:
          ref: ${{ inputs.checkoutCommit }}

      - name: Install Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -262,7 +262,7 @@ jobs:
          kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true

      - name: Run chart-testing (install)
-        run: ct install --config ".github/ct-install.yaml" --charts "${{ matrix.chart }}" --upgrade
+        run: ct install --config ".github/ct-install.yaml" --charts "${{ matrix.chart }}" #--upgrade

  install-charts4:
    needs:
@@ -282,7 +282,7 @@ jobs:
          ref: ${{ inputs.checkoutCommit }}

      - name: Install Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -307,7 +307,7 @@ jobs:
          kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true

      - name: Run chart-testing (install)
-        run: ct install --config ".github/ct-install.yaml" --charts "${{ matrix.chart }}" --upgrade
+        run: ct install --config ".github/ct-install.yaml" --charts "${{ matrix.chart }}" #--upgrade

  install-charts5:
    needs:
@@ -327,7 +327,7 @@ jobs:
          ref: ${{ inputs.checkoutCommit }}

      - name: Install Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -352,7 +352,7 @@ jobs:
          kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true

      - name: Run chart-testing (install)
-        run: ct install --config ".github/ct-install.yaml" --charts "${{ matrix.chart }}" --upgrade
+        run: ct install --config ".github/ct-install.yaml" --charts "${{ matrix.chart }}" #--upgrade

  install-charts6:
    needs:
@@ -372,7 +372,7 @@ jobs:
          ref: ${{ inputs.checkoutCommit }}

      - name: Install Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -397,7 +397,7 @@ jobs:
          kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true

      - name: Run chart-testing (install)
-        run: ct install --config ".github/ct-install.yaml" --charts "${{ matrix.chart }}" --upgrade
+        run: ct install --config ".github/ct-install.yaml" --charts "${{ matrix.chart }}" #--upgrade

  # Summarize matrix https://github.community/t/status-check-for-a-matrix-jobs/127354/7
  install_success:
@@ -1,14 +1,23 @@
 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:3b53132c6c6e14393f8f69e64e2237c8460a466753c285542324aa993ed1795d
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:44047909bbf54cb1ce3551ae0b342244a5bdcd62562a7f2f07caad4bf8856ee4
    steps:
      - name: Checkout
        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
@@ -59,57 +68,132 @@ jobs:
          # Designed to ensure the appversion in Chart.yaml is in sync with the primary Chart tag if found
          # Also makes sure that home link is pointing to the correct url
          sync_tag() {
-              local chart="$1"
-              local chartname="$2"
-              local train="$3"
-              echo "Attempting to sync primary tag with appversion for: ${chartname}"
-              local tag="$(cat ${chart}/values.yaml | grep '^  tag: ' | awk -F" " '{ print $2 }' | head -1)"
-              tag="${tag%%@*}"
-              tag="${tag:-auto}"
-              tag=$(echo $tag | sed "s/release-//g")
-              tag=$(echo $tag | sed "s/release_//g")
-              tag=$(echo $tag | sed "s/version-//g")
-              tag=$(echo $tag | sed "s/version_//g")
-              tag="${tag#*V.}"
-              tag="${tag#*v-}"
-              tag="${tag#*v}"
-              tag="${tag%-*}"
-              tag="${tag:0:10}"
-              tag="${tag%-}"
-              tag="${tag%_}"
-              tag="${tag%.}"
-              echo "Updating tag of ${chartname} to ${tag}..."
-              sed -i -e "s|appVersion: .*|appVersion: \"${tag}\"|" "${chart}/Chart.yaml"
-              echo "Updating icon of ${chartname}..."
-              sed -i -e "s|icon: .*|icon: https:\/\/truecharts.org\/img\/hotlink-ok\/chart-icons\/${chartname}.png|" "${chart}/Chart.yaml"
-              echo "Updating home of ${chartname}..."
-              sed -i -e "s|home: .*|home: https:\/\/truecharts.org\/charts\/${train}\/${chartname}|" "${chart}/Chart.yaml"
-              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*" and . != "https://ghcr*" and . != "https://hub.docker*" and . != "https://quay*" and . != "https://github.com/truecharts/containers*")' "${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/"
-                if echo ${container} | grep 'ghcr'; then
-                prefix="https://ghcr.com/"
-                elif echo ${container} | grep 'quay'; then
-                prefix="https://quay.com/"
-                elif echo ${container} | grep 'tccr'; then
-                prefix="https://github.com/truecharts/containers/tree/master/mirror/"
-                fi
+            local chart="$1"
+            local chartname="$2"
+            local train="$3"
+            echo "Attempting to sync primary tag with appversion for: ${chartname}"
+            local tag="$(cat ${chart}/values.yaml | grep '^  tag: ' | awk -F" " '{ print $2 }' | head -1)"
+            tag="${tag%%@*}"
+            tag="${tag:-auto}"
+            tag=$(echo $tag | sed "s/release-//g")
+            tag=$(echo $tag | sed "s/release_//g")
+            tag=$(echo $tag | sed "s/version-//g")
+            tag=$(echo $tag | sed "s/version_//g")
+            tag="${tag#*V.}"
+            tag="${tag#*v-}"
+            tag="${tag#*v}"
+            tag="${tag%-*}"
+            tag="${tag:0:10}"
+            tag="${tag%-}"
+            tag="${tag%_}"
+            tag="${tag%.}"
+            echo "Updating tag of ${chartname} to ${tag}..."
+            sed -i -e "s|appVersion: .*|appVersion: \"${tag}\"|" "${chart}/Chart.yaml"
+            echo "Updating icon of ${chartname}..."
+            sed -i -e "s|icon: .*|icon: https:\/\/truecharts.org\/img\/hotlink-ok\/chart-icons\/${chartname}.png|" "${chart}/Chart.yaml"
+            echo "Updating home of ${chartname}..."
+            sed -i -e "s|home: .*|home: https:\/\/truecharts.org\/charts\/${train}\/${chartname}|" "${chart}/Chart.yaml"
+            echo "Attempting to update sources of ${chartname}..."
+            echo "Using go-yq verion: <$(go-yq -V)>"
+            # Get current sources, exluding those that may have been added automatically.
+            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"
+            # Get the container image name that was parsed out of the Dockerfile for the website.
+            container=$(cat website/docs/charts/description_list.md | grep "\[${chartname}\]" | cut -f3 -d '|' | grep -v 'Not Found' || echo "")
+            # Convert the container image name to a URL.
+            if [ ! -z "$container" ]; then
+              prefix=""
+              case "$container" in
+                lscr.io/linuxserver/*)
+                  prefix="https://fleet.linuxserver.io/image?name="
+                  container=${container#lscr.io/}
+                  ;;
+                tccr.io/truecharts/*)
+                  prefix="https://github.com/truecharts/containers/tree/master/mirror"
+                  container=${container#tccr.io/truecharts/}
+                  ;;
+                mcr.microsoft.com/*)
+                  prefix=""
+                  ;;
+                public.ecr.aws/*)
+                  prefix="https://gallery.ecr.aws/"
+                  container=${container#public.ecr.aws/}
+                  ;;
+                ghcr.io/*)
+                  prefix="https://"
+                  ;;
+                quay.io/*)
+                  prefix="https://"
+                  ;;
+                gcr.io/*)
+                  prefix="https://"
+                  ;;
+                *.azurecr.io/*)
+                  prefix=""
+                  ;;
+                *.ocir.io/*)
+                  prefix=""
+                  ;;
+                # There have been a number of domains used for the Docker Hub registry over the years.
+                # NOTE:  This is also the default case!
+                docker.io/*|index.docker.io/*|registry-1.docker.io/*|registry.hub.docker.com/*|*)
+                  prefix="https://hub.docker.com/r/"
+                  container=${container#docker.io/}
+                  container=${container#index.docker.io/}
+                  container=${container#registry-1.docker.io/}
+                  container=${container#registry.hub.docker.com/}
+                  # If the image name does not contain a slash it is a Docker Official Image.
+                  if [ "$container" == "${container////}" ]; then
+                    prefix="https://hub.docker.com/_/"
+                  # If the user name is library it is a Docker Official Image.
+                  elif [ "${container%%/*}" == "library" ]; then
+                    prefix="https://hub.docker.com/_/"
+                    container=${container#library/}
+                  fi
+                  # Avoid creating a bad link since an unsupported registry may have been used.
+                  slashes=${container//[^\/]/}
+                  # Bail out if the image name has more than 1 slash.
+                  if [ ${#slashes} -gt 1 ]; then
+                    prefix=""
+                    echo "WARNING: Not assuming '$container' is a Docker Hub image"
+                  fi
+                  ;;
+              esac
+              if [ -n "${prefix}" ]; then
                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"
-              done <<< "$curr_sources"
-              echo "Sources of ${chartname} updated!"
-              }
+            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"
+            done <<< "$curr_sources"
+            echo "Sources of ${chartname} updated!"
+          }
          export -f sync_tag

          for train in enterprise stable incubator dependency; do
@@ -138,10 +222,10 @@ jobs:
    runs-on: ubuntu-latest
    name: "Generate Security Reports"
    container:
-      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:3b53132c6c6e14393f8f69e64e2237c8460a466753c285542324aa993ed1795d
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:44047909bbf54cb1ce3551ae0b342244a5bdcd62562a7f2f07caad4bf8856ee4
    steps:
      - name: Install Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@b91bb02bc122bd84ac7bbea5f25ed6b0f2ec6275 # tag=v0.9.2
+        uses: yokawasa/action-setup-kube-tools@af4ebb1af1efd30c5bd84a2e9773355ad6362a33 # v0.9.3
        with:
          setup-tools: |
            helmv3
@@ -264,3 +348,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@c1b35aecc5cdb1a34539d14196df55838bb2f836 # 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
@@ -19,7 +19,7 @@ jobs:
          token: ${{ secrets.BOT_TOKEN }}

      - name: Download workflow artifact
-        uses: dawidd6/action-download-artifact@bd10f381a96414ce2b13a11bfa89902ba7cea07f # v2.24.3
+        uses: dawidd6/action-download-artifact@5e780fc7bbd0cac69fc73271ed86edf5dcb72d67 # v2.26.0
        with:
          github_token: ${{ secrets.BOT_TOKEN }}
          workflow: pr-validate.yaml
@@ -34,7 +34,7 @@ jobs:
          path: ./pr_metadata/pr_number.txt

      - name: "Get workflow job status"
-        uses: actions/github-script@d556feaca394842dc55e4734bf3bb9f685482fa0 # tag=v6
+        uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6
        id: get-workflow-jobs
        with:
          github-token: ${{ secrets.BOT_TOKEN }}
@@ -71,7 +71,7 @@ jobs:
        id: get_head_commit_message
        run: echo "::set-output name=headCommitMsg::$(git show -s --format=%s)"

-  automerge:
+  automerge-and-approve:
    needs:
      - pr-metadata
      - catalog-test
@@ -79,11 +79,14 @@ jobs:
      - charts-lint
      - print_head_msg
    if: needs.print_head_msg.outputs.head-commit-message == 'Commit bumped Chart Version'
-    name: Automerge build
+    name: Automerge and Approve build
    runs-on: ubuntu-latest
    steps:
+      - uses: hmarr/auto-approve-action@v3
+        with:
+          github-token: "${{ secrets.PERS_PAT }}"
      - name: automerge
-        uses: pascalgn/automerge-action@eb68b061739cb9d81564f8e812d0b3c45f0fb09a # tag=v0.15.5
+        uses: pascalgn/automerge-action@22948e0bc22f0aa673800da838595a3e7347e584 # v0.15.6
        env:
          GITHUB_TOKEN: "${{ secrets.BOT_TOKEN }}"
          UPDATE_RETRIES: 12
@@ -12,6 +12,6 @@ jobs:
        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
        with:
          fetch-depth: 0
-      - uses: actions/delete-package-versions@a31a43afa6c2d3afdf8b5f1e311b2dc75585932e # tag=v3
+      - uses: actions/delete-package-versions@ba4d22f25141387e5ab82cfec079de6d2df96815 # v4
        with:
          min-versions-to-keep: 200
@@ -12,7 +12,7 @@ jobs:
    name: Get changed Apps
    runs-on: ubuntu-20.04
    container:
-      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:3b53132c6c6e14393f8f69e64e2237c8460a466753c285542324aa993ed1795d
+      image: ghcr.io/truecharts/devcontainer:v3.1.1@sha256:44047909bbf54cb1ce3551ae0b342244a5bdcd62562a7f2f07caad4bf8856ee4
    steps:
      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
        name: Checkout
@@ -1,8 +1,8 @@
 name: Renovate
 on:
  workflow_dispatch:
-  schedule:
-    - cron: "0 */1 * * *"
+  # schedule:
+  #   - cron: "0 */1 * * *"
 jobs:
  renovate:
    runs-on: ubuntu-latest
@@ -12,7 +12,7 @@ jobs:
        with:
          token: ${{ secrets.BOT_TOKEN }}
      - name: Self-hosted Renovate
-        uses: renovatebot/github-action@c4ea9ea73ec458a71cdb70b08acfb91492946072 # v34.109.1
+        uses: renovatebot/github-action@1b6d32d6058e85e60825f27572934f36b00ebbd3 # v34.153.1
        with:
          configurationFile: .github/renovate-config.js
          token: ${{ secrets.BOT_TOKEN }}
@@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: Check for stale issues and PRs
-        uses: actions/stale@5ebf00ea0e4c1561e9b43a292ed34424fb1d4578 # tag=v6
+        uses: actions/stale@6f05e4244c9a0b2ed3401882b05d701dd0a7289b # v7
        with:
          repo-token: ${{ secrets.BOT_TOKEN }}
          days-before-issue-stale: 180
@@ -56,3 +56,4 @@ website/
 pub/
 tgz_cache/
 index_cache/
+helm/
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "23.1.2.9"
+appVersion: "23.2.1.253"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.2.1
 deprecated: false
 description: ClickHouse is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).
 home: https://truecharts.org/charts/dependency/clickhouse
@@ -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://hub.docker.com/r/clickhouse/clickhouse-server
  - https://clickhouse.com/
 type: application
-version: 3.0.18
+version: 4.0.0
 annotations:
  truecharts.org/catagories: |
    - database
@@ -1,10 +1,15 @@
 # Include{groups}
 questions:
 # Include{global}
-# Include{controller}
-# Include{replicas}
-# Include{replica1}
-# Include{controllerExpertExtraArgs}
+# Include{workload}
+# Include{workloadDeployment}
+
+# Include{replicas1}
+# Include{podSpec}
+# Include{containerMain}
+# Include{containerBasic}
+# Include{containerAdvanced}
+
 # Include{containerConfig}
  - variable: clickhouseDatabase
    group: "App Configuration"
@@ -96,51 +101,34 @@ questions:
            attrs:
 # Include{persistenceBasic}
 # Include{persistenceList}
-# Include{security}
-# Include{securityContextAdvancedRoot}
-              - variable: privileged
-                label: "Privileged mode"
+# Include{securityContextRoot}
+
+              - variable: runAsUser
+                label: "runAsUser"
+                description: "The UserID of the user running the application"
                schema:
-                  type: boolean
-                  default: false
-              - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
+                  type: int
+                  default: 568
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID of the user running the application"
                schema:
-                  type: boolean
-                  default: true
-              - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
+                  type: int
+                  default: 568
+# Include{securityContextContainer}
+# Include{securityContextAdvanced}
+# Include{securityContextPod}
+              - variable: fsGroup
+                label: "fsGroup"
+                description: "The group that should own ALL storage."
                schema:
-                  type: boolean
-                  default: false
-              - variable: runAsNonRoot
-                label: "runAsNonRoot"
-                schema:
-                  type: boolean
-                  default: true
-# Include{podSecurityContextRoot}
-        - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
-          schema:
-            type: int
-            default: 568
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 568
-        - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
-          schema:
-            type: int
-            default: 568
-# Include{podSecurityContextAdvanced}
+                  type: int
+                  default: 568568
+
 # Include{resources}
 # Include{advanced}
 # Include{addons}
 # Include{codeserver}
+# Include{netshoot}
 # Include{vpn}
 # Include{documentation}
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
@@ -1 +1 @@
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
@@ -1,32 +1,55 @@
 image:
  repository: tccr.io/truecharts/clickhouse
  pullPolicy: IfNotPresent
-  tag: 23.1.2.9@sha256:d5fcecb813f5692f9f9cfbfd1d4822bb0ea8dcfa8f066d0fa6769b19ca32d9d3
+  tag: 23.2.1.2537@sha256:669278d98936a2d12bf8f331067afb6a34e5570fdcb37b854bb5d0b2d8f30108

-controller:
-  type: statefulset
-  strategy: RollingUpdate
-  rollingUpdate:
-    unavailable: 1
+workload:
+  main:
+    type: StatefulSet
+    replicas: 1
+    strategy: RollingUpdate
+    podSpec:
+      containers:
+        main:
+          env:
+            CLICKHOUSE_DB: "{{ .Values.clickhouseDatabase }}"
+            CLICKHOUSE_USER: "{{ .Values.clickhouseUsername }}"
+            CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: "{{ .Values.clickhouseDefaultAccessManagement }}"
+            CLICKHOUSE_PASSWORD:
+              secretKeyRef:
+                name: "credentials"
+                key: "clickhouse-password"
+
+          probes:
+            liveness:
+              type: http
+              path: /ping
+            readiness:
+              type: http
+              path: /ping
+            startup:
+              type: http
+              path: /ping

 securityContext:
-  readOnlyRootFilesystem: false
-  # Optional capabilities advanced ClickHouse features. See also:
-  # https://github.com/ClickHouse/ClickHouse/blob/master/docker/server/README.md#linux-capabilities
-  # https://kb.altinity.com/altinity-kb-setup-and-maintenance/altinity-kb-clickhouse-in-docker/
-  # https://github.com/ClickHouse/ClickHouse/blob/b844c36a9d5e76300a88b4f49e6debccf1ad22e4/programs/install/Install.cpp#L793-L804
-  # capabilities:
-  #   add:
-  #     - IPC_LOCK
-  #     - NET_ADMIN
-  #     - SYS_NICE
+  container:
+    readOnlyRootFilesystem: false
+    # Optional capabilities advanced ClickHouse features. See also:
+    # https://github.com/ClickHouse/ClickHouse/blob/master/docker/server/README.md#linux-capabilities
+    # https://kb.altinity.com/altinity-kb-setup-and-maintenance/altinity-kb-clickhouse-in-docker/
+    # https://github.com/ClickHouse/ClickHouse/blob/b844c36a9d5e76300a88b4f49e6debccf1ad22e4/programs/install/Install.cpp#L793-L804
+    # capabilities:
+    #   add:
+    #     - IPC_LOCK
+    #     - NET_ADMIN
+    #     - SYS_NICE

 service:
  main:
    ports:
      main:
        port: 8123
-        protocol: HTTP
+        protocol: http
        targetPort: 8123

 volumeClaimTemplates:
@@ -34,17 +57,6 @@ volumeClaimTemplates:
    enabled: true
    mountPath: /var/lib/clickhouse

-probes:
-  liveness:
-    type: HTTP
-    path: /ping
-  readiness:
-    type: HTTP
-    path: /ping
-  startup:
-    type: HTTP
-    path: /ping
-
 clickhouseDatabase: "test"
 clickhouseUsername: "test"
 clickhousePassword: "testpass"
@@ -57,17 +69,9 @@ secret:
    data:
      clickhouse-password: '{{ ( .Values.clickhousePassword | default "empty" ) }}'

-env:
-  CLICKHOUSE_DB: "{{ .Values.clickhouseDatabase }}"
-  CLICKHOUSE_USER: "{{ .Values.clickhouseUsername }}"
-  CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: "{{ .Values.clickhouseDefaultAccessManagement }}"
-  CLICKHOUSE_PASSWORD:
-    secretKeyRef:
-      name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}'
-      key: "clickhouse-password"
-
 portal:
-  enabled: false
+  open:
+    enabled: false

-manifests:
+manifestManager:
  enabled: false
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "22.05.9.3"
+appVersion: "22.05.10.2"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.2.1
 deprecated: false
 description: "An awesome Online Office suite."
 home: https://truecharts.org/charts/dependency/collabora-online
@@ -21,7 +21,7 @@ sources:
  - https://sdk.collaboraonline.com/contents.html
  - https://github.com/CollaboraOnline/online/tree/master/kubernetes/helm
 type: application
-version: 14.0.15
+version: 15.0.0
 annotations:
  truecharts.org/catagories: |
    - office
@@ -8,68 +8,65 @@ portals:
    path: "/browser/dist/admin/admin.html"
 questions:
 # Include{global}
-# Include{controller}
-# Include{replicas}
-# Include{replica1}
-# Include{controllerExpertExtraArgs}
-  - variable: secretEnv
-    group: "App Configuration"
-    label: "Image Secrets"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: username
-          label: "Username for WebUI"
-          schema:
-            type: string
-            default: "admin"
-            required: true
-        - variable: password
-          label: "Password for WebUI"
-          schema:
-            type: string
-            valid_chars: "[a-zA-Z0-9!@#$%^&*?]{8,}"
-            private: true
-            required: true
-            default: "REPLACETHIS"
-  - variable: env
-    group: "App Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: aliasgroup1
-          label: "aliasgroup1"
-          description: "Comma separated hosts list."
-          schema:
-            type: string
-            default: ""
-        - variable: dictionaries
-          label: "Dictionaries to use, leave empty to use all"
-          schema:
-            type: string
-            default: "de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru"
-        - variable: extra_params
-          label: "Extra Parameters to add"
-          description: 'e.g. "--o:welcome.enable=false", See more on /etc/loolwsd/loolwsd.xml. Separate params with space'
-          schema:
-            type: string
-            default: "--o:welcome.enable=false --o:logging.level=information --o:user_interface.mode=notebookbar --o:ssl.termination=true --o:ssl.enable=false"
-        - variable: DONT_GEN_SSL_CERT
-          label: "DONT_GEN_SSL_CERT"
-          description: "When set to true it does NOT generate an SSL cert, you have to use your own"
-          schema:
-            type: boolean
-            default: true
-        - variable: server_name
-          label: "Server Name"
-          description: "When this environment variable is set (is not empty), then its value will be used as server name in /etc/loolwsd/loolwsd.xml. Without this, CODE is not delivering a correct host for the websocket connection in case of a proxy in front of it."
-          schema:
-            type: string
-            default: 'collabora.domain.tld'
-            valid_chars: '^((([a-z\d](-?[a-z\d]){0,62})\.)*(([a-z\d](-?[a-z\d]){0,62})\.)([a-z](-?[a-z\d]){1,62})|((\d{1,3}\.){3}\d{1,3}))$'
+# Include{workload}
+# Include{workloadDeployment}
+
+# Include{replicas1}
+# Include{podSpec}
+# Include{containerMain}
+# Include{containerBasic}
+                                - variable: env
+                                  group: "App Configuration"
+                                  label: "Image Environment"
+                                  schema:
+                                    additional_attrs: true
+                                    type: dict
+                                    attrs:
+                                      - variable: username
+                                        label: "Username for WebUI"
+                                        schema:
+                                          type: string
+                                          default: "admin"
+                                          required: true
+                                      - variable: password
+                                        label: "Password for WebUI"
+                                        schema:
+                                          type: string
+                                          valid_chars: "[a-zA-Z0-9!@#$%^&*?]{8,}"
+                                          private: true
+                                          required: true
+                                          default: "REPLACETHIS"
+                                      - variable: aliasgroup1
+                                        label: "aliasgroup1"
+                                        description: "Comma separated hosts list."
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: dictionaries
+                                        label: "Dictionaries to use, leave empty to use all"
+                                        schema:
+                                          type: string
+                                          default: "de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru"
+                                      - variable: extra_params
+                                        label: "Extra Parameters to add"
+                                        description: 'e.g. "--o:welcome.enable=false", See more on /etc/loolwsd/loolwsd.xml. Separate params with space'
+                                        schema:
+                                          type: string
+                                          default: "--o:welcome.enable=false --o:logging.level=information --o:user_interface.mode=notebookbar --o:ssl.termination=true --o:ssl.enable=false"
+                                      - variable: DONT_GEN_SSL_CERT
+                                        label: "DONT_GEN_SSL_CERT"
+                                        description: "When set to true it does NOT generate an SSL cert, you have to use your own"
+                                        schema:
+                                          type: boolean
+                                          default: true
+                                      - variable: server_name
+                                        label: "Server Name"
+                                        description: "When this environment variable is set (is not empty), then its value will be used as server name in /etc/loolwsd/loolwsd.xml. Without this, CODE is not delivering a correct host for the websocket connection in case of a proxy in front of it."
+                                        schema:
+                                          type: string
+                                          default: 'collabora.domain.tld'
+                                          valid_chars: '^((([a-z\d](-?[a-z\d]){0,62})\.)*(([a-z\d](-?[a-z\d]){0,62})\.)([a-z](-?[a-z\d]){1,62})|((\d{1,3}\.){3}\d{1,3}))$'
+# Include{containerAdvanced}
 # Include{containerConfig}
 # Include{serviceRoot}
        - variable: main
@@ -110,51 +107,34 @@ questions:
 # Include{ingressTLS}
 # Include{ingressTraefik}
 # Include{ingressList}
-# Include{security}
-# Include{securityContextAdvancedRoot}
-              - variable: privileged
-                label: "Privileged mode"
+# Include{securityContextRoot}
+
+              - variable: runAsUser
+                label: "runAsUser"
+                description: "The UserID of the user running the application"
                schema:
-                  type: boolean
-                  default: false
-              - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
+                  type: int
+                  default: 104
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID of the user running the application"
                schema:
-                  type: boolean
-                  default: false
-              - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
+                  type: int
+                  default: 106
+# Include{securityContextContainer}
+# Include{securityContextAdvanced}
+# Include{securityContextPod}
+              - variable: fsGroup
+                label: "fsGroup"
+                description: "The group that should own ALL storage."
                schema:
-                  type: boolean
-                  default: true
-              - variable: runAsNonRoot
-                label: "runAsNonRoot"
-                schema:
-                  type: boolean
-                  default: true
-# Include{podSecurityContextRoot}
-        - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
-          schema:
-            type: int
-            default: 104
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 106
-        - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
-          schema:
-            type: int
-            default: 568
-# Include{podSecurityContextAdvanced}
+                  type: int
+                  default: 568
+
 # Include{resources}
 # Include{advanced}
 # Include{addons}
 # Include{codeserver}
+# Include{netshoot}
 # Include{vpn}
 # Include{documentation}
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
@@ -1 +1 @@
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
@@ -1,36 +1,31 @@
 image:
  repository: tccr.io/truecharts/collabora
-  tag: 22.05.9.3.1@sha256:59dfb2d36e8b7a415e68e5be7f0dc403d6af3e97f60219411b1677534fe4f3c6
+  tag: 22.05.10.2.1@sha256:8d0f870dfb100c8b72e97a3b5729e420a52e92e8fbef6ef35e51abf65c8660c9
  pullPolicy: IfNotPresent

-controller:
-  # -- Set the controller type.
-  # Valid options are deployment, daemonset or statefulset
-  type: statefulset
-  # -- Number of desired pods
-  replicas: 1
-  # -- Set the controller upgrade strategy
-  # For Deployments, valid values are Recreate (default) and RollingUpdate.
-  # For StatefulSets, valid values are OnDelete and RollingUpdate (default).
-  # DaemonSets ignore this.
-  strategy: RollingUpdate
-  rollingUpdate:
-    # -- Set deployment RollingUpdate max unavailable
-    unavailable: 1
-    # -- Set deployment RollingUpdate max surge
-    surge:
-    # -- Set statefulset RollingUpdate partition
-    partition:
-  # -- ReplicaSet revision history limit
-  revisionHistoryLimit: 3
+workload:
+  main:
+    replicas: 1
+    type: StatefulSet
+    strategy: RollingUpdate
+    podSpec:
+      containers:
+        main:
+          env:
+            aliasgroup1: ""
+            dictionaries: "de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru"
+            extra_params: "--o:welcome.enable=false --o:logging.level=information --o:user_interface.mode=notebookbar --o:ssl.termination=true --o:ssl.enable=false "
+            server_name: "collabora.domain.tld"
+            DONT_GEN_SSL_CERT: true
+            username: ""
+            password: ""

 securityContext:
-  readOnlyRootFilesystem: false
-  allowPrivilegeEscalation: true
-
-podSecurityContext:
-  runAsUser: 104
-  runAsGroup: 106
+  container:
+    readOnlyRootFilesystem: false
+    allowPrivilegeEscalation: true
+    runAsUser: 104
+    runAsGroup: 106

 service:
  main:
@@ -39,16 +34,6 @@ service:
        port: 10105
        targetPort: 9980

-secretEnv:
-  username: ""
-  password: ""
-
-env:
-  aliasgroup1: ""
-  dictionaries: "de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru"
-  extra_params: "--o:welcome.enable=false --o:logging.level=information --o:user_interface.mode=notebookbar --o:ssl.termination=true --o:ssl.enable=false "
-  server_name: "collabora.domain.tld"
-  DONT_GEN_SSL_CERT: true
-
 portal:
-  enabled: true
+  open:
+    enabled: true
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "10.10.2"
+appVersion: "10.11.2"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.2.1
 deprecated: false
 description: Fast, reliable, scalable, and easy to use open-source relational database system.
 home: https://truecharts.org/charts/dependency/mariadb
@@ -21,12 +21,12 @@ maintainers:
 name: mariadb
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/mariadb
-  - https://hub.docker.com/bitnami/mariadb
+  - https://hub.docker.com/r/bitnami/mariadb
  - https://github.com/bitnami/bitnami-docker-mariadb
  - https://github.com/prometheus/mysqld_exporter
  - https://mariadb.org
 type: application
-version: 5.0.26
+version: 6.0.0
 annotations:
  truecharts.org/catagories: |
    - database
@@ -1,10 +1,15 @@
 # Include{groups}
 questions:
 # Include{global}
-# Include{controller}
-# Include{replicas}
-# Include{replica1}
-# Include{controllerExpertExtraArgs}
+# Include{workload}
+# Include{workloadDeployment}
+
+# Include{replicas1}
+# Include{podSpec}
+# Include{containerMain}
+# Include{containerBasic}
+# Include{containerAdvanced}
+
 # Include{containerConfig}
  - variable: mariadbDatabase
    group: "App Configuration"
@@ -74,51 +79,34 @@ questions:
            attrs:
 # Include{persistenceBasic}
 # Include{persistenceList}
-# Include{security}
-# Include{securityContextAdvancedRoot}
-              - variable: privileged
-                label: "Privileged mode"
+# Include{securityContextRoot}
+
+              - variable: runAsUser
+                label: "runAsUser"
+                description: "The UserID of the user running the application"
                schema:
-                  type: boolean
-                  default: false
-              - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
+                  type: int
+                  default: 568
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID of the user running the application"
                schema:
-                  type: boolean
-                  default: false
-              - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
+                  type: int
+                  default: 0
+# Include{securityContextContainer}
+# Include{securityContextAdvanced}
+# Include{securityContextPod}
+              - variable: fsGroup
+                label: "fsGroup"
+                description: "The group that should own ALL storage."
                schema:
-                  type: boolean
-                  default: false
-              - variable: runAsNonRoot
-                label: "runAsNonRoot"
-                schema:
-                  type: boolean
-                  default: true
-# Include{podSecurityContextRoot}
-        - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
-          schema:
-            type: int
-            default: 568
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 0
-        - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
-          schema:
-            type: int
-            default: 568
-# Include{podSecurityContextAdvanced}
+                  type: int
+                  default: 568568
+
 # Include{resources}
 # Include{advanced}
 # Include{addons}
 # Include{codeserver}
+# Include{netshoot}
 # Include{vpn}
 # Include{documentation}
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
@@ -1 +1 @@
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
@@ -1,28 +1,80 @@
 image:
  repository: tccr.io/truecharts/mariadb
  pullPolicy: IfNotPresent
-  tag: 10.10.2@sha256:1a90d0e738834982de7e9f0046f2bbdf1f4b3388987359fb868e610c2cca6efa
+  tag: 10.11.2@sha256:fc01102eef1de92155b5097636ef738700c8bef1735f52a397b1505cbf455c0f

-controller:
-  # -- Set the controller type.
-  # Valid options are deployment, daemonset or statefulset
-  type: statefulset
-  # -- Number of desired pods
-  replicas: 1
-  # -- Set the controller upgrade strategy
-  # For Deployments, valid values are Recreate (default) and RollingUpdate.
-  # For StatefulSets, valid values are OnDelete and RollingUpdate (default).
-  # DaemonSets ignore this.
-  strategy: RollingUpdate
-  rollingUpdate:
-    # -- Set deployment RollingUpdate max unavailable
-    unavailable: 1
-    # -- Set deployment RollingUpdate max surge
-    surge:
-    # -- Set statefulset RollingUpdate partition
-    partition:
-  # -- ReplicaSet revision history limit
-  revisionHistoryLimit: 3
+workload:
+  main:
+    replicas: 1
+    type: StatefulSet
+    strategy: RollingUpdate
+    podSpec:
+      containers:
+        main:
+          env:
+            MARIADB_PASSWORD:
+              secretKeyRef:
+                name: "credentials"
+                key: "mariadb-password"
+            MARIADB_ROOT_PASSWORD:
+              secretKeyRef:
+                name: "credentials"
+                key: "mariadb-root-password"
+            MARIADB_USER: "{{ .Values.mariadbUsername }}"
+            MARIADB_DATABASE: "{{ .Values.mariadbDatabase }}"
+
+          # -- Probe configuration
+          # -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+          # @default -- See below
+          probes:
+            # -- Liveness probe configuration
+            # @default -- See below
+            liveness:
+              # -- Enable the liveness probe
+              enabled: true
+              # -- Set this to `true` if you wish to specify your own livenessProbe
+              custom: true
+              # -- The spec field contains the values for the default livenessProbe.
+              # If you selected `custom: true`, this field holds the definition of the livenessProbe.
+              # @default -- See below
+              spec:
+                exec:
+                  command:
+                    - /bin/bash
+                    - -ec
+                    - "until /opt/bitnami/scripts/mariadb/healthcheck.sh; do sleep 2; done"
+
+            # -- Redainess probe configuration
+            # @default -- See below
+            readiness:
+              # -- Enable the readiness probe
+              enabled: true
+              # -- Set this to `true` if you wish to specify your own readinessProbe
+              custom: true
+              # -- The spec field contains the values for the default readinessProbe.
+              # If you selected `custom: true`, this field holds the definition of the readinessProbe.
+              # @default -- See below
+              spec:
+                exec:
+                  command:
+                    - /bin/bash
+                    - -ec
+                    - "until /opt/bitnami/scripts/mariadb/healthcheck.sh; do sleep 2; done"
+            # -- Startup probe configuration
+            # @default -- See below
+            startup:
+              # -- Enable the startup probe
+              enabled: true
+              custom: true
+              # -- The spec field contains the values for the default livenessProbe.
+              # If you selected `custom: true`, this field holds the definition of the livenessProbe.
+              # @default -- See below
+              spec:
+                exec:
+                  command:
+                    - /bin/bash
+                    - -ec
+                    - "until /opt/bitnami/scripts/mariadb/healthcheck.sh; do sleep 2; done"

 service:
  main:
@@ -32,7 +84,9 @@ service:
        targetPort: 3306

 securityContext:
-  readOnlyRootFilesystem: false
+  container:
+    readOnlyRootFilesystem: false
+    runAsGroup: 0

 secret:
  credentials:
@@ -41,79 +95,11 @@ secret:
      mariadb-password: '{{ ( .Values.mariadbPassword | default "empty" ) }}'
      mariadb-root-password: '{{ ( .Values.mariadbRootPassword | default "empty" ) }}'

-env:
-  MARIADB_PASSWORD:
-    secretKeyRef:
-      name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}'
-      key: "mariadb-password"
-  MARIADB_ROOT_PASSWORD:
-    secretKeyRef:
-      name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}'
-      key: "mariadb-root-password"
-  MARIADB_USER: "{{ .Values.mariadbUsername }}"
-  MARIADB_DATABASE: "{{ .Values.mariadbDatabase }}"
-
-podSecurityContext:
-  runAsGroup: 0
-
 volumeClaimTemplates:
  data:
    enabled: true
    mountPath: "/bitnami/mariadb"

-# -- Probe configuration
-# -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-# @default -- See below
-probes:
-  # -- Liveness probe configuration
-  # @default -- See below
-  liveness:
-    # -- Enable the liveness probe
-    enabled: true
-    # -- Set this to `true` if you wish to specify your own livenessProbe
-    custom: true
-    # -- The spec field contains the values for the default livenessProbe.
-    # If you selected `custom: true`, this field holds the definition of the livenessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - /bin/bash
-          - -ec
-          - "until /opt/bitnami/scripts/mariadb/healthcheck.sh; do sleep 2; done"
-
-  # -- Redainess probe configuration
-  # @default -- See below
-  readiness:
-    # -- Enable the readiness probe
-    enabled: true
-    # -- Set this to `true` if you wish to specify your own readinessProbe
-    custom: true
-    # -- The spec field contains the values for the default readinessProbe.
-    # If you selected `custom: true`, this field holds the definition of the readinessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - /bin/bash
-          - -ec
-          - "until /opt/bitnami/scripts/mariadb/healthcheck.sh; do sleep 2; done"
-  # -- Startup probe configuration
-  # @default -- See below
-  startup:
-    # -- Enable the startup probe
-    enabled: true
-    custom: true
-    # -- The spec field contains the values for the default livenessProbe.
-    # If you selected `custom: true`, this field holds the definition of the livenessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - /bin/bash
-          - -ec
-          - "until /opt/bitnami/scripts/mariadb/healthcheck.sh; do sleep 2; done"
-
 mariadbPassword: "testpass"
 mariadbUsername: "test"
 mariadbDatabase: "test"
@@ -121,7 +107,8 @@ mariadbRootPassword: "testroot"
 existingSecret: ""

 portal:
-  enabled: false
+  open:
+    enabled: false

-manifests:
+manifestManager:
  enabled: false
@@ -3,7 +3,7 @@ appVersion: "1.6.18"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.2.1
 deprecated: false
 description: Memcached is a memory-backed database caching solution
 home: https://truecharts.org/charts/dependency/memcached
@@ -20,11 +20,11 @@ maintainers:
 name: memcached
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/memcached
-  - https://hub.docker.com/bitnami/memcached
+  - https://hub.docker.com/r/bitnami/memcached
  - https://github.com/bitnami/bitnami-docker-memcached
  - http://memcached.org/
 type: application
-version: 5.0.25
+version: 6.0.0
 annotations:
  truecharts.org/catagories: |
    - database
@@ -1,32 +1,14 @@
 # Include{groups}
 questions:
 # Include{global}
-# Include{controller}
-# Include{replicas}
-# Include{replica1}
-# Include{controllerExpertExtraArgs}
+# Include{workload}
+# Include{workloadDeployment}
+# Include{replicas1}
+# Include{podSpec}
+# Include{containerMain}
+# Include{containerBasic}
+# Include{containerAdvanced}
 # Include{containerConfig}
-  - variable: postgresqlDatabase
-    group: "App Configuration"
-    label: "Database Name"
-    schema:
-      type: string
-      default: "mydatabase"
-      required: true
-  - variable: postgresqlUsername
-    group: "App Configuration"
-    label: "Database User"
-    schema:
-      type: string
-      default: "mydatabaseuser"
-      required: true
-  - variable: postgresqlPassword
-    group: "App Configuration"
-    label: "Database Password"
-    schema:
-      type: string
-      default: ""
-      required: true
 # Include{serviceRoot}
        - variable: main
          label: "Main Service"
@@ -55,51 +37,34 @@ questions:
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceList}
-# Include{security}
-# Include{securityContextAdvancedRoot}
-              - variable: privileged
-                label: "Privileged mode"
+# Include{securityContextRoot}
+
+              - variable: runAsUser
+                label: "runAsUser"
+                description: "The UserID of the user running the application"
                schema:
-                  type: boolean
-                  default: false
-              - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
+                  type: int
+                  default: 568
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID of the user running the application"
                schema:
-                  type: boolean
-                  default: true
-              - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
+                  type: int
+                  default: 568
+# Include{securityContextContainer}
+# Include{securityContextAdvanced}
+# Include{securityContextPod}
+              - variable: fsGroup
+                label: "fsGroup"
+                description: "The group that should own ALL storage."
                schema:
-                  type: boolean
-                  default: false
-              - variable: runAsNonRoot
-                label: "runAsNonRoot"
-                schema:
-                  type: boolean
-                  default: true
-# Include{podSecurityContextRoot}
-        - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
-          schema:
-            type: int
-            default: 568
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 568
-        - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
-          schema:
-            type: int
-            default: 568
-# Include{podSecurityContextAdvanced}
+                  type: int
+                  default: 568568
+
 # Include{resources}
 # Include{advanced}
 # Include{addons}
 # Include{codeserver}
+# Include{netshoot}
 # Include{vpn}
 # Include{documentation}
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
@@ -1,2 +1,2 @@

-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
@@ -1,7 +1,7 @@
 image:
  repository: tccr.io/truecharts/memcached
  pullPolicy: IfNotPresent
-  tag: 1.6.18@sha256:e53803598eedae2c5da839832bf49fcc054b3367608325ec15a2e51c299cca91
+  tag: 1.6.18@sha256:49998f1e9bb4c1537c559c9e6a757c93a346d2ea6b03d03ecdca3bda3c8d4ab6

 service:
  main:
@@ -11,7 +11,8 @@ service:
        targetPort: 11211

 portal:
-  enabled: false
+  open:
+    enabled: false

-manifests:
+manifestManager:
  enabled: false
@@ -3,7 +3,7 @@ appVersion: "6.0.4"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.2.1
 deprecated: false
 description: Fast, reliable, scalable, and easy to use open-source no-sql database system.
 home: https://truecharts.org/charts/dependency/mongodb
@@ -20,12 +20,11 @@ maintainers:
 name: mongodb
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/mongodb
-  - https://hub.docker.com/bitnami/mongodb
-  - bitnami/mongodb mongoclient/mongoclient
+  - https://hub.docker.com/r/bitnami/mongodb
  - https://github.com/bitnami/bitnami-docker-mongodb
  - https://www.mongodb.com
 type: application
-version: 4.0.28
+version: 5.0.0
 annotations:
  truecharts.org/catagories: |
    - database
@@ -1,10 +1,15 @@
 # Include{groups}
 questions:
 # Include{global}
-# Include{controller}
-# Include{replicas}
-# Include{replica1}
-# Include{controllerExpertExtraArgs}
+# Include{workload}
+# Include{workloadDeployment}
+
+# Include{replicas1}
+# Include{podSpec}
+# Include{containerMain}
+# Include{containerBasic}
+# Include{containerAdvanced}
+
 # Include{containerConfig}
  - variable: mongodbDatabase
    group: "App Configuration"
@@ -74,51 +79,34 @@ questions:
            attrs:
 # Include{persistenceBasic}
 # Include{persistenceList}
-# Include{security}
-# Include{securityContextAdvancedRoot}
-              - variable: privileged
-                label: "Privileged mode"
+# Include{securityContextRoot}
+
+              - variable: runAsUser
+                label: "runAsUser"
+                description: "The UserID of the user running the application"
                schema:
-                  type: boolean
-                  default: false
-              - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
+                  type: int
+                  default: 568
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID of the user running the application"
                schema:
-                  type: boolean
-                  default: false
-              - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
+                  type: int
+                  default: 0
+# Include{securityContextContainer}
+# Include{securityContextAdvanced}
+# Include{securityContextPod}
+              - variable: fsGroup
+                label: "fsGroup"
+                description: "The group that should own ALL storage."
                schema:
-                  type: boolean
-                  default: false
-              - variable: runAsNonRoot
-                label: "runAsNonRoot"
-                schema:
-                  type: boolean
-                  default: true
-# Include{podSecurityContextRoot}
-        - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
-          schema:
-            type: int
-            default: 568
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 0
-        - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
-          schema:
-            type: int
-            default: 568
-# Include{podSecurityContextAdvanced}
+                  type: int
+                  default: 568568
+
 # Include{resources}
 # Include{advanced}
 # Include{addons}
 # Include{codeserver}
+# Include{netshoot}
 # Include{vpn}
 # Include{documentation}
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
@@ -1 +1 @@
-{{- include "tc.common.loader.all" . }}
+{{- include "tc.v1.common.loader.all" . }}
@@ -1,28 +1,80 @@
 image:
  repository: tccr.io/truecharts/mongodb
  pullPolicy: IfNotPresent
-  tag: 6.0.4@sha256:e62f402b73e6663d7d1ab8195906153eb9f1487b464673e627125171478b40de
+  tag: 6.0.4@sha256:3600c9f13d96311ddad4d2de6520d54c89a8708ee36798e4dc6fb93f59c1eab4

-controller:
-  # -- Set the controller type.
-  # Valid options are deployment, daemonset or statefulset
-  type: statefulset
-  # -- Number of desired pods
-  replicas: 1
-  # -- Set the controller upgrade strategy
-  # For Deployments, valid values are Recreate (default) and RollingUpdate.
-  # For StatefulSets, valid values are OnDelete and RollingUpdate (default).
-  # DaemonSets ignore this.
-  strategy: RollingUpdate
-  rollingUpdate:
-    # -- Set deployment RollingUpdate max unavailable
-    unavailable: 1
-    # -- Set deployment RollingUpdate max surge
-    surge:
-    # -- Set statefulset RollingUpdate partition
-    partition:
-  # -- ReplicaSet revision history limit
-  revisionHistoryLimit: 3
+workload:
+  main:
+    replicas: 1
+    type: StatefulSet
+    strategy: RollingUpdate
+    podSpec:
+      containers:
+        main:
+          env:
+            MONGODB_USERNAME: "{{ .Values.mongodbUsername }}"
+            MONGODB_DATABASE: "{{ .Values.mongodbDatabase }}"
+            MONGODB_PASSWORD:
+              secretKeyRef:
+                name: "credentials"
+                key: "mongodb-password"
+            MONGODB_ROOT_PASSWORD:
+              secretKeyRef:
+                name: "credentials"
+                key: "mongodb-root-password"
+          # -- Probe configuration
+          # -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+          # @default -- See below
+          probes:
+            # -- Liveness probe configuration
+            # @default -- See below
+            liveness:
+              # -- Enable the liveness probe
+              enabled: true
+              # -- Set this to `true` if you wish to specify your own livenessProbe
+              custom: true
+              # -- The spec field contains the values for the default livenessProbe.
+              # If you selected `custom: true`, this field holds the definition of the livenessProbe.
+              # @default -- See below
+              spec:
+                exec:
+                  command:
+                    - /bin/bash
+                    - -ec
+                    - echo "db.runCommand(\"ping\")" | mongosh --host localhost --port 27017 ${MONGODB_DATABASE} --quiet
+
+            # -- Redainess probe configuration
+            # @default -- See below
+            readiness:
+              # -- Enable the readiness probe
+              enabled: true
+              # -- Set this to `true` if you wish to specify your own readinessProbe
+              custom: true
+              # -- The spec field contains the values for the default readinessProbe.
+              # If you selected `custom: true`, this field holds the definition of the readinessProbe.
+              # @default -- See below
+              spec:
+                exec:
+                  command:
+                    - /bin/bash
+                    - -ec
+                    - echo "db.runCommand(\"ping\")" | mongosh --host localhost --port 27017 ${MONGODB_DATABASE} --quiet
+
+            # -- Startup probe configuration
+            # @default -- See below
+            startup:
+              # -- Enable the startup probe
+              enabled: true
+              custom: true
+              # -- The spec field contains the values for the default livenessProbe.
+              # If you selected `custom: true`, this field holds the definition of the livenessProbe.
+              # @default -- See below
+              spec:
+                exec:
+                  command:
+                    - /bin/bash
+                    - -ec
+                    - echo "db.runCommand(\"ping\")" | mongosh --host localhost --port 27017 ${MONGODB_DATABASE} --quiet

 service:
  main:
@@ -32,70 +84,15 @@ service:
        targetPort: 27017

 securityContext:
-  readOnlyRootFilesystem: false
-
-podSecurityContext:
-  runAsGroup: 0
+  container:
+    runAsGroup: 0
+    readOnlyRootFilesystem: false

 volumeClaimTemplates:
  data:
    enabled: true
    mountPath: "/bitnami/mongodb"

-# -- Probe configuration
-# -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-# @default -- See below
-probes:
-  # -- Liveness probe configuration
-  # @default -- See below
-  liveness:
-    # -- Enable the liveness probe
-    enabled: true
-    # -- Set this to `true` if you wish to specify your own livenessProbe
-    custom: true
-    # -- The spec field contains the values for the default livenessProbe.
-    # If you selected `custom: true`, this field holds the definition of the livenessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - /bin/bash
-          - -ec
-          - echo "db.runCommand(\"ping\")" | mongosh --host localhost --port 27017 ${MONGODB_DATABASE} --quiet
-
-  # -- Redainess probe configuration
-  # @default -- See below
-  readiness:
-    # -- Enable the readiness probe
-    enabled: true
-    # -- Set this to `true` if you wish to specify your own readinessProbe
-    custom: true
-    # -- The spec field contains the values for the default readinessProbe.
-    # If you selected `custom: true`, this field holds the definition of the readinessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - /bin/bash
-          - -ec
-          - echo "db.runCommand(\"ping\")" | mongosh --host localhost --port 27017 ${MONGODB_DATABASE} --quiet
-
-  # -- Startup probe configuration
-  # @default -- See below
-  startup:
-    # -- Enable the startup probe
-    enabled: true
-    custom: true
-    # -- The spec field contains the values for the default livenessProbe.
-    # If you selected `custom: true`, this field holds the definition of the livenessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - /bin/bash
-          - -ec
-          - echo "db.runCommand(\"ping\")" | mongosh --host localhost --port 27017 ${MONGODB_DATABASE} --quiet
-
 mongodbPassword: "testpass"
 mongodbUsername: "test"
 mongodbDatabase: "test"
@@ -109,20 +106,9 @@ secret:
      mongodb-password: '{{ ( .Values.mongodbPassword | default "empty" ) }}'
      mongodb-root-password: '{{ ( .Values.mongodbRootPassword | default "empty" ) }}'

-env:
-  MONGODB_USERNAME: "{{ .Values.mongodbUsername }}"
-  MONGODB_DATABASE: "{{ .Values.mongodbDatabase }}"
-  MONGODB_PASSWORD:
-    secretKeyRef:
-      name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}'
-      key: "mongodb-password"
-  MONGODB_ROOT_PASSWORD:
-    secretKeyRef:
-      name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}'
-      key: "mongodb-root-password"
-
 portal:
-  enabled: false
+  open:
+    enabled: false

-manifests:
+manifestManager:
  enabled: false
@@ -1,124 +0,0 @@
-# Include{groups}
-questions:
-# Include{global}
-# Include{controller}
-# Include{replicas}
-# Include{replica1}
-# Include{controllerExpertExtraArgs}
-# Include{containerConfig}
-  - variable: postgresqlDatabase
-    group: "App Configuration"
-    label: "Database Name"
-    schema:
-      type: string
-      default: "mydatabase"
-      required: true
-  - variable: postgresqlUsername
-    group: "App Configuration"
-    label: "Database User"
-    schema:
-      type: string
-      default: "mydatabaseuser"
-      required: true
-  - variable: postgresqlPassword
-    group: "App Configuration"
-    label: "Database Password"
-    schema:
-      type: string
-      default: ""
-      required: true
-  - variable: postgrespassword
-    group: "App Configuration"
-    label: "Root Password"
-    schema:
-      type: string
-      default: ""
-      required: true
-# Include{serviceRoot}
-        - variable: main
-          label: "Main Service"
-          description: "The Primary service on which the healthcheck runs, often the webUI"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-# Include{serviceSelectorLoadBalancer}
-# Include{serviceSelectorExtras}
-                    - variable: main
-                      label: "Main Service Port Configuration"
-                      schema:
-                        additional_attrs: true
-                        type: dict
-                        attrs:
-                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 5432
-                              required: true
-# Include{serviceExpertRoot}
-            default: false
-# Include{serviceExpert}
-# Include{serviceList}
-# Include{vctRoot}
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: db
-          label: "DB Storage"
-          description: "Stores the old Application Database."
-          schema:
-            type: dict
-            hidden: true
-            attrs:
-# Include{persistenceBasic}
-# Include{persistenceList}
-# Include{security}
-# Include{securityContextAdvancedRoot}
-              - variable: privileged
-                label: "Privileged mode"
-                schema:
-                  type: boolean
-                  default: false
-              - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
-                schema:
-                  type: boolean
-                  default: false
-              - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
-                schema:
-                  type: boolean
-                  default: false
-              - variable: runAsNonRoot
-                label: "runAsNonRoot"
-                schema:
-                  type: boolean
-                  default: true
-# Include{podSecurityContextRoot}
-        - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
-          schema:
-            type: int
-            default: 568
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 0
-        - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
-          schema:
-            type: int
-            default: 568
-# Include{podSecurityContextAdvanced}
-# Include{resources}
-# Include{advanced}
-# Include{addons}
-# Include{codeserver}
-# Include{vpn}
-# Include{documentation}
@@ -1,2 +0,0 @@
-
-{{ include "tc.common.loader.all" . }}
@@ -1,132 +0,0 @@
-image:
-  repository: tccr.io/truecharts/postgresql
-  pullPolicy: IfNotPresent
-  tag: 14.6.0@sha256:101b616f2cd0d4d3c1963ecdffd5ffc5704f202967288e718f7aa2ae526600bc
-
-controller:
-  # -- Set the controller type.
-  # Valid options are deployment, daemonset or statefulset
-  type: statefulset
-  # -- Number of desired pods
-  replicas: 1
-  # -- Set the controller upgrade strategy
-  # For Deployments, valid values are Recreate (default) and RollingUpdate.
-  # For StatefulSets, valid values are OnDelete and RollingUpdate (default).
-  # DaemonSets ignore this.
-  strategy: RollingUpdate
-  rollingUpdate:
-    # -- Set deployment RollingUpdate max unavailable
-    unavailable: 1
-    # -- Set deployment RollingUpdate max surge
-    surge:
-    # -- Set statefulset RollingUpdate partition
-    partition:
-  # -- ReplicaSet revision history limit
-  revisionHistoryLimit: 3
-
-securityContext:
-  readOnlyRootFilesystem: false
-
-service:
-  main:
-    ports:
-      main:
-        port: 5432
-        targetPort: 5432
-
-## TODO: Fix the backup-on-upgrade system
-enableUpgradeBackup: false
-
-podSecurityContext:
-  runAsGroup: 0
-
-volumeClaimTemplates:
-  db:
-    enabled: true
-    mountPath: "/bitnami/postgresql"
-
-# -- Probe configuration
-# -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-# @default -- See below
-probes:
-  # -- Liveness probe configuration
-  # @default -- See below
-  liveness:
-    # -- Enable the liveness probe
-    enabled: true
-    # -- Set this to `true` if you wish to specify your own livenessProbe
-    custom: true
-    # -- The spec field contains the values for the default livenessProbe.
-    # If you selected `custom: true`, this field holds the definition of the livenessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - sh
-          - -c
-          - "until pg_isready -U ${POSTGRES_USER} -h localhost; do sleep 2 ; done"
-
-  # -- Redainess probe configuration
-  # @default -- See below
-  readiness:
-    # -- Enable the readiness probe
-    enabled: true
-    # -- Set this to `true` if you wish to specify your own readinessProbe
-    custom: true
-    # -- The spec field contains the values for the default readinessProbe.
-    # If you selected `custom: true`, this field holds the definition of the readinessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - sh
-          - -c
-          - "until pg_isready -U ${POSTGRES_USER} -h localhost; do sleep 2 ; done"
-  # -- Startup probe configuration
-  # @default -- See below
-  startup:
-    # -- Enable the startup probe
-    enabled: true
-    custom: true
-    # -- The spec field contains the values for the default livenessProbe.
-    # If you selected `custom: true`, this field holds the definition of the livenessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - sh
-          - -c
-          - "until pg_isready -U ${POSTGRES_USER} -h localhost; do sleep 2 ; done"
-
-postgresqlPassword: "testpass"
-postgresqlUsername: "test"
-postgresqlDatabase: "test"
-postgrespassword: "testroot"
-existingSecret: ""
-
-secret:
-  credentials:
-    enabled: true
-    data:
-      postgresql-password: '{{ ( .Values.postgresqlPassword | default "empty" ) }}'
-      postgresql-postgres-password: '{{ ( .Values.postgrespassword | default "empty" ) }}'
-
-env:
-  POSTGRES_PASSWORD:
-    secretKeyRef:
-      name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}'
-      key: "postgresql-password"
-  POSTGRESQL_POSTGRES_PASSWORD:
-    secretKeyRef:
-      name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}'
-      key: "postgresql-postgres-password"
-  POSTGRES_USER: "{{ .Values.postgresqlUsername }}"
-  POSTGRES_DB: "{{ .Values.postgresqlDatabase }}"
-# POSTGRESQL_POSTGRES_PASSWORD: "{{ .Values.postgrespassword }}"
-# POSTGRESQL_PASSWORD: "{{ .Values.password }}"
-
-portal:
-  enabled: false
-
-manifests:
-  enabled: false
@@ -1,4 +0,0 @@
-{{/* Render the templates */}}
-{{ include "tc.common.loader.init" . }}
-{{ include "tc.promtail.servicemonitor" . }}
-{{ include "tc.common.loader.apply" . }}
@@ -3,7 +3,7 @@ appVersion: "7.0.8"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.2.1
 deprecated: false
 description: Open source, advanced key-value store.
 home: https://truecharts.org/charts/dependency/redis
@@ -20,12 +20,11 @@ maintainers:
 name: redis
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/redis
-  - https://hub.docker.com/bitnami/redis
-  - bitnami/redis redislabs/redisinsight redislabs/rejson
+  - https://hub.docker.com/r/bitnami/redis
  - https://github.com/bitnami/bitnami-docker-redis
  - http://redis.io/
 type: application
-version: 5.0.29
+version: 6.0.1
 annotations:
  truecharts.org/catagories: |
    - database
@@ -1,10 +1,15 @@
 # Include{groups}
 questions:
 # Include{global}
-# Include{controller}
-# Include{replicas}
-# Include{replica1}
-# Include{controllerExpertExtraArgs}
+# Include{workload}
+# Include{workloadDeployment}
+
+# Include{replicas1}
+# Include{podSpec}
+# Include{containerMain}
+# Include{containerBasic}
+# Include{containerAdvanced}
+
 # Include{containerConfig}
  - variable: redisPassword
    group: "App Configuration"
@@ -53,51 +58,34 @@ questions:
            attrs:
 # Include{persistenceBasic}
 # Include{persistenceList}
-# Include{security}
-# Include{securityContextAdvancedRoot}
-              - variable: privileged
-                label: "Privileged mode"
+# Include{securityContextRoot}
+
+              - variable: runAsUser
+                label: "runAsUser"
+                description: "The UserID of the user running the application"
                schema:
-                  type: boolean
-                  default: false
-              - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
+                  type: int
+                  default: 568
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID this App of the user running the application"
                schema:
-                  type: boolean
-                  default: false
-              - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
+                  type: int
+                  default: 0
+# Include{securityContextContainer}
+# Include{securityContextAdvanced}
+# Include{securityContextPod}
+              - variable: fsGroup
+                label: "fsGroup"
+                description: "The group that should own ALL storage."
                schema:
-                  type: boolean
-                  default: false
-              - variable: runAsNonRoot
-                label: "runAsNonRoot"
-                schema:
-                  type: boolean
-                  default: true
-# Include{podSecurityContextRoot}
-        - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
-          schema:
-            type: int
-            default: 568
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 0
-        - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
-          schema:
-            type: int
-            default: 568
-# Include{podSecurityContextAdvanced}
+                  type: int
+                  default: 568568
+
 # Include{resources}
 # Include{advanced}
 # Include{addons}
 # Include{codeserver}
+# Include{netshoot}
 # Include{vpn}
 # Include{documentation}
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
@@ -1,2 +1,2 @@

-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
@@ -1,34 +1,81 @@
 image:
  repository: tccr.io/truecharts/redis
  pullPolicy: IfNotPresent
-  tag: 7.0.8@sha256:b762d1eb8579cdb3543f5da78561d2ce9936667e79db2af2f8d94c95bf095209
+  tag: 7.0.8@sha256:13e0bbf5369ed2f219b96c0e7136b531eb1fdca1db7b7e2c72e13133adf26288

-controller:
-  # -- Set the controller type.
-  # Valid options are deployment, daemonset or statefulset
-  type: statefulset
-  # -- Number of desired pods
-  replicas: 1
-  # -- Set the controller upgrade strategy
-  # For Deployments, valid values are Recreate (default) and RollingUpdate.
-  # For StatefulSets, valid values are OnDelete and RollingUpdate (default).
-  # DaemonSets ignore this.
-  strategy: RollingUpdate
-  rollingUpdate:
-    # -- Set deployment RollingUpdate max unavailable
-    unavailable: 1
-    # -- Set deployment RollingUpdate max surge
-    surge:
-    # -- Set statefulset RollingUpdate partition
-    partition:
-  # -- ReplicaSet revision history limit
-  revisionHistoryLimit: 3
+workload:
+  main:
+    replicas: 1
+    type: StatefulSet
+    strategy: RollingUpdate
+    podSpec:
+      containers:
+        main:
+          env:
+            REDIS_REPLICATION_MODE: master
+            ALLOW_EMPTY_PASSWORD: "yes"
+            REDIS_PORT: "{{ .Values.service.main.ports.main.targetPort }}"
+            REDIS_PASSWORD:
+              secretKeyRef:
+                name: "credentials"
+                key: "redis-password"
+          # -- Probe configuration
+          # -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+          # @default -- See below
+          probes:
+            # -- Liveness probe configuration
+            # @default -- See below
+            liveness:
+              # -- Enable the liveness probe
+              enabled: true
+              # -- Set this to `true` if you wish to specify your own livenessProbe
+              custom: true
+              # -- The spec field contains the values for the default livenessProbe.
+              # If you selected `custom: true`, this field holds the definition of the livenessProbe.
+              # @default -- See below
+              spec:
+                exec:
+                  command:
+                    - sh
+                    - -c
+                    - /health/ping_liveness_local.sh 2
+
+            # -- Redainess probe configuration
+            # @default -- See below
+            readiness:
+              # -- Enable the readiness probe
+              enabled: true
+              # -- Set this to `true` if you wish to specify your own readinessProbe
+              custom: true
+              # -- The spec field contains the values for the default readinessProbe.
+              # If you selected `custom: true`, this field holds the definition of the readinessProbe.
+              # @default -- See below
+              spec:
+                exec:
+                  command:
+                    - sh
+                    - -c
+                    - /health/ping_readiness_local.sh 2
+            # -- Startup probe configuration
+            # @default -- See below
+            startup:
+              # -- Enable the startup probe
+              enabled: true
+              custom: true
+              # -- The spec field contains the values for the default livenessProbe.
+              # If you selected `custom: true`, this field holds the definition of the livenessProbe.
+              # @default -- See below
+              spec:
+                exec:
+                  command:
+                    - sh
+                    - -c
+                    - /health/ping_readiness_local.sh 2

 securityContext:
-  readOnlyRootFilesystem: false
-
-podSecurityContext:
-  runAsGroup: 0
+  container:
+    readOnlyRootFilesystem: false
+    runAsGroup: 0

 configmap:
  health:
@@ -109,15 +156,6 @@ secret:
    data:
      redis-password: '{{ ( .Values.redisPassword | default "nothing" ) }}'

-env:
-  REDIS_REPLICATION_MODE: master
-  ALLOW_EMPTY_PASSWORD: "yes"
-  REDIS_PORT: "{{ .Values.service.main.ports.main.targetPort }}"
-  REDIS_PASSWORD:
-    secretKeyRef:
-      name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}'
-      key: "redis-password"
-
 redisPassword: "testpass"
 existingSecret: ""

@@ -133,80 +171,30 @@ volumeClaimTemplates:
    enabled: true
    mountPath: "/bitnami/redis"

-# -- Probe configuration
-# -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-# @default -- See below
-probes:
-  # -- Liveness probe configuration
-  # @default -- See below
-  liveness:
-    # -- Enable the liveness probe
-    enabled: true
-    # -- Set this to `true` if you wish to specify your own livenessProbe
-    custom: true
-    # -- The spec field contains the values for the default livenessProbe.
-    # If you selected `custom: true`, this field holds the definition of the livenessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - sh
-          - -c
-          - /health/ping_liveness_local.sh 2
-
-  # -- Redainess probe configuration
-  # @default -- See below
-  readiness:
-    # -- Enable the readiness probe
-    enabled: true
-    # -- Set this to `true` if you wish to specify your own readinessProbe
-    custom: true
-    # -- The spec field contains the values for the default readinessProbe.
-    # If you selected `custom: true`, this field holds the definition of the readinessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - sh
-          - -c
-          - /health/ping_readiness_local.sh 2
-  # -- Startup probe configuration
-  # @default -- See below
-  startup:
-    # -- Enable the startup probe
-    enabled: true
-    custom: true
-    # -- The spec field contains the values for the default livenessProbe.
-    # If you selected `custom: true`, this field holds the definition of the livenessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - sh
-          - -c
-          - /health/ping_readiness_local.sh 2
-
 persistence:
-  # -- redis-health configmap mount
-  # @default -- See below
  redis-health:
    enabled: true
-    type: custom
-    # -- Where to mount the volume in the main container.
-    # Defaults to `/<name_of_the_volume>`,
-    # setting to '-' creates the volume but disables the volumeMount.
+    type: configmap
+    objectName: health
    mountPath: "/health"
-    # -- Specify if the volume should be mounted read-only.
-    readOnly: false
-    # -- Define the custom Volume spec here
-    # [[ref]](https://kubernetes.io/docs/concepts/storage/volumes/)
-    volumeSpec:
-      configMap:
-        defaultMode: 0755
-        name: '{{ include "tc.common.names.fullname" . }}-health'
+    defaultMode: "0755"
+    items:
+      - key: ping_readiness_local.sh
+        path: ping_readiness_local.sh
+      - key: ping_liveness_local.sh
+        path: ping_liveness_local.sh
+      - key: ping_readiness_master.sh
+        path: ping_readiness_master.sh
+      - key: ping_liveness_master.sh
+        path: ping_liveness_master.sh
+      - key: ping_liveness_local_and_master.sh
+        path: ping_liveness_local_and_master.sh
+      - key: ping_readiness_local_and_master.sh
+        path: ping_readiness_local_and_master.sh

 portal:
-  enabled: false
+  open:
+    enabled: false

-manifests:
+manifestManager:
  enabled: false
@@ -3,7 +3,7 @@ appVersion: "9.1.1"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.2.1
 deprecated: false
 description: Apache Solr
 home: https://truecharts.org/charts/dependency/solr
@@ -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://hub.docker.com/r/bitnami/solr
  - https://github.com/apache/solr
 type: application
-version: 2.0.27
+version: 2.0.31
 annotations:
  truecharts.org/catagories: |
    - search
@@ -4,10 +4,15 @@ portals:
 # Include{portalLink}
 questions:
 # Include{global}
-# Include{controller}
-# Include{replicas}
-# Include{replica1}
-# Include{controllerExpertExtraArgs}
+# Include{workload}
+# Include{workloadDeployment}
+
+# Include{replicas1}
+# Include{podSpec}
+# Include{containerMain}
+# Include{containerBasic}
+# Include{containerAdvanced}
+
 # Include{containerConfig}
  - variable: solrCores
    group: "App Configuration"
@@ -76,51 +81,34 @@ questions:
            attrs:
 # Include{persistenceBasic}
 # Include{persistenceList}
-# Include{security}
-# Include{securityContextAdvancedRoot}
-              - variable: privileged
-                label: "Privileged mode"
+# Include{securityContextRoot}
+
+              - variable: runAsUser
+                label: "runAsUser"
+                description: "The UserID of the user running the application"
                schema:
-                  type: boolean
-                  default: false
-              - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
+                  type: int
+                  default: 1001
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID this App of the user running the application"
                schema:
-                  type: boolean
-                  default: false
-              - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
+                  type: int
+                  default: 0
+# Include{securityContextContainer}
+# Include{securityContextAdvanced}
+# Include{securityContextPod}
+              - variable: fsGroup
+                label: "fsGroup"
+                description: "The group that should own ALL storage."
                schema:
-                  type: boolean
-                  default: false
-              - variable: runAsNonRoot
-                label: "runAsNonRoot"
-                schema:
-                  type: boolean
-                  default: false
-# Include{podSecurityContextRoot}
-        - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
-          schema:
-            type: int
-            default: 1001
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 0
-        - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
-          schema:
-            type: int
-            default: 568
-# Include{podSecurityContextAdvanced}
+                  type: int
+                  default: 568568
+
 # Include{resources}
 # Include{advanced}
 # Include{addons}
 # Include{codeserver}
+# Include{netshoot}
 # Include{vpn}
 # Include{documentation}
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
@@ -1,2 +1,2 @@

-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
@@ -1,35 +1,100 @@
 image:
  repository: tccr.io/truecharts/solr
  pullPolicy: IfNotPresent
-  tag: 9.1.1@sha256:bf8b3766541b161cb6f03bcf1a750d82c2b33367dc408782fe8b4cf37e26bd8c
+  tag: 9.1.1@sha256:4ac9d6e8120321349f0a3e5dbaff796192a9623de8fb164adf9f42de952479f1

-controller:
-  # -- Set the controller type.
-  # Valid options are deployment, daemonset or statefulset
-  type: statefulset
-  # -- Number of desired pods
-  replicas: 1
-  # -- Set the controller upgrade strategy
-  # For Deployments, valid values are Recreate (default) and RollingUpdate.
-  # For StatefulSets, valid values are OnDelete and RollingUpdate (default).
-  # DaemonSets ignore this.
-  strategy: RollingUpdate
-  rollingUpdate:
-    # -- Set deployment RollingUpdate max unavailable
-    unavailable: 1
-    # -- Set deployment RollingUpdate max surge
-    surge:
-    # -- Set statefulset RollingUpdate partition
-    partition:
-  # -- ReplicaSet revision history limit
-  revisionHistoryLimit: 3
+workload:
+  main:
+    type: StatefulSet
+    replicas: 1
+    strategy: RollingUpdate
+    podSpec:
+      containers:
+        main:
+          env:
+            SOLR_CORES: "{{ .Values.solrCores }}"
+            SOLR_ENABLE_AUTHENTICATION: "{{ .Values.solrEnableAuthentication }}"
+            SOLR_ADMIN_USERNAME: "{{ .Values.solrUsername }}"
+            SOLR_OPTS: "{{ .Values.solrOpts }}"
+            SOLR_ADMIN_PASSWORD:
+              secretKeyRef:
+                name: "credentials"
+                key: "solr-password"
+
+          # -- Probe configuration
+          # -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+          # @default -- See below
+          probes:
+            # -- Liveness probe configuration
+            # @default -- See below
+            liveness:
+              # -- Enable the liveness probe
+              enabled: true
+              # -- Set this to `true` if you wish to specify your own livenessProbe
+              custom: true
+              # -- The spec field contains the values for the default livenessProbe.
+              # If you selected `custom: true`, this field holds the definition of the livenessProbe.
+              # @default -- See below
+              spec:
+                exec:
+                  command:
+                    - /bin/bash
+                    - -ec
+                    - |
+                      if [ "$SOLR_ENABLE_AUTHENTICATION" == "yes" ]; then
+                        until curl --fail --user "${SOLR_ADMIN_USERNAME}":"${SOLR_ADMIN_PASSWORD}" localhost:8983/solr/"${SOLR_CORES}"/admin/ping; do sleep 2; done
+                      else
+                        until curl --fail localhost:8983/solr/"${SOLR_CORES}"/admin/ping; do sleep 2; done
+                      fi;
+
+            # -- Redainess probe configuration
+            # @default -- See below
+            readiness:
+              # -- Enable the readiness probe
+              enabled: true
+              # -- Set this to `true` if you wish to specify your own readinessProbe
+              custom: true
+              # -- The spec field contains the values for the default readinessProbe.
+              # If you selected `custom: true`, this field holds the definition of the readinessProbe.
+              # @default -- See below
+              spec:
+                exec:
+                  command:
+                    - /bin/bash
+                    - -ec
+                    - |
+                      if [ "$SOLR_ENABLE_AUTHENTICATION" == "yes" ]; then
+                        until curl --fail --user "${SOLR_ADMIN_USERNAME}":"${SOLR_ADMIN_PASSWORD}" localhost:8983/solr/"${SOLR_CORES}"/admin/ping; do sleep 2; done
+                      else
+                        until curl --fail localhost:8983/solr/"${SOLR_CORES}"/admin/ping; do sleep 2; done
+                      fi;
+            # -- Startup probe configuration
+            # @default -- See below
+            startup:
+              # -- Enable the startup probe
+              enabled: true
+              custom: true
+              # -- The spec field contains the values for the default livenessProbe.
+              # If you selected `custom: true`, this field holds the definition of the livenessProbe.
+              # @default -- See below
+              spec:
+                exec:
+                  command:
+                    - /bin/bash
+                    - -ec
+                    - |
+                      if [ "$SOLR_ENABLE_AUTHENTICATION" == "yes" ]; then
+                        until curl --fail --user "${SOLR_ADMIN_USERNAME}":"${SOLR_ADMIN_PASSWORD}" localhost:8983/solr/"${SOLR_CORES}"/admin/ping; do sleep 2; done
+                      else
+                        until curl --fail localhost:8983/solr/"${SOLR_CORES}"/admin/ping; do sleep 2; done
+                      fi;

-podSecurityContext:
-  runAsUser: 1001
-  runAsGroup: 0
 securityContext:
-  runAsNonRoot: false
-  readOnlyRootFilesystem: false
+  container:
+    runAsNonRoot: false
+    readOnlyRootFilesystem: false
+    runAsUser: 1001
+    runAsGroup: 0

 service:
  main:
@@ -43,74 +108,6 @@ volumeClaimTemplates:
    enabled: true
    mountPath: "/bitnami/solr"

-# -- Probe configuration
-# -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-# @default -- See below
-probes:
-  # -- Liveness probe configuration
-  # @default -- See below
-  liveness:
-    # -- Enable the liveness probe
-    enabled: true
-    # -- Set this to `true` if you wish to specify your own livenessProbe
-    custom: true
-    # -- The spec field contains the values for the default livenessProbe.
-    # If you selected `custom: true`, this field holds the definition of the livenessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - /bin/bash
-          - -ec
-          - |
-            if [ "$SOLR_ENABLE_AUTHENTICATION" == "yes" ]; then
-              until curl --fail --user "${SOLR_ADMIN_USERNAME}":"${SOLR_ADMIN_PASSWORD}" localhost:8983/solr/"${SOLR_CORES}"/admin/ping; do sleep 2; done
-            else
-              until curl --fail localhost:8983/solr/"${SOLR_CORES}"/admin/ping; do sleep 2; done
-            fi;
-
-  # -- Redainess probe configuration
-  # @default -- See below
-  readiness:
-    # -- Enable the readiness probe
-    enabled: true
-    # -- Set this to `true` if you wish to specify your own readinessProbe
-    custom: true
-    # -- The spec field contains the values for the default readinessProbe.
-    # If you selected `custom: true`, this field holds the definition of the readinessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - /bin/bash
-          - -ec
-          - |
-            if [ "$SOLR_ENABLE_AUTHENTICATION" == "yes" ]; then
-              until curl --fail --user "${SOLR_ADMIN_USERNAME}":"${SOLR_ADMIN_PASSWORD}" localhost:8983/solr/"${SOLR_CORES}"/admin/ping; do sleep 2; done
-            else
-              until curl --fail localhost:8983/solr/"${SOLR_CORES}"/admin/ping; do sleep 2; done
-            fi;
-  # -- Startup probe configuration
-  # @default -- See below
-  startup:
-    # -- Enable the startup probe
-    enabled: true
-    custom: true
-    # -- The spec field contains the values for the default livenessProbe.
-    # If you selected `custom: true`, this field holds the definition of the livenessProbe.
-    # @default -- See below
-    spec:
-      exec:
-        command:
-          - /bin/bash
-          - -ec
-          - |
-            if [ "$SOLR_ENABLE_AUTHENTICATION" == "yes" ]; then
-              until curl --fail --user "${SOLR_ADMIN_USERNAME}":"${SOLR_ADMIN_PASSWORD}" localhost:8983/solr/"${SOLR_CORES}"/admin/ping; do sleep 2; done
-            else
-              until curl --fail localhost:8983/solr/"${SOLR_CORES}"/admin/ping; do sleep 2; done
-            fi;
-
 # Currently only single core is supported, with multiple cores, probes will fail.
 solrCores: "testcore"
 solrEnableAuthentication: "yes"
@@ -126,18 +123,9 @@ secret:
    data:
      solr-password: '{{ ( .Values.solrPassword | default "empty" ) }}'

-env:
-  SOLR_CORES: "{{ .Values.solrCores }}"
-  SOLR_ENABLE_AUTHENTICATION: "{{ .Values.solrEnableAuthentication }}"
-  SOLR_ADMIN_USERNAME: "{{ .Values.solrUsername }}"
-  SOLR_OPTS: "{{ .Values.solrOpts }}"
-  SOLR_ADMIN_PASSWORD:
-    secretKeyRef:
-      name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}'
-      key: "solr-password"
-
 portal:
-  enabled: true
+  open:
+    enabled: true

-manifests:
+manifestManager:
  enabled: false
@@ -3,7 +3,7 @@ appVersion: "jammy"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.2.1
 deprecated: false
 description: This is only used as a subchart.
 home: https://truecharts.org/charts/dependency/subchart
@@ -19,7 +19,7 @@ name: subchart
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/dependency/subchart
 type: application
-version: 3.0.11
+version: 4.0.0
 annotations:
  truecharts.org/catagories: |
    - subchart
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
@@ -1 +1 @@
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
@@ -3,13 +3,12 @@ image:
  pullPolicy: IfNotPresent
  tag: jammy-20221101@sha256:4b9475e08c5180d4e7417dc6a18a26dcce7691e4311e5353dbb952645c5ff43f

-manifests:
+manifestManager:
  enabled: false

-updateCRD: false
-
 portal:
-  enabled: false
+  open:
+    enabled: false

 service:
  main:
@@ -0,0 +1,32 @@
+apiVersion: v2
+appVersion: "0.20.2297"
+dependencies:
+  - name: common
+    repository: https://library-charts.truecharts.org
+    version: 12.2.0
+deprecated: false
+description: testing app for truecharts
+home: https://truecharts.org/charts/stable/jackett
+icon: https://truecharts.org/img/hotlink-ok/chart-icons/jackett.png
+keywords:
+  - jackett
+  - torrent
+  - usenet
+kubeVersion: ">=1.16.0-0"
+maintainers:
+  - email: [email protected]
+    name: TrueCharts
+    url: https://truecharts.org
+name: testapp
+sources:
+  - https://github.com/truecharts/charts/tree/master/charts/stable/jackett
+  - https://ghcr.io/onedr0p/jackett
+  - https://github.com/Jackett/Jackett
+type: application
+version: 0.0.1
+annotations:
+  truecharts.org/catagories: |
+    - media
+    - test
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/grade: U
@@ -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/stable/)
+
+**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*
@@ -0,0 +1,92 @@
+# Include{groups}
+portals:
+  open:
+# Include{portalLink}
+questions:
+# Include{global}
+# Include{workload}\n# Include{workloadDeployment}
+# Include{replicas1}
+# Include{podSpec}
+# Include{containerMain}
+# Include{containerBasic}
+# Include{containerAdvanced}
+# Include{containerConfig}
+# Include{serviceRoot}
+        - variable: main
+          label: "Main Service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{serviceSelectorLoadBalancer}
+# Include{serviceSelectorExtras}
+                    - variable: main
+                      label: "Main Service Port Configuration"
+                      schema:
+                        additional_attrs: true
+                        type: dict
+                        attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 9117
+                              required: true
+# Include{serviceExpertRoot}
+            default: false
+# Include{serviceExpert}
+# Include{serviceList}
+# Include{persistenceRoot}
+        - variable: config
+          label: "App Config Storage"
+          description: "Stores the Application Configuration."
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{persistenceBasic}
+# Include{persistenceList}
+# Include{ingressRoot}
+        - variable: main
+          label: "Main Ingress"
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{ingressDefault}
+# Include{ingressTLS}
+# Include{ingressTraefik}
+# Include{ingressList}
+# Include{securityContextRoot}
+              - variable: runAsUser
+                label: "runAsUser"
+                description: "The UserID of the user running the application"
+                schema:
+                  type: int
+                  default: 568
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID this App of the user running the application"
+                schema:
+                  type: int
+                  default: 568
+# Include{securityContextContainer}
+# Include{securityContextAdvanced}
+# Include{securityContextPod}
+               - variable: fsGroup
+                label: "fsGroup"
+                description: "The group that should own ALL storage."
+                schema:
+                  type: int
+                  default: 568568
+# Include{resources}
+# Include{advanced}
+# Include{postgresql}
+# Include{postgresqlBasics}
+# Include{addons}
+# Include{vpn}
+# Include{codeserver}
+# Include{netshoot}
+# Include{documentation}
@@ -0,0 +1 @@
+{{- include "tc.v1.common.loader.all" . -}}
@@ -0,0 +1,38 @@
+image:
+  repository: tccr.io/truecharts/jackett
+  pullPolicy: IfNotPresent
+  tag: 0.20.2297@sha256:4de1541011cb56935ba5a8e28a58f6cbcf62a903393dc94581eda0b6e2aa117c
+
+securityContext:
+  container:
+    readOnlyRootFilesystem: false
+
+service:
+  main:
+    ports:
+      main:
+        protocol: http
+        targetPort: 9117
+        port: 9117
+
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          probes:
+            liveness:
+              path: "/UI/Login"
+            readiness:
+              path: "/UI/Login"
+            startup:
+              path: "/UI/Login"
+
+persistence:
+  config:
+    enabled: true
+    mountPath: "/config"
+
+portal:
+  open:
+    enabled: true
@@ -6,8 +6,8 @@ dependencies:
    version: 11.1.2
  - condition: redis.enabled
    name: redis
-    repository: https://charts.truecharts.org
-    version: 5.0.29
+    repository: https://deps.truecharts.org
+    version: 5.0.33
 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,12 +22,11 @@ maintainers:
 name: blocky
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/enterprise/blocky
-  - https://hub.docker.com/spx01/blocky
-  - spx01/blocky
+  - https://hub.docker.com/r/spx01/blocky
  - https://0xerr0r.github.io/blocky/
  - https://github.com/0xERR0R/blocky
  - https://github.com/Mozart409/blocky-frontend
-version: 4.0.19
+version: 4.0.24
 annotations:
  truecharts.org/catagories: |
    - network
@@ -0,0 +1,106 @@
+Business Source License 1.1
+
+Parameters
+
+Licensor:             The TrueCharts Project, it's owner and it's contributors
+Licensed Work:        The TrueCharts "Blocky" Helm Chart
+Additional Use Grant: You may use the licensed work in production, as long
+                      as it is directly sourced from a TrueCharts provided
+                      official repository, catalog or source. You may also make private
+                      modification to the directly sourced licenced work,
+                      when used in production.
+
+                      The following cases are, due to their nature, also
+                      defined as 'production use' and explicitly prohibited:
+                      - Bundling, including or displaying the licensed work
+                      with(in) another work intended for production use,
+                      with the apparent intend of facilitating and/or
+                      promoting production use by third parties in
+                      violation of this license.
+
+Change Date:          2050-01-01
+
+Change License:       3-clause BSD license
+
+For information about alternative licensing arrangements for the Software,
+please contact: [email protected]
+
+Notice
+
+The Business Source License (this document, or the “License”) is not an Open
+Source license. However, the Licensed Work will eventually be made available
+under an Open Source License, as stated in this License.
+
+License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
+“Business Source License” is a trademark of MariaDB Corporation Ab.
+
+-----------------------------------------------------------------------------
+
+Business Source License 1.1
+
+Terms
+
+The Licensor hereby grants you the right to copy, modify, create derivative
+works, redistribute, and make non-production use of the Licensed Work. The
+Licensor may make an Additional Use Grant, above, permitting limited
+production use.
+
+Effective on the Change Date, or the fourth anniversary of the first publicly
+available distribution of a specific version of the Licensed Work under this
+License, whichever comes first, the Licensor hereby grants you rights under
+the terms of the Change License, and the rights granted in the paragraph
+above terminate.
+
+If your use of the Licensed Work does not comply with the requirements
+currently in effect as described in this License, you must purchase a
+commercial license from the Licensor, its affiliated entities, or authorized
+resellers, or you must refrain from using the Licensed Work.
+
+All copies of the original and modified Licensed Work, and derivative works
+of the Licensed Work, are subject to this License. This License applies
+separately for each version of the Licensed Work and the Change Date may vary
+for each version of the Licensed Work released by Licensor.
+
+You must conspicuously display this License on each original or modified copy
+of the Licensed Work. If you receive the Licensed Work in original or
+modified form from a third party, the terms and conditions set forth in this
+License apply to your use of that work.
+
+Any use of the Licensed Work in violation of this License will automatically
+terminate your rights under this License for the current and all other
+versions of the Licensed Work.
+
+This License does not grant you any right in any trademark or logo of
+Licensor or its affiliates (provided that you may use a trademark or logo of
+Licensor as expressly required by this License).
+
+TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
+AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
+TITLE.
+
+MariaDB hereby grants you permission to use this License’s text to license
+your works, and to refer to it using the trademark “Business Source License”,
+as long as you comply with the Covenants of Licensor below.
+
+Covenants of Licensor
+
+In consideration of the right to use this License’s text and the “Business
+Source License” name and trademark, Licensor covenants to MariaDB, and to all
+other recipients of the licensed work to be provided by Licensor:
+
+1. To specify as the Change License the GPL Version 2.0 or any later version,
+   or a license that is compatible with GPL Version 2.0 or a later version,
+   where “compatible” means that software provided under the Change License can
+   be included in a program with software provided under GPL Version 2.0 or a
+   later version. Licensor may specify additional Change Licenses without
+   limitation.
+
+2. To either: (a) specify an additional grant of rights to use that does not
+   impose any additional restriction on the right granted in this License, as
+   the Additional Use Grant; or (b) insert the text “None”.
+
+3. To specify a Change Date.
+
+4. Not to modify this License in any other way.
@@ -4,10 +4,15 @@ portals:
 # Include{portalLink}
 questions:
 # Include{global}
-# Include{controller}
-# Include{replicas}
-# Include{replica1}
-# Include{controllerExpertExtraArgs}
+# Include{workload}
+# Include{workloadDeployment}
+
+# Include{replicas1}
+# Include{podSpec}
+# Include{containerMain}
+# Include{containerBasic}
+# Include{containerAdvanced}
+
  - variable: webUI
    group: App Configuration
    label: WebUI Configuration
@@ -762,29 +767,8 @@ questions:
 # Include{ingressTLS}
 # Include{ingressTraefik}
 # Include{ingressList}
-# Include{security}
-# Include{securityContextAdvancedRoot}
-              - variable: privileged
-                label: Privileged mode
-                schema:
-                  type: boolean
-                  default: false
-              - variable: readOnlyRootFilesystem
-                label: ReadOnly Root Filesystem
-                schema:
-                  type: boolean
-                  default: true
-              - variable: allowPrivilegeEscalation
-                label: Allow Privilege Escalation
-                schema:
-                  type: boolean
-                  default: false
-              - variable: runAsNonRoot
-                label: runAsNonRoot
-                schema:
-                  type: boolean
-                  default: true
-# Include{podSecurityContextRoot}
+# Include{securityContextRoot}
+
        - variable: runAsUser
          label: runAsUser
          description: The UserID of the user running the application
@@ -797,17 +781,21 @@ questions:
          schema:
            type: int
            default: 568
+# Include{securityContextContainer}
+# Include{securityContextAdvanced}
+# Include{securityContextPod}
        - variable: fsGroup
          label: fsGroup
          description: The group that should own ALL storage.
          schema:
            type: int
            default: 568
-# Include{podSecurityContextAdvanced}
+
 # Include{resources}
 # Include{metrics}
 # Include{advanced}
 # Include{addons}
 # Include{codeserver}
+# Include{netshoot}
 # Include{vpn}
 # Include{documentation}
@@ -78,7 +78,8 @@ data:
           fallthrough
        }
        {{- end }}
-        k8s_gateway "{{ required "Delegated domain ('domain') is mandatory " .domain }}" {
+        {{- end }}
+        k8s_gateway {{ range .Values.k8sgateway.domains }}"{{ required "Delegated domain ('domain') is mandatory " .domain }}"{{ end }} {
          apex {{ $values.apex | default $fqdn }}
          ttl {{ $values.ttl }}
          {{- if $values.secondary }}
@@ -89,7 +90,7 @@ data:
          {{- end }}
          fallthrough
        }
-        {{- end }}
+
        prometheus 0.0.0.0:9153
        {{- if .Values.k8sgateway.forward.enabled }}
        forward . {{ .Values.k8sgateway.forward.primary }} {{ .Values.k8sgateway.forward.secondary }} {
@@ -21,7 +21,7 @@ sources:
  - https://github.com/truecharts/charts/tree/master/charts/enterprise/cert-manager
  - https://cert-manager.io/
 type: application
-version: 0.0.5
+version: 0.0.7
 annotations:
  truecharts.org/catagories: |
    - core
@@ -0,0 +1,106 @@
+Business Source License 1.1
+
+Parameters
+
+Licensor:             The TrueCharts Project, it's owner and it's contributors
+Licensed Work:        The TrueCharts "Cert-Manager" Helm Chart
+Additional Use Grant: You may use the licensed work in production, as long
+                      as it is directly sourced from a TrueCharts provided
+                      official repository, catalog or source. You may also make private
+                      modification to the directly sourced licenced work,
+                      when used in production.
+
+                      The following cases are, due to their nature, also
+                      defined as 'production use' and explicitly prohibited:
+                      - Bundling, including or displaying the licensed work
+                      with(in) another work intended for production use,
+                      with the apparent intend of facilitating and/or
+                      promoting production use by third parties in
+                      violation of this license.
+
+Change Date:          2050-01-01
+
+Change License:       3-clause BSD license
+
+For information about alternative licensing arrangements for the Software,
+please contact: [email protected]
+
+Notice
+
+The Business Source License (this document, or the “License”) is not an Open
+Source license. However, the Licensed Work will eventually be made available
+under an Open Source License, as stated in this License.
+
+License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
+“Business Source License” is a trademark of MariaDB Corporation Ab.
+
+-----------------------------------------------------------------------------
+
+Business Source License 1.1
+
+Terms
+
+The Licensor hereby grants you the right to copy, modify, create derivative
+works, redistribute, and make non-production use of the Licensed Work. The
+Licensor may make an Additional Use Grant, above, permitting limited
+production use.
+
+Effective on the Change Date, or the fourth anniversary of the first publicly
+available distribution of a specific version of the Licensed Work under this
+License, whichever comes first, the Licensor hereby grants you rights under
+the terms of the Change License, and the rights granted in the paragraph
+above terminate.
+
+If your use of the Licensed Work does not comply with the requirements
+currently in effect as described in this License, you must purchase a
+commercial license from the Licensor, its affiliated entities, or authorized
+resellers, or you must refrain from using the Licensed Work.
+
+All copies of the original and modified Licensed Work, and derivative works
+of the Licensed Work, are subject to this License. This License applies
+separately for each version of the Licensed Work and the Change Date may vary
+for each version of the Licensed Work released by Licensor.
+
+You must conspicuously display this License on each original or modified copy
+of the Licensed Work. If you receive the Licensed Work in original or
+modified form from a third party, the terms and conditions set forth in this
+License apply to your use of that work.
+
+Any use of the Licensed Work in violation of this License will automatically
+terminate your rights under this License for the current and all other
+versions of the Licensed Work.
+
+This License does not grant you any right in any trademark or logo of
+Licensor or its affiliates (provided that you may use a trademark or logo of
+Licensor as expressly required by this License).
+
+TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
+AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
+TITLE.
+
+MariaDB hereby grants you permission to use this License’s text to license
+your works, and to refer to it using the trademark “Business Source License”,
+as long as you comply with the Covenants of Licensor below.
+
+Covenants of Licensor
+
+In consideration of the right to use this License’s text and the “Business
+Source License” name and trademark, Licensor covenants to MariaDB, and to all
+other recipients of the licensed work to be provided by Licensor:
+
+1. To specify as the Change License the GPL Version 2.0 or any later version,
+   or a license that is compatible with GPL Version 2.0 or a later version,
+   where “compatible” means that software provided under the Change License can
+   be included in a program with software provided under GPL Version 2.0 or a
+   later version. Licensor may specify additional Change Licenses without
+   limitation.
+
+2. To either: (a) specify an additional grant of rights to use that does not
+   impose any additional restriction on the right granted in this License, as
+   the Additional Use Grant; or (b) insert the text “None”.
+
+3. To specify a Change Date.
+
+4. Not to modify this License in any other way.
@@ -1,6 +1,6 @@
 image:
  repository: tccr.io/truecharts/scratch
-  tag: latest@sha256:081c282586148e62f1324d86257eaf36226faa209a3975079c68fafaeab59b0a
+  tag: latest@sha256:93878048bbc350e69bf246556ef3520f343487c7ffc40f0b0655ed8a360cb932
  pullPolicy: IfNotPresent

 controller:
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "9.3.2"
+appVersion: "9.3.6"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
@@ -21,12 +21,11 @@ maintainers:
 name: grafana
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/enterprise/grafana
-  - https://hub.docker.com/bitnami/grafana
-  - grafana/loki grafana/promtail grafana/grafana-image-renderer bitnami/grafana
+  - https://hub.docker.com/r/bitnami/grafana
  - https://github.com/bitnami/bitnami-docker-grafana
  - https://grafana.com/
 type: application
-version: 6.0.25
+version: 6.0.31
 annotations:
  truecharts.org/catagories: |
    - metrics
@@ -0,0 +1,106 @@
+Business Source License 1.1
+
+Parameters
+
+Licensor:             The TrueCharts Project, it's owner and it's contributors
+Licensed Work:        The TrueCharts "Grafana" Helm Chart
+Additional Use Grant: You may use the licensed work in production, as long
+                      as it is directly sourced from a TrueCharts provided
+                      official repository, catalog or source. You may also make private
+                      modification to the directly sourced licenced work,
+                      when used in production.
+
+                      The following cases are, due to their nature, also
+                      defined as 'production use' and explicitly prohibited:
+                      - Bundling, including or displaying the licensed work
+                      with(in) another work intended for production use,
+                      with the apparent intend of facilitating and/or
+                      promoting production use by third parties in
+                      violation of this license.
+
+Change Date:          2050-01-01
+
+Change License:       3-clause BSD license
+
+For information about alternative licensing arrangements for the Software,
+please contact: [email protected]
+
+Notice
+
+The Business Source License (this document, or the “License”) is not an Open
+Source license. However, the Licensed Work will eventually be made available
+under an Open Source License, as stated in this License.
+
+License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
+“Business Source License” is a trademark of MariaDB Corporation Ab.
+
+-----------------------------------------------------------------------------
+
+Business Source License 1.1
+
+Terms
+
+The Licensor hereby grants you the right to copy, modify, create derivative
+works, redistribute, and make non-production use of the Licensed Work. The
+Licensor may make an Additional Use Grant, above, permitting limited
+production use.
+
+Effective on the Change Date, or the fourth anniversary of the first publicly
+available distribution of a specific version of the Licensed Work under this
+License, whichever comes first, the Licensor hereby grants you rights under
+the terms of the Change License, and the rights granted in the paragraph
+above terminate.
+
+If your use of the Licensed Work does not comply with the requirements
+currently in effect as described in this License, you must purchase a
+commercial license from the Licensor, its affiliated entities, or authorized
+resellers, or you must refrain from using the Licensed Work.
+
+All copies of the original and modified Licensed Work, and derivative works
+of the Licensed Work, are subject to this License. This License applies
+separately for each version of the Licensed Work and the Change Date may vary
+for each version of the Licensed Work released by Licensor.
+
+You must conspicuously display this License on each original or modified copy
+of the Licensed Work. If you receive the Licensed Work in original or
+modified form from a third party, the terms and conditions set forth in this
+License apply to your use of that work.
+
+Any use of the Licensed Work in violation of this License will automatically
+terminate your rights under this License for the current and all other
+versions of the Licensed Work.
+
+This License does not grant you any right in any trademark or logo of
+Licensor or its affiliates (provided that you may use a trademark or logo of
+Licensor as expressly required by this License).
+
+TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
+AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
+TITLE.
+
+MariaDB hereby grants you permission to use this License’s text to license
+your works, and to refer to it using the trademark “Business Source License”,
+as long as you comply with the Covenants of Licensor below.
+
+Covenants of Licensor
+
+In consideration of the right to use this License’s text and the “Business
+Source License” name and trademark, Licensor covenants to MariaDB, and to all
+other recipients of the licensed work to be provided by Licensor:
+
+1. To specify as the Change License the GPL Version 2.0 or any later version,
+   or a license that is compatible with GPL Version 2.0 or a later version,
+   where “compatible” means that software provided under the Change License can
+   be included in a program with software provided under GPL Version 2.0 or a
+   later version. Licensor may specify additional Change Licenses without
+   limitation.
+
+2. To either: (a) specify an additional grant of rights to use that does not
+   impose any additional restriction on the right granted in this License, as
+   the Additional Use Grant; or (b) insert the text “None”.
+
+3. To specify a Change Date.
+
+4. Not to modify this License in any other way.
@@ -4,10 +4,15 @@ portals:
 # Include{portalLink}
 questions:
 # Include{global}
-# Include{controller}
-# Include{replicas}
-# Include{replica1}
-# Include{controllerExpertExtraArgs}
+# Include{workload}
+# Include{workloadDeployment}
+
+# Include{replicas1}
+# Include{podSpec}
+# Include{containerMain}
+# Include{containerBasic}
+# Include{containerAdvanced}
+
  - variable: secretEnv
    group: "App Configuration"
    label: "Secret Image Environment"
@@ -105,53 +110,36 @@ questions:
 # Include{ingressTLS}
 # Include{ingressTraefik}
 # Include{ingressList}
-# Include{security}
-# Include{securityContextAdvancedRoot}
-              - variable: privileged
-                label: "Privileged mode"
+# Include{securityContextRoot}
+
+              - variable: runAsUser
+                label: "runAsUser"
+                description: "The UserID of the user running the application"
                schema:
-                  type: boolean
-                  default: false
-              - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
-                schema:
-                  type: boolean
-                  default: false
-              - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
-                schema:
-                  type: boolean
-                  default: false
-              - variable: runAsNonRoot
-                label: "runAsNonRoot"
-                schema:
-                  type: boolean
-                  default: true
-# Include{podSecurityContextRoot}
-        - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
-          schema:
-            type: int
-            default: 568
+                  type: int
+                  default: 568
        - variable: runAsGroup
          label: "runAsGroup"
          description: "The groupID this App of the user running the application"
          schema:
            type: int
            default: 568
-        - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
-          schema:
-            type: int
-            default: 568
-# Include{podSecurityContextAdvanced}
+# Include{securityContextContainer}
+# Include{securityContextAdvanced}
+# Include{securityContextPod}
+             - variable: fsGroup
+                label: "fsGroup"
+                description: "The group that should own ALL storage."
+                schema:
+                  type: int
+                  default: 568
+
 # Include{resources}
 # Include{metrics}
 # Include{prometheusRule}
 # Include{advanced}
 # Include{addons}
 # Include{codeserver}
+# Include{netshoot}
 # Include{vpn}
 # Include{documentation}
@@ -1,7 +1,7 @@
 image:
  repository: tccr.io/truecharts/grafana
  pullPolicy: IfNotPresent
-  tag: 9.3.2@sha256:631cb131d086967d38a8b67457fc480997a5d9d376a59050403f42cac900d1c4
+  tag: 9.3.6@sha256:e9d2674578a97b9442af115c6137fa0bc7273984109d7b9ea1ea17e2ceba1129

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

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

 thanosImage:
  repository: tccr.io/truecharts/thanos
-  tag: 0.30.1@sha256:c5adac1c254b273ba857f1a5c94481c27fb5637b8a49ef77e4a296c1179e5890
+  tag: 0.30.2@sha256:64d834218591f67601424f1de3b3a1ab43aca9824758e665717baef221e6cc9b

 alertmanagerImage:
  repository: tccr.io/truecharts/alertmanager
-  tag: 0.25.0@sha256:cae640f2745026375705b05152a8e990a190fcfd4c371bca4460fb70e426e8ec
+  tag: 0.25.0@sha256:6c59cf9e8332a23a3b629cb4d1b2ec8200bd645ea053cbf14fd04582ced81b72

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

 ### Installing the Traefik Scale App

+:::note
+
+Traefik is part of the `enterprise` train, so make sure you have it enabled as specified in the [guide](https://truecharts.org/manual/guides/Adding-TrueCharts#adding-truecharts).
+
+:::
+
 In the TrueNAS Menu, navigate to **Apps** > **Available Applications**. Use the search bar to search for or manually
 find the Traefik app in the list of apps, and click **Install**

@@ -57,12 +63,6 @@ The setup of Traefik is relatively straight-forward. Most of the settings remain
 Continue to section 12, and select **Next**. Traefik will now be installed.
 After installation you can access the Traefik dashboard using your host IP address followed by `:9000`, or by simply clicking "Web Portal" on the application's entry under **Apps** > **Installed Applications**.

-:::note
-
-Traefik is part of the `stable` train, so make sure you have it enabled as specified in [Step 1](https://truecharts.org/manual/Quick-Start%20Guides/01-Adding-TrueCharts/) of our Quick Start Guides
-
-:::
-
 ## Video Guide

 <iframe width="560" height="315" src="https://www.youtube.com/embed/bWNPfrKjawI" title="YouTube video player" frameBorder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowFullScreen></iframe>
@@ -10,10 +10,15 @@ portals:
    path: "/dashboard/"
 questions:
 # Include{global}
-# Include{controller}
-# Include{replicas}
-# Include{replica1}
-# Include{controllerExpertExtraArgs}
+# Include{workload}
+# Include{workloadDeployment}
+
+# Include{replicas1}
+# Include{podSpec}
+# Include{containerMain}
+# Include{containerBasic}
+# Include{containerAdvanced}
+
 # Include{containerConfig}
  - variable: ingressClass
    label: "ingressClass"
@@ -365,51 +370,34 @@ questions:
 # Include{ingressTLS}
 # Include{ingressTraefik}
 # Include{ingressList}
-# Include{security}
-# Include{securityContextAdvancedRoot}
-              - variable: privileged
-                label: "Privileged mode"
+# Include{securityContextRoot}
+
+              - variable: runAsUser
+                label: "runAsUser"
+                description: "The UserID of the user running the application"
                schema:
-                  type: boolean
-                  default: false
-              - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
-                schema:
-                  type: boolean
-                  default: true
-              - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
-                schema:
-                  type: boolean
-                  default: false
-              - variable: runAsNonRoot
-                label: "runAsNonRoot"
-                schema:
-                  type: boolean
-                  default: true
-# Include{podSecurityContextRoot}
-        - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
-          schema:
-            type: int
-            default: 568
+                  type: int
+                  default: 568
        - variable: runAsGroup
          label: "runAsGroup"
          description: "The groupID this App of the user running the application"
          schema:
            type: int
            default: 568
-        - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
-          schema:
-            type: int
-            default: 568
-# Include{podSecurityContextAdvanced}
+# Include{securityContextContainer}
+# Include{securityContextAdvanced}
+# Include{securityContextPod}
+             - variable: fsGroup
+                label: "fsGroup"
+                description: "The group that should own ALL storage."
+                schema:
+                  type: int
+                  default: 568
+
 # Include{resources}
 # Include{advanced}
 # Include{addons}
 # Include{codeserver}
+# Include{netshoot}
 # Include{vpn}
 # Include{documentation}
@@ -1,7 +1,7 @@
 image:
  repository: tccr.io/truecharts/traefik
  # defaults to appVersion
-  tag: 2.9.6@sha256:a4f065a7a34902e7d8179680b8c344e70cf90ed80c7a396b5f42ecabfa3c0321
+  tag: 2.9.8@sha256:4a2d3dda380990d825532e661b42457fc9871061dbc22b310468616378214a2e
  pullPolicy: IfNotPresent

 # -- Use ingressClass. Ignored if Traefik version < 2.3 / kubernetes < 1.18.x
@@ -1,15 +1,11 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - MediaServer-Video
 apiVersion: v2
-appVersion: "latest"
+appVersion: "2.0.2.8"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.2.25
 deprecated: false
-description: "Acestream-engine"
+description: IPTV service providing streaming, playlist, search engine and epg.
 home: https://truecharts.org/charts/incubator/acestream
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/acestream.png
 keywords:
@@ -23,7 +19,12 @@ maintainers:
 name: acestream
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/incubator/acestream
-  - https://hub.docker.com/vstavrinov/acestream-service
+  - https://hub.docker.com/r/vstavrinov/acestream-service
  - https://github.com/vstavrinov/acestream-service
 type: application
-version: 2.0.14
+version: 3.0.0
+annotations:
+  truecharts.org/catagories: |
+    - MediaServer-Video
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/grade: U
@@ -4,15 +4,20 @@ portals:
 # Include{portalLink}
 questions:
 # Include{global}
-# Include{controller}
-# Include{replicas}
-# Include{replica1}
-# Include{controllerExpertExtraArgs}
+# Include{workload}
+# Include{workloadDeployment}
+
+# Include{replicas1}
+# Include{podSpec}
+# Include{containerMain}
+# Include{containerBasic}
+# Include{containerAdvanced}
+
 # Include{containerConfig}
 # Include{serviceRoot}
        - variable: main
-          label: "Main Service"
-          description: "The Primary service on which the healthcheck runs, often the webUI"
+          label: Main Service
+          description: The Primary service on which the healthcheck runs, often the webUI
          schema:
            additional_attrs: true
            type: dict
@@ -20,14 +25,14 @@ questions:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
                    - variable: main
-                      label: "Main Service Port Configuration"
+                      label: Main Service Port Configuration
                      schema:
                        additional_attrs: true
                        type: dict
                        attrs:
                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
+                            label: Port
+                            description: This port exposes the container port on the service
                            schema:
                              type: int
                              default: 8008
@@ -38,8 +43,8 @@ questions:
 # Include{serviceList}
 # Include{persistenceRoot}
        - variable: acestreamcache
-          label: "acestreamcache Storage"
-          description: "Stream cache data"
+          label: App Cache Storage
+          description: Stores the Application Cache.
          schema:
            additional_attrs: true
            type: dict
@@ -48,7 +53,7 @@ questions:
 # Include{persistenceList}
 # Include{ingressRoot}
        - variable: main
-          label: "Main Ingress"
+          label: Main Ingress
          schema:
            additional_attrs: true
            type: dict
@@ -57,51 +62,34 @@ questions:
 # Include{ingressTLS}
 # Include{ingressTraefik}
 # Include{ingressList}
-# Include{security}
-# Include{securityContextAdvancedRoot}
-              - variable: privileged
-                label: "Privileged mode"
-                schema:
-                  type: boolean
-                  default: false
-              - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
-                schema:
-                  type: boolean
-                  default: false
-              - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
-                schema:
-                  type: boolean
-                  default: false
-              - variable: runAsNonRoot
-                label: "runAsNonRoot"
-                schema:
-                  type: boolean
-                  default: false
+
 # Include{podSecurityContextRoot}
        - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
+          label: runAsUser
+          description: The UserID of the user running the application
          schema:
            type: int
            default: 0
        - variable: runAsGroup
-          label: "runAsGroup"
-          description: The groupID this App of the user running the application"
+          label: runAsGroup
+          description: The groupID this App of the user running the application
          schema:
            type: int
            default: 0
+# Include{securityContextContainer}
+# Include{securityContextAdvanced}
+# Include{securityContextPod}
        - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
+          label: fsGroup
+          description: The group that should own ALL storage.
          schema:
            type: int
            default: 568
-# Include{podSecurityContextAdvanced}
+
 # Include{resources}
 # Include{advanced}
 # Include{addons}
 # Include{codeserver}
+# Include{netshoot}
 # Include{vpn}
 # Include{documentation}
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
@@ -1,2 +1,2 @@
 {{/* Render the templates */}}
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
@@ -1,25 +1,31 @@
-env: {}
 image:
  pullPolicy: IfNotPresent
  repository: tccr.io/truecharts/acestream
-  tag: latest@sha256:c42e6d58629b851944f464ec68901c12f4bf5dc66349b5c623c66b3e592c851d
-persistence:
-  acestreamcache:
-    enabled: true
-    mountPath: /srv/acestream/.ACEStream
-podSecurityContext:
-  runAsGroup: 0
-  runAsUser: 0
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
+  tag: 2.0.2.8@sha256:742c6e16126d819593fd5e041e2166ba789df76edfbd3a6c628b3b83800e6743
 service:
  main:
    ports:
      main:
        port: 8008
-        protocol: TCP
-        targetPort: 6878
-
+        protocol: tcp
+persistence:
+  acestreamcache:
+    enabled: true
+    mountPath: /srv/acestream/.ACEStream
 portal:
-  enabled: true
+  open:
+    enabled: true
+securityContext:
+  container:
+    readOnlyRootFilesystem: false
+    runAsNonRoot: false
+    runAsGroup: 0
+    runAsUser: 0
+workload:
+  main:
+    podSpec:
+      containers:
+        env:
+          SCHEME: "http"
+          ENTRY: "{{ .Values.service.main.ports.main.port }}"
+          PORT: "{{ .Values.service.main.ports.main.port }}"
@@ -1,15 +1,11 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - Other
 apiVersion: v2
-appVersion: "latest"
+appVersion: "0.4.12"
 dependencies:
  - name: common
    repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.2.25
 deprecated: false
-description: Adguardhome-sync(https://github.com/bakito/adguardhome-sync/) is a tool to synchronize AdGuardHome config to replica instances.
+description: Synchronize AdGuardHome config to replica instances.
 home: https://truecharts.org/charts/incubator/adguardhome-sync
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/adguardhome-sync.png
 keywords:
@@ -23,10 +19,12 @@ maintainers:
 name: adguardhome-sync
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/incubator/adguardhome-sync
-  - https://hub.docker.com/lscr.io/linuxserver/adguardhome-sync
-  - lscr.io/linuxserver/adguardhome-sync
+  - https://ghcr.io/bakito/adguardhome-sync
  - https://github.com/bakito/adguardhome-sync/
-  - https://github.com/orgs/linuxserver/packages/container/package/adguardhome-sync
-  - https://github.com/linuxserver/docker-adguardhome-sync#readme
 type: application
-version: 2.0.11
+version: 3.0.0
+annotations:
+  truecharts.org/catagories: |
+    - Other
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/grade: U
@@ -4,34 +4,162 @@ portals:
 # Include{portalLink}
 questions:
 # Include{global}
-# Include{controller}
-# Include{replicas}
-# Include{replica1}
-# Include{controllerExpertExtraArgs}
-  - variable: env
-    group: "App Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: CONFIGFILE
-          label: "CONFIGFILE"
-          description: "Set a custom config file."
-          schema:
-            type: string
-            default: ""
-        - variable: UMASK
-          label: "UMASK"
-          description: "Container Variable UMASK"
-          schema:
-            type: string
-            default: ""
+# Include{workload}
+# Include{workloadDeployment}
+
+# Include{replicas1}
+# Include{podSpec}
+# Include{containerMain}
+# Include{containerBasic}
+# Include{containerAdvanced}
+
+                                - variable: env
+                                  group: "App Configuration"
+                                  label: "Image Environment"
+                                  schema:
+                                    additional_attrs: true
+                                    type: dict
+                                    attrs:
+                                      - variable: original
+                                        label: Original Server Settings
+                                        schema:
+                                          type: boolean
+                                          default: true
+                                          show_subquestions_if: true
+                                          subquestions:
+                                            - variable: ORIGIN_URL
+                                              label: Origin Url
+                                              schema:
+                                                type: string
+                                                required: true
+                                                default: ""
+                                            - variable: ORIGIN_USERNAME
+                                              label: Origin Username
+                                              schema:
+                                                type: string
+                                                required: true
+                                                default: ""
+                                            - variable: ORIGIN_PASSWORD
+                                              label: Origin Password
+                                              schema:
+                                                type: string
+                                                required: true
+                                                private: true
+                                                default: ""
+                                      - variable: replica
+                                        label: Replica Server Settings
+                                        schema:
+                                          type: boolean
+                                          default: true
+                                          show_subquestions_if: true
+                                          subquestions:
+                                            - variable: REPLICA_URL
+                                              label: Replica Url
+                                              schema:
+                                                type: string
+                                                required: true
+                                                default: ""
+                                            - variable: REPLICA_USERNAME
+                                              label: Replica Username
+                                              schema:
+                                                type: string
+                                                required: true
+                                                default: ""
+                                            - variable: REPLICA_PASSWORD
+                                              label: Replica Password
+                                              schema:
+                                                type: string
+                                                required: true
+                                                private: true
+                                                default: ""
+                                            - variable: REPLICA_AUTOSETUP
+                                              label: Replica Auto Setup
+                                              schema:
+                                                type: boolean
+                                                default: false
+                                            - variable: REPLICA_INTERFACENAME
+                                              label: Replica Interface Name
+                                              schema:
+                                                type: string
+                                                default: ""
+                                      - variable: CRON
+                                        label: CRON
+                                        description: Set a cron task.
+                                        schema:
+                                          type: string
+                                          default: "*/10 * * * *"
+                                      - variable: RUNONSTART
+                                        label: Run On Start
+                                        schema:
+                                          type: boolean
+                                          default: true
+                                      - variable: sync
+                                        label: Sync Features Settings
+                                        schema:
+                                          type: boolean
+                                          default: false
+                                          show_subquestions_if: true
+                                          subquestions:
+                                            - variable: FEATURES_GENERALSETTINGS
+                                              label: Features General Settings
+                                              schema:
+                                                type: boolean
+                                                default: true
+                                            - variable: FEATURES_QUERYLOGCONFIG
+                                              label: Features Query Log Config
+                                              schema:
+                                                type: boolean
+                                                default: true
+                                            - variable: FEATURES_STATSCONFIG
+                                              label: Features Stats Config
+                                              schema:
+                                                type: boolean
+                                                default: true
+                                            - variable: FEATURES_CLIENTSETTINGS
+                                              label: Features Clients Settings
+                                              schema:
+                                                type: boolean
+                                                default: true
+                                            - variable: FEATURES_SERVICES
+                                              label: Features Services
+                                              schema:
+                                                type: boolean
+                                                default: true
+                                            - variable: FEATURES_FILTERS
+                                              label: Features Filters
+                                              schema:
+                                                type: boolean
+                                                default: true
+                                            - variable: FEATURES_DHCP_SERVERCONFIG
+                                              label: Features DHCP Server Config
+                                              schema:
+                                                type: boolean
+                                                default: true
+                                            - variable: FEATURES_DHCP_STATICLEASES
+                                              label: Features DHCP Static Leases
+                                              schema:
+                                                type: boolean
+                                                default: true
+                                            - variable: FEATURES_DNS_SERVERCONFIG
+                                              label: Features DNS Server Config
+                                              schema:
+                                                type: boolean
+                                                default: true
+                                            - variable: FEATURES_DNS_ACCESSLISTS
+                                              label: Features DNS Access Lists
+                                              schema:
+                                                type: boolean
+                                                default: true
+                                            - variable: FEATURES_DNS_REWRITES
+                                              label: Features DNS Rewrites
+                                              schema:
+                                                type: boolean
+                                                default: true
 # Include{containerConfig}
 # Include{serviceRoot}
        - variable: main
-          label: "Main Service"
-          description: "The Primary service on which the healthcheck runs, often the webUI"
+          label: Main Service
+          description: The Primary service on which the healthcheck runs, often the webUI
          schema:
            additional_attrs: true
            type: dict
@@ -39,14 +167,14 @@ questions:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
                    - variable: main
-                      label: "Main Service Port Configuration"
+                      label: Main Service Port Configuration
                      schema:
                        additional_attrs: true
                        type: dict
                        attrs:
                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
+                            label: Port
+                            description: This port exposes the container port on the service
                            schema:
                              type: int
                              default: 8080
@@ -55,19 +183,10 @@ questions:
            default: false
 # Include{serviceExpert}
 # Include{serviceList}
-# Include{persistenceRoot}
-        - variable: config
-          label: "config Storage"
-          description: "Contains all relevant configuration files."
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-# Include{persistenceBasic}
 # Include{persistenceList}
 # Include{ingressRoot}
        - variable: main
-          label: "Main Ingress"
+          label: Main Ingress
          schema:
            additional_attrs: true
            type: dict
@@ -76,51 +195,34 @@ questions:
 # Include{ingressTLS}
 # Include{ingressTraefik}
 # Include{ingressList}
-# Include{security}
-# Include{securityContextAdvancedRoot}
-              - variable: privileged
-                label: "Privileged mode"
-                schema:
-                  type: boolean
-                  default: false
-              - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
-                schema:
-                  type: boolean
-                  default: false
-              - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
-                schema:
-                  type: boolean
-                  default: false
-              - variable: runAsNonRoot
-                label: "runAsNonRoot"
-                schema:
-                  type: boolean
-                  default: false
+
 # Include{podSecurityContextRoot}
        - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
+          label: runAsUser
+          description: The UserID of the user running the application
          schema:
            type: int
            default: 0
        - variable: runAsGroup
-          label: "runAsGroup"
-          description: The groupID this App of the user running the application"
+          label: runAsGroup
+          description: The groupID this App of the user running the application
          schema:
            type: int
            default: 0
+# Include{securityContextContainer}
+# Include{securityContextAdvanced}
+# Include{securityContextPod}
        - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
+          label: fsGroup
+          description: The group that should own ALL storage.
          schema:
            type: int
            default: 568
-# Include{podSecurityContextAdvanced}
+
 # Include{resources}
 # Include{advanced}
 # Include{addons}
 # Include{codeserver}
+# Include{netshoot}
 # Include{vpn}
 # Include{documentation}
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
@@ -1,2 +1,2 @@
 {{/* Render the templates */}}
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`{{- include "tc.v1.common.lib.chart.notes" $ -}}`
				`@@ -0,0 +1 @@`
				`{{- include "tc.v1.common.loader.all" . -}}`