Adapt community to allow chart versioning (#434)

* try adding some custom tooling for the job

* polish tooling

* more polish

* process stable

* setup scripting for incubator

* Process incubator

* setup script for dev

* remove dev placeholder app

* remove .test beta folder

* fix some of the workflows and tooling

* fix a testing bug

* update doc generation to not create app-readme.md

* remove an unneeded file

* support multiple charts

* adapt docs

* adapt branch in docs

.github/workflows/apps.release.yaml

@@ -11,8 +11,89 @@ on:
       - '.github/workflows/apps.release.yaml'
 
 jobs:
+  catalog-test:
+    runs-on: ubuntu-latest
+    container:
+      image: ixsystems/catalog_validation:latest
+
+    steps:
+      - uses: actions/checkout@v2
+        name: Checkout
+      - name: Install Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.5.3
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.BOT_TOKEN }}
+          path: master
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          repository: truecharts/catalog
+          token: ${{ secrets.BOT_TOKEN }}
+          path: catalog
+      - name: Remove if release already exists
+        run: |
+          for train in stable incubator dev
+            for chart in master/${train}/*; do
+              if [ -d "${chart}" ]; then
+                maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
+                chartname=$(basename ${chart})
+                echo "Processing... cleanup-existing... Chart: ${chartname} - Version: ${maxchartversion}"
+                rm -Rf catalog/test/${chartname}/${maxchartversion} || echo "Chart release ${chartname} with version ${maxchartversion} does not exist yet... Skipping..."
+                rm -Rf catalog/test/${chartname}/item.yaml || echo "No old catalog item.yaml found for ${chartname}"
+              fi
+            done
+          done
+      - name: fetch dependencies
+        run: |
+          helm dependency update master/.test/*
+      - name: Add Chart release
+        run: |
+          for train in stable incubator dev
+            for chart in master/${train}/*; do
+              if [ -d "${chart}" ]; then
+                maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
+                chartname=$(basename ${chart})
+                echo "Processing... Copying charts... Chart: ${chartname} - Version: ${maxchartversion}"
+                mkdir -p catalog/test/${chartname}/${maxchartversion}
+                cp -Rf ${chart}/* catalog/${train}/${chartname}/${maxchartversion}/
+              fi
+            done
+          done
+      - name: Apply SCALE Patches
+        run: |
+          for train in stable incubator dev
+            for chart in catalog/${train}/*; do
+              if [ -d "${chart}" ]; then
+                maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
+                chartname=$(basename ${chart})
+                path="${chart}/${maxfolderversion}"
+                echo "Processing... Applying SCALE patch... Chart: ${chartname} - Version: ${maxfolderversion}"
+                mv ${path}/SCALE/item.yaml catalog/${train}/${chartname}/
+                mv ${path}/SCALE/ix_values.yaml ${path}/
+                mv ${path}/SCALE/questions.yaml ${path}/
+                cp -rf ${path}/SCALE/templates/* ${path}/templates || echo "ignoring templates directory..."
+                rm -rf ${path}/SCALE/templates
+                mv ${path}/values.yaml ${path}/test_values.yaml
+                touch ${path}/values.yaml
+                description=$(cat ${path}/Chart.yaml | grep "^description: " | sed -r 's/^description: //')
+                echo "${description}" >> ${path}/app-readme.md
+              fi
+            done
+          done
+      - name: Validate catalog format
+        run: |
+          cd catalog
+          /bin/bash -c "PWD=${pwd}; /usr/local/bin/catalog_validate validate --path $PWD"
+
   release:
     runs-on: ubuntu-latest
+    needs: catalog-test
     steps:
       - name: Install Helm
         uses: azure/setup-helm@v1
@@ -33,49 +114,55 @@ jobs:
           path: catalog
       - name: Remove if release already exists
         run: |
-          for chart in master/.test/*; do
+          for train in stable incubator dev
-            if [ -d "${chart}" ]; then
+            for chart in master/${train}/*; do
-              maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
+              if [ -d "${chart}" ]; then
-              chartname=$(basename ${chart})
+                maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
-              echo "Processing... cleanup-existing... Chart: ${chartname} - Version: ${maxchartversion}"
+                chartname=$(basename ${chart})
-
+                echo "Processing... cleanup-existing... Chart: ${chartname} - Version: ${maxchartversion}"
-              rm -Rf catalog/test/${chartname}/${maxchartversion} || echo "Chart release ${chartname} with version ${maxchartversion} does not exist yet... Skipping..."
+                rm -Rf catalog/test/${chartname}/${maxchartversion} || echo "Chart release ${chartname} with version ${maxchartversion} does not exist yet... Skipping..."
-              rm -Rf catalog/test/${chartname}/item.yaml || echo "No old catalog item.yaml found for ${chartname}"
+                rm -Rf catalog/test/${chartname}/item.yaml || echo "No old catalog item.yaml found for ${chartname}"
-            fi
+              fi
+            done
           done
       - name: fetch dependencies
         run: |
           helm dependency update master/.test/*
       - name: Add Chart release
         run: |
-          for chart in master/.test/*; do
+          for train in stable incubator dev
-            if [ -d "${chart}" ]; then
+            for chart in master/${train}/*; do
-              maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
+              if [ -d "${chart}" ]; then
-              chartname=$(basename ${chart})
+                maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
-              echo "Processing... Copying charts... Chart: ${chartname} - Version: ${maxchartversion}"
+                chartname=$(basename ${chart})
-              mkdir -p catalog/test/${chartname}/${maxchartversion}
+                echo "Processing... Copying charts... Chart: ${chartname} - Version: ${maxchartversion}"
-              cp -Rf ${chart}/* catalog/test/${chartname}/${maxchartversion}/
+                mkdir -p catalog/test/${chartname}/${maxchartversion}
-            fi
+                cp -Rf ${chart}/* catalog/${train}/${chartname}/${maxchartversion}/
+              fi
+            done
           done
       - name: Apply SCALE Patches
         run: |
-          for chart in catalog/test/*; do
+          for train in stable incubator dev
-            if [ -d "${chart}" ]; then
+            for chart in catalog/${train}/*; do
-              maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
+              if [ -d "${chart}" ]; then
-              chartname=$(basename ${chart})
+                maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
-              path="${chart}/${maxfolderversion}"
+                chartname=$(basename ${chart})
-              echo "Processing... Applying SCALE patch... Chart: ${chartname} - Version: ${maxfolderversion}"
+                path="${chart}/${maxfolderversion}"
-              mv ${path}/SCALE/item.yaml catalog/test/${chartname}/
+                echo "Processing... Applying SCALE patch... Chart: ${chartname} - Version: ${maxfolderversion}"
-              mv ${path}/SCALE/ix_values.yaml ${path}/
+                mv ${path}/SCALE/item.yaml catalog/${train}/${chartname}/
-              mv ${path}/SCALE/questions.yaml ${path}/
+                mv ${path}/SCALE/ix_values.yaml ${path}/
-              cp -rf ${path}/SCALE/templates/* ${path}/templates || echo "ignoring templates directory..."
+                mv ${path}/SCALE/questions.yaml ${path}/
-              rm -rf ${path}/SCALE/templates
+                cp -rf ${path}/SCALE/templates/* ${path}/templates || echo "ignoring templates directory..."
-              mv ${path}/values.yaml ${path}/test_values.yaml
+                rm -rf ${path}/SCALE/templates
-              touch ${path}/values.yaml
+                mv ${path}/values.yaml ${path}/test_values.yaml
-              description=$(cat ${path}/Chart.yaml | grep "^description: " | sed -r 's/^description: //')
+                touch ${path}/values.yaml
-              echo "${description}" >> ${path}/app-readme.md
+                description=$(cat ${path}/Chart.yaml | grep "^description: " | sed -r 's/^description: //')
-            fi
+                echo "${description}" >> ${path}/app-readme.md
+              fi
+            done
           done
+
       - name: Commit and Push new App releases
         run: |
           cd catalog

.github/workflows/apps.test.yaml

@@ -8,43 +8,31 @@ on:
       - '**'
     paths:
       - 'stable/**'
-      - '!stable/**/*.md'
+      - '!stable/*.md'
-      - '!stable/**/README.md'
+      - '!stable/README.md'
-      - '!stable/**/README.md.gotmpl'
+      - '!stable/README.md.gotmpl'
-      - '!stable/**/app-readme.md'
+      - '!stable/app-readme.md'
-      - '!stable/**/app-readme.md.gotmpl'
+      - '!stable/app-readme.md.gotmpl'
-      - '!stable/**/docs/*'
+      - '!stable/docs/*'
       - 'incubator/**'
-      - '!incubator/**/*.md'
+      - '!incubator/*.md'
-      - '!incubator/**/README.md'
+      - '!incubator/README.md'
-      - '!incubator/**/README.md.gotmpl'
+      - '!incubator/README.md.gotmpl'
-      - '!incubator/**/app-readme.md'
+      - '!incubator/app-readme.md'
-      - '!incubator/**/app-readme.md.gotmpl'
+      - '!incubator/app-readme.md.gotmpl'
-      - '!incubator/**/docs/*'
+      - '!incubator/docs/*'
       - 'dev/**'
-      - '!dev/**/*.md'
+      - '!dev/*.md'
-      - '!dev/**/README.md'
+      - '!dev/README.md'
-      - '!dev/**/README.md.gotmpl'
+      - '!dev/README.md.gotmpl'
-      - '!dev/**/app-readme.md'
+      - '!dev/app-readme.md'
-      - '!dev/**/app-readme.md.gotmpl'
+      - '!dev/app-readme.md.gotmpl'
-      - '!dev/**/docs/*'
+      - '!dev/docs/*'
       - '.github/workflows/apps.test.yaml'
       - '.github/ct-install.yaml'
       - '.github/ct-lint.yaml'
 
 jobs:
-  catalog-test:
-    runs-on: ubuntu-latest
-    container:
-      image: ixsystems/catalog_validation:latest
-
-    steps:
-    - uses: actions/checkout@v2
-      name: Checkout
-    - name: Validate catalog format
-      run: |
-        /bin/bash -c "PWD=${pwd}; /usr/local/bin/catalog_validate validate --path $PWD"
-
   changes:
     name: Get changed Apps
     runs-on: ubuntu-20.04
@@ -69,7 +57,7 @@ jobs:
         echo ::set-output name=apps::${APPS}
 
   app-tests:
-    needs: [catalog-test, changes]
+    needs: [changes]
     name: App Tests
     runs-on: ubuntu-latest
     strategy:
@@ -84,19 +72,14 @@ jobs:
       - name: Prepare-Lint
         id: prep-lint
         run: |
-            if test -f "./stable/${{ matrix.app }}/item.yaml"; then
+            if test -f "./stable/${{ matrix.app }}/Chart.yaml"; then
               train="stable"
-            elif test -f "./incubator/${{ matrix.app }}/item.yaml"; then
+            elif test -f "./incubator/${{ matrix.app }}/Chart.yaml"; then
               train="incubator"
             else
               train="dev"
             fi
             echo ::set-output name=train::${train}
-            maxfolderversion=$(ls -l ${train}/${{ matrix.app }} | grep ^d | awk '{print $9}' | tail -n 1)
-            echo "Detected folder version: ${maxfolderversion}"
-            mkdir ${train}/${{ matrix.app }}/${maxfolderversion}/ci  || exit 0
-            cp ${train}/${{ matrix.app }}/${maxfolderversion}/test_values.yaml ${train}/${{ matrix.app }}/${maxfolderversion}/ci/test-values.yaml
-            echo ::set-output name=maxfolderversion::${maxfolderversion}
 
       - name: Install Helm
         uses: azure/setup-helm@v1
@@ -113,12 +96,7 @@ jobs:
 
       - name: Run chart-testing (lint)
         id: lint
-        run: ct lint --config .github/ct-lint.yaml --charts '${{ steps.prep-lint.outputs.train }}/${{ matrix.app }}/${{ steps.prep-lint.outputs.maxfolderversion }}'
+        run: ct lint --config .github/ct-lint.yaml --charts '${{ steps.prep-lint.outputs.train }}/${{ matrix.app }}'
-
-      - name: Prepare-Test
-        run: |
-            mv -f ${{ steps.prep-lint.outputs.train }}/${{ matrix.app }}/${{ steps.prep-lint.outputs.maxfolderversion }}/* ${{ steps.prep-lint.outputs.train }}/${{ matrix.app }}/
-            rm -Rf ${{ steps.prep-lint.outputs.train }}/${{ matrix.app }}/${{ steps.prep-lint.outputs.maxfolderversion }}
 
       - name: Create k3d cluster
         uses: nolar/setup-k3d-k3s@v1

.github/workflows/charts.renovate.yaml

@@ -1,82 +0,0 @@
-name: "Charts: Renovate"
-
-on:
-  push:
-    branches:
-      - 'renovate/**'
-      - 'update/**'
-    tags-ignore:
-      - '**'
-
-jobs:
-  folderfix:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.BOT_TOKEN }}
-
-      - name: Configure Git
-        run: |
-          git config user.name "TrueCharts-Bot"
-          git config user.email "bot@truecharts.org"
-
-      - name: Install Helm
-        uses: azure/setup-helm@v1
-        with:
-          version: v3.5.2
-
-      - name: update folder names and dependencies for stable
-        run: |
-          for chart in stable/*; do
-            if [ -d "${chart}" ]; then
-                maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
-                maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
-                chartname=$(basename ${chart})
-                echo "Processing: ${chart} - folder: ${maxfolderversion} - version: ${maxchartversion}"
-                helm dependency update ${chart}/${maxfolderversion}
-                if [ "${maxfolderversion}" != "${maxchartversion}" ]; then
-                    mv -f ${chart}/${maxfolderversion} ${chart}/${maxchartversion}
-                    echo "renamed ${chart}/${maxfolderversion} to ${chart}/${maxchartversion}"
-                fi
-            fi
-          done
-
-      - name: update folder names and dependencies for incubator
-        run: |
-          for chart in incubator/*; do
-            if [ -d "${chart}" ]; then
-                maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
-                maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
-                chartname=$(basename ${chart})
-                echo "Processing: ${chart} - folder: ${maxfolderversion} - version: ${maxchartversion}"
-                helm dependency update ${chart}/${maxfolderversion}
-                if [ "${maxfolderversion}" != "${maxchartversion}" ]; then
-                    mv -f ${chart}/${maxfolderversion} ${chart}/${maxchartversion}
-                    echo "renamed ${chart}/${maxfolderversion} to ${chart}/${maxchartversion}"
-                fi
-            fi
-          done
-
-      - name: update folder names and dependencies for incubator
-        run: |
-          for chart in dev/*; do
-            if [ -d "${chart}" ]; then
-                maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
-                maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
-                chartname=$(basename ${chart})
-                echo "Processing: ${chart} - folder: ${maxfolderversion} - version: ${maxchartversion}"
-                helm dependency update ${chart}/${maxfolderversion}
-                if [ "${maxfolderversion}" != "${maxchartversion}" ]; then
-                    mv -f ${chart}/${maxfolderversion} ${chart}/${maxchartversion}
-                    echo "renamed ${chart}/${maxfolderversion} to ${chart}/${maxchartversion}"
-                fi
-            fi
-          done
-
-      - name: Commit and push updated charts
-        run: |
-            git add --all
-            git commit --all -m "Update-Folder-Names-and-Dependencies" || exit 0
-            git push || exit 0

.github/workflows/docs.copy.yaml

@@ -61,13 +61,12 @@ jobs:
         run: |
           for chart in stable/*; do
             if [ -d "${chart}" ]; then
-                maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
                 chartname=$(basename ${chart})
-                echo "Processing: ${chart} - folder: ${maxfolderversion}"
+                echo "Processing: ${chart}"
                 mkdir -p docs/apps/stable/${chartname} || echo "app path already exists, continuing..."
-                yes | cp -rf ${chart}/${maxfolderversion}/README.md docs/apps/stable/${chartname}/index.md || echo "readme copy failed, continuing..."
+                yes | cp -rf ${chart}/README.md docs/apps/stable/${chartname}/index.md || echo "readme copy failed, continuing..."
-                yes | cp -rf ${chart}/${maxfolderversion}/CONFIG.md docs/apps/stable/${chartname}/CONFIG.md || echo "config copy failed, continuing..."
+                yes | cp -rf ${chart}/CONFIG.md docs/apps/stable/${chartname}/CONFIG.md || echo "config copy failed, continuing..."
-                yes | cp -rf ${chart}/${maxfolderversion}/LICENSE docs/apps/stable/${chartname}/LICENSE.md || echo "license copy failed, continuing..."
+                yes | cp -rf ${chart}/LICENSE docs/apps/stable/${chartname}/LICENSE.md || echo "license copy failed, continuing..."
                 sed -i '1s/^/# License<br>\n\n/' docs/apps/stable/${chartname}/LICENSE.md || echo "license edit failed, continuing..."
             fi
           done
@@ -77,13 +76,12 @@ jobs:
         run: |
           for chart in incubator/*; do
             if [ -d "${chart}" ]; then
-                maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
                 chartname=$(basename ${chart})
-                echo "Processing: ${chart} - folder: ${maxfolderversion}"
+                echo "Processing: ${chart}"
                 mkdir -p docs/apps/incubator/${chartname} || echo "app path already exists, continuing..."
-                yes | cp -rf ${chart}/${maxfolderversion}/README.md docs/apps/incubator/${chartname}/index.md || echo "readme copy failed, continuing..."
+                yes | cp -rf ${chart}/README.md docs/apps/incubator/${chartname}/index.md || echo "readme copy failed, continuing..."
-                yes | cp -rf ${chart}/${maxfolderversion}/CONFIG.md docs/apps/incubator/${chartname}/CONFIG.md || echo "config copy failed, continuing..."
+                yes | cp -rf ${chart}/CONFIG.md docs/apps/incubator/${chartname}/CONFIG.md || echo "config copy failed, continuing..."
-                yes | cp -rf ${chart}/${maxfolderversion}/LICENSE docs/apps/incubator/${chartname}/LICENSE.md || echo "license copy failed, continuing..."
+                yes | cp -rf ${chart}/LICENSE docs/apps/incubator/${chartname}/LICENSE.md || echo "license copy failed, continuing..."
                 sed -i '1s/^/# License<br>\n\n/' docs/apps/incubator/${chartname}/LICENSE.md || echo "license edit failed, continuing..."
             fi
           done

.test/jackett/Chart.yaml

@@ -1,33 +0,0 @@
-apiVersion: v2
-kubeVersion: ">=1.16.0-0"
-name: jackett
-version: 3.1.7
-upstream_version: 7.0.1
-appVersion: "auto"
-description: API Support for your favorite torrent trackers.
-type: application
-deprecated: false
-home: https://github.com/truecharts/apps/tree/master/stable/jackett
-icon: https://truecharts.org/_static/img/jackett-icon.png
-keywords:
-  - jackett
-  - torrent
-  - usenet
-sources:
-  - https://github.com/truecharts/apps/tree/master/stable/jackett
-  - https://github.com/k8s-at-home/charts/tree/master/charts/jackett
-  - https://github.com/Jackett/Jackett
-  - https://hub.docker.com/r/linuxserver/jackett
-dependencies:
-  - name: common
-    repository: https://truecharts.org/
-    version: 3.5.5
-    # condition:
-maintainers:
-  - name: TrueCharts
-    email: info@truecharts.org
-    url: truecharts.org
-  - name: Ornias1993
-    email: kjeld@schouten-lebbing.nl
-    url: truecharts.org
-# annotations:

.test/jackett/SCALE/ix_values.yaml

@@ -1,15 +0,0 @@
-##
-# This file contains Values.yaml content that gets added to the output of questions.yaml
-# It's ONLY meant for content that the user is NOT expected to change.
-# Example: Everything under "image" is not included in questions.yaml but is included here.
-##
-
-image:
-  repository: ghcr.io/truecharts/jackett
-  pullPolicy: IfNotPresent
-  tag: v0.17.1006
-
-##
-# Most other defaults are set in questions.yaml
-# For other options please refer to the wiki, default_values.yaml or the common library chart
-##

.tools/fixfolders.sh

@@ -1,44 +0,0 @@
-#!/bin/sh
-for chart in incubator/*; do
-	if [ -d "${chart}" ]; then
-      maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
-      maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
-      chartname=$(basename ${chart})
-      echo "Processing: ${chart} - folder: ${maxfolderversion} - version: ${maxchartversion}"
-      helm dependency update --skip-refresh ${chart}/${maxfolderversion}
-      if [ "${maxfolderversion}" != "${maxchartversion}" ]; then
-          mv -f ${chart}/${maxfolderversion} ${chart}/${maxchartversion}
-          echo "renamed ${chart}/${maxfolderversion} to ${chart}/${maxchartversion}"
-      fi
-  fi
-done
-
-
-for chart in stable/*; do
-  if [ -d "${chart}" ]; then
-      maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
-      maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
-      chartname=$(basename ${chart})
-      echo "Processing: ${chart} - folder: ${maxfolderversion} - version: ${maxchartversion}"
-      helm dependency update --skip-refresh ${chart}/${maxfolderversion}
-      if [ "${maxfolderversion}" != "${maxchartversion}" ]; then
-          mv -f ${chart}/${maxfolderversion} ${chart}/${maxchartversion}
-          echo "renamed ${chart}/${maxfolderversion} to ${chart}/${maxchartversion}"
-      fi
-  fi
-done
-
-
-for chart in dev/*; do
-  if [ -d "${chart}" ]; then
-      maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
-      maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
-      chartname=$(basename ${chart})
-      echo "Processing: ${chart} - folder: ${maxfolderversion} - version: ${maxchartversion}"
-      helm dependency update --skip-refresh ${chart}/${maxfolderversion}
-      if [ "${maxfolderversion}" != "${maxchartversion}" ]; then
-          mv -f ${chart}/${maxfolderversion} ${chart}/${maxchartversion}
-          echo "renamed ${chart}/${maxfolderversion} to ${chart}/${maxchartversion}"
-      fi
-  fi
-done

.tools/gen-helm-docs.sh

@@ -16,56 +16,41 @@ repository=$(git rev-parse --show-toplevel)
 # Templates to copy into each chart directory
 readme_template="${repository}/.tools/templates/docs/README.md.gotmpl"
 config_template="${repository}/.tools/templates/docs/CONFIG.md.gotmpl"
-app_readme_template="${repository}/.tools/templates/docs/app-readme.md.gotmpl"
-
 root="${repository}"
 
 for chart in stable/*; do
   if [ -d "${chart}" ]; then
-      maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
+      maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
-      maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
       chartname=$(basename ${chart})
-      echo "-] Copying templates to ${repository}/${chart}/${maxfolderversion}"
+      echo "-] Copying templates to ${repository}/${chart}"
       helm-docs \
           --ignore-file=".helmdocsignore" \
           --output-file="README.md" \
           --template-files="${repository}/.tools/templates/docs/README.md.gotmpl" \
-          --chart-search-root="${chart}/${maxfolderversion}"
+          --chart-search-root="${chart}"
       helm-docs \
           --ignore-file=".helmdocsignore" \
           --output-file="CONFIG.md" \
           --template-files="${repository}/.tools/templates/docs/CONFIG.md.gotmpl" \
-          --chart-search-root="${chart}/${maxfolderversion}"
+          --chart-search-root="${chart}"
-      helm-docs \
-          --ignore-file=".helmdocsignore" \
-          --output-file="app-readme.md" \
-          --template-files="${repository}/.tools/templates/docs/app-readme.md.gotmpl" \
-          --chart-search-root="${chart}/${maxfolderversion}"
-
 
   fi
 done
 
 for chart in incubator/*; do
   if [ -d "${chart}" ]; then
-      maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
+      maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
-      maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
       chartname=$(basename ${chart})
-      echo "-] Copying templates to ${repository}/${chart}/${maxfolderversion}"
+      echo "-] Copying templates to ${repository}/${chart}"
       helm-docs \
           --ignore-file=".helmdocsignore" \
 		  --output-file="README.md" \
           --template-files="${repository}/.tools/templates/docs/README.md.gotmpl" \
-          --chart-search-root="${chart}/${maxfolderversion}"
+          --chart-search-root="${chart}"
       helm-docs \
           --ignore-file=".helmdocsignore" \
           --output-file="CONFIG.md" \
           --template-files="${repository}/.tools/templates/docs/CONFIG.md.gotmpl" \
-          --chart-search-root="${chart}/${maxfolderversion}"
+          --chart-search-root="${chart}"
-      helm-docs \
-          --ignore-file=".helmdocsignore" \
-          --output-file="app-readme.md" \
-          --template-files="${repository}/.tools/templates/docs/app-readme.md.gotmpl" \
-          --chart-search-root="${chart}/${maxfolderversion}"
   fi
 done

.tools/templates/docs/app-readme.md.gotmpl

@@ -1,5 +0,0 @@
-{{- define "custom.notes" -}}
-This App is supplied by TrueCharts, for more information please visit https://truecharts.org
-{{- end -}}
-{{ template "chart.description" . }}
-{{ template "custom.notes" . }}

dev/placeholder/6.6.6/Chart.yaml

@@ -1,19 +0,0 @@
-apiVersion: v2
-kubeVersion: ">=1.16.0-0"
-name: placeholder
-version: 6.6.6
-upstream_version: 6.6.6
-appVersion: "placeholder"
-description: THIS IS A PLACEHOLDER AND SHOULD NOT BE INSTALLED
-type: application
-deprecated: false
-home: https://github.com/truecharts/apps/tree/master/stable/jackett
-icon: https://truecharts.org/_static/img/jackett-icon.png
-keywords:
-sources:
-dependencies:
-maintainers:
-  - name: TrueCharts
-    email: info@truecharts.org
-    url: truecharts.org
-# annotations:

dev/placeholder/6.6.6/ix_values.yaml

@@ -1 +0,0 @@
-# No defaults

dev/placeholder/6.6.6/questions.yaml

@@ -1,5 +0,0 @@
-groups:
-  - name: "Container Image"
-    description: "Image to be used for container"
-
-questions: []

dev/placeholder/6.6.6/test_values.yaml

@@ -1 +0,0 @@
-# No defaults

dev/placeholder/6.6.6/values.yaml

@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE

dev/placeholder/item.yaml

@@ -1,3 +0,0 @@
-categories:
-  - placeholder
-icon_url: https://truecharts.org/_static/img/jackett-icon.png

docs/manual/adding-truecharts.md

@@ -16,11 +16,11 @@ Adding the TrueCharts Community App Catalog is relatively straight forwards.
 
 Name: `truecharts`
 
-Repository: `https://github.com/truecharts/apps`
+Repository: `https://github.com/truecharts/catalog`
 
 Preferred Trains: `stable` (and optionally: `incubator`)
 
-Branch: `master`
+Branch: `main`
 
 ##### Difference between Stable and Incubator
 

features_capability.json

@@ -1,42 +0,0 @@
-{
-  "normalize/interfaceConfiguration": {
-    "stable": {"min":  "20.12-ALPHA"},
-    "nightlies": {"min":  "20.10-MASTER-somever"}
-  },
-  "normalize/ixVolume": {
-    "stable": {"min":  "20.12-ALPHA"},
-    "nightlies": {"min":  "20.10-MASTER-somever"}
-  },
-  "definitions/interface": {
-    "stable": {"min":  "20.12-ALPHA"},
-    "nightlies": {"min":  "20.10-MASTER-somever"}
-  },
-  "definitions/gpuConfiguration": {
-    "stable": {"min":  "20.12-ALPHA"},
-    "nightlies": {"min":  "20.10-MASTER-somever"}
-  },
-  "definitions/timezone": {
-    "stable": {"min":  "20.12-ALPHA"},
-    "nightlies": {"min":  "20.12-MASTER"}
-  },
-  "definitions/nodeIP": {
-    "stable": {"min":  "20.12-ALPHA"},
-    "nightlies": {"min":  "20.12-MASTER"}
-  },
-  "definitions/certificate": {
-    "stable": {"min": "21.04-ALPHA"},
-    "nightlies": {"min": "21.02-MASTER"}
-  },
-  "definitions/certificateAuthority": {
-    "stable": {"min": "21.04-ALPHA"},
-    "nightlies": {"min": "21.02-MASTER"}
-  },
-  "validations/containerImage": {
-    "stable": {"min": "21.06-BETA"},
-    "nightlies": {"min": "21.04-MASTER"}
-  },
-  "validations/nodePort": {
-    "stable": {"min": "21.04-ALPHA"},
-    "nightlies": {"min": "21.04-MASTER"}
-  }
-}

incubator/appdaemon/0.1.3/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://truecharts.org/
-  version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:33.495095083Z"

incubator/appdaemon/0.1.3/values.yaml

@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE

incubator/bazarr/3.1.5/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://truecharts.org/
-  version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:30.220580851Z"

incubator/bazarr/3.1.5/values.yaml

@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE

incubator/calibre-web/3.1.5/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://truecharts.org/
-  version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:27.396045024Z"

incubator/calibre-web/3.1.5/values.yaml

@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE

incubator/deluge/3.1.5/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://truecharts.org/
-  version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:24.4633977Z"

incubator/deluge/3.1.5/values.yaml

@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE

incubator/fireflyiii/1.0.1/Chart.lock

@@ -1,9 +0,0 @@
-dependencies:
-- name: common
-  repository: https://truecharts.org/
-  version: 3.5.5
-- name: postgresql
-  repository: https://charts.bitnami.com/bitnami
-  version: 10.4.2
-digest: sha256:feb1c5155f10c340b5a984ce39eb7c532c938ac71287bfa65398ef3fe458c902
-generated: "2021-05-05T21:03:35.766078238Z"

incubator/fireflyiii/1.0.1/values.yaml

@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE

incubator/freshrss/3.1.5/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://truecharts.org/
-  version: 3.5.5
-digest: sha256:ea66c36be2fa73e56bc33f7e89af9ce338cdfbed0b347484888e87228b825015
-generated: "2021-05-04T15:28:21.931872165Z"

incubator/freshrss/3.1.5/values.yaml

@@ -1 +0,0 @@
-# This file is empty on purpose, as it should not be used with TrueNAS SCALE