Cleanup, Fixes and Review Feedback

Includes mix fixes like: - Fixing the documentation - Making sure device and storage mounts work correctly - Fixing broken things that where supposed to work according to the PR highlights - Moving some additional things to TrueCharts based containers - Hiding, changing and reordening some bad UI elements - Adding support for supplementalGroup permissions Co-authored-by: Dan Sheridan <dan.sheridan@postman.org.uk> Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Co-authored-by: Justin Clift <justin@postgresql.org>
mruoss · Mar 12, 2021 · e8f9ef0 · e8f9ef0
1 parent 1257de6
commit e8f9ef0
Show file tree

Hide file tree

Showing 185 changed files with 515 additions and 1,211 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -18,12 +18,12 @@ Installing TrueCharts within TrueNAS SCALE, still requires the CLI. However it's
 - enter `cli`
 - enter `app catalog create repository="https://github.com/truecharts/truecharts" label="TrueCharts"`
 
-For more information, please visit our wiki:
-https://wiki.truecharts.org
+For more information, please visit our website:
+https://truecharts.org
 
 ## FAQ
 
-Please refer to our [FAQ](https://wiki.truecharts.org/FAQ) and [Issue tracker](https://github.com/truecharts/charts/issues) before creating an issue.
+Please refer to our [FAQ](https://truecharts.org/about/FAQ/) and [Issue tracker](https://github.com/truecharts/charts/issues) before creating an issue.
 There is a significant chance your issue has been reported before!
 
 ## Getting into creating Apps

diff --git a/.github/workflows/wiki-create-docs.yaml b/.github/workflows/wiki-create-docs.yaml
@@ -43,8 +43,7 @@ jobs:
       - name: Create general website
         run: |
           cd master
-<<<<<<< HEAD
-          cp -Rf .github/docs/* ../website/content/
+          cp -Rf docs/* ../website/content/
           cp .github/README.md ../website/content/about/index.md || echo "readme copy failed, continuing..."
           cp .github/CODE_OF_CONDUCT ../website/content/about/code_of_conduct.md || echo "CODE_OF_CONDUCT copy failed, continuing..."
           cp .github/CONTRIBUTING ../website/content/development/contributing.md || echo "CONTRIBUTING copy failed, continuing..."
@@ -53,17 +52,6 @@ jobs:
           cp NOTICE ../website/content/about/NOTICE.md || echo "license copy failed, continuing..."
           sed -i '1s/^/# NOTICE<br>\n\n/' ../website/content/about/NOTICE.md
           ls ../website/content/
-=======
-          cp -Rf docs/* ../wiki/content/
-          cp .github/README.md ../wiki/content/index.md || echo "readme copy failed, continuing..."
-          cp .github/CODE_OF_CONDUCT ../wiki/content/code_of_conduct.md || echo "CODE_OF_CONDUCT copy failed, continuing..."
-          cp .github/CONTRIBUTING ../wiki/content/development/contributing.md || echo "CONTRIBUTING copy failed, continuing..."
-          cp LICENSE ../wiki/content/legal/LICENSE.md || echo "license copy failed, continuing..."
-          sed -i '1s/^/# License<br>\n\n/' ../wiki/content/legal/LICENSE.md
-          cp NOTICE ../wiki/content/legal/NOTICE.md || echo "license copy failed, continuing..."
-          sed -i '1s/^/# NOTICE<br>\n\n/' ../wiki/content/legal/NOTICE.md
-          ls ../wiki/content/
->>>>>>> Move docs from .github to project root (#223)
           cd ..
 
       - name: Create apps website

diff --git a/.helmdocsignore b/.helmdocsignore
diff --git a/.tools/templates/chart/app-readme.md.gotmpl b/.tools/templates/chart/app-readme.md.gotmpl
@@ -1,5 +1,4 @@
 {{- define "custom.notes" -}}
 {{- end -}}
-
 {{ template "chart.description" . }}
 {{ template "custom.notes" . }}
diff --git a/.tools/tests/charts/common-test_spec.rb b/.tools/tests/charts/common-test_spec.rb
@@ -42,14 +42,30 @@ class Test < ChartTest
       it 'defaults to false = runAs 568' do
         jq('.spec.template.spec.securityContext.runAsUser', resource('Deployment')).must_equal 568
         jq('.spec.template.spec.securityContext.runAsGroup', resource('Deployment')).must_equal 568
+        jq('.spec.template.spec.securityContext.fsGroup', resource('Deployment')).must_equal 568
         jq('.spec.template.spec.securityContext.runAsNonRoot', resource('Deployment')).must_equal true
+        jq('.spec.template.spec.securityContext.supplementalGroups', resource('Deployment')).must_equal []
+      end
+
+      it 'allow settingsupplementalGroups' do
+        values = {
+          supplementalGroups: "5,20"
+        }
+        chart.value values
+        jq('.spec.template.spec.securityContext.runAsUser', resource('Deployment')).must_equal 568
+        jq('.spec.template.spec.securityContext.runAsGroup', resource('Deployment')).must_equal 568
+        jq('.spec.template.spec.securityContext.fsGroup', resource('Deployment')).must_equal 568
+        jq('.spec.template.spec.securityContext.runAsNonRoot', resource('Deployment')).must_equal true
+        jq('.spec.template.spec.securityContext.supplementalGroups', resource('Deployment')).must_equal [5,20]
       end
 
       it 'can be enabled = runAs nil' do
         chart.value startAsRoot: true
         jq('.spec.template.spec.securityContext.runAsUser', resource('Deployment')).must_equal nil
         jq('.spec.template.spec.securityContext.runAsGroup', resource('Deployment')).must_equal nil
         jq('.spec.template.spec.securityContext.runAsNonRoot', resource('Deployment')).must_equal nil
+        jq('.spec.template.spec.securityContext.fsGroup', resource('Deployment')).must_equal nil
+        jq('.spec.template.spec.securityContext.supplementalGroups', resource('Deployment')).must_equal nil
       end
     end
 

diff --git a/charts/bazarr/2.0.0/Chart.yaml b/charts/bazarr/2.0.0/Chart.yaml
@@ -1,11 +1,7 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: bazarr
-<<<<<<< HEAD:charts/bazarr/1.6.4/Chart.yaml
-version: 1.6.4
-=======
 version: 2.0.0
->>>>>>> [Common] Refactor Services (#212):charts/bazarr/2.0.0/Chart.yaml
 upstream_version: 5.2.1
 appVersion: "auto"
 description: Bazarr is a companion application to Bazarr and Radarr. It manages and downloads subtitles based on your requirements
@@ -28,11 +24,7 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
-<<<<<<< HEAD:charts/bazarr/1.6.4/Chart.yaml
-    version: 1.6.7
-=======
     version: 2.0.0
->>>>>>> [Common] Refactor Services (#212):charts/bazarr/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:

diff --git a/charts/bazarr/2.0.0/README.md b/charts/bazarr/2.0.0/README.md
@@ -1,10 +1,6 @@
 # Introduction
 
-<<<<<<< HEAD:charts/bazarr/1.6.4/README.md
-![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.0.5](https://img.shields.io/badge/AppVersion-v0.9.0.5-informational?style=flat-square)
-=======
-![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.0.5](https://img.shields.io/badge/AppVersion-v0.9.0.5-informational?style=flat-square)
->>>>>>> [Common] Refactor Services (#212):charts/bazarr/2.0.0/README.md
+![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: auto](https://img.shields.io/badge/AppVersion-auto-informational?style=flat-square)
 
 Bazarr is a companion application to Bazarr and Radarr. It manages and downloads subtitles based on your requirements
 
@@ -26,11 +22,7 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-<<<<<<< HEAD:charts/bazarr/1.6.4/README.md
-| https://charts.truecharts.org/ | common | 1.6.7 |
-=======
-| https://charts.truecharts.org/ | common | 1.6.1 |
->>>>>>> [Common] Refactor Services (#212):charts/bazarr/2.0.0/README.md
+| https://charts.truecharts.org/ | common | 2.0.0 |
 
 ## Installing the Chart
 
@@ -59,5 +51,6 @@ The command removes all the Kubernetes components associated with the chart **in
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)
 - Ask a [question](https://github.com/truecharts/charts/discussions)
 
+
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
diff --git a/charts/bazarr/2.0.0/charts/common-2.0.0.tgz b/charts/bazarr/2.0.0/charts/common-2.0.0.tgz
diff --git a/charts/bazarr/2.0.0/questions.yaml b/charts/bazarr/2.0.0/questions.yaml
@@ -238,6 +238,7 @@ questions:
                   default: "config"
                   required: true
                   editable: false
+                  hidden: true
               - variable: mountPath
                 label: "Mount Path"
                 description: "Path to mount inside the pod"
@@ -294,6 +295,7 @@ questions:
                   default: "media"
                   required: true
                   editable: false
+                  hidden: true
               - variable: mountPath
                 label: "Mount Path"
                 description: "Path to mount inside the pod"

diff --git a/charts/calibre-web/2.0.0/Chart.yaml b/charts/calibre-web/2.0.0/Chart.yaml
@@ -1,11 +1,7 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: calibre-web
-<<<<<<< HEAD:charts/calibre-web/1.6.4/Chart.yaml
-version: 1.6.4
-=======
 version: 2.0.0
->>>>>>> [Common] Refactor Services (#212):charts/calibre-web/2.0.0/Chart.yaml
 upstream_version: 4.3.1
 appVersion: "auto"
 description: Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database.
@@ -25,11 +21,7 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
-<<<<<<< HEAD:charts/calibre-web/1.6.4/Chart.yaml
-    version: 1.6.7
-=======
     version: 2.0.0
->>>>>>> [Common] Refactor Services (#212):charts/calibre-web/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:

diff --git a/charts/calibre-web/2.0.0/README.md b/charts/calibre-web/2.0.0/README.md
@@ -1,10 +1,6 @@
 # Introduction
 
-<<<<<<< HEAD:charts/calibre-web/1.6.4/README.md
-![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.9](https://img.shields.io/badge/AppVersion-0.6.9-informational?style=flat-square)
-=======
-![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.9](https://img.shields.io/badge/AppVersion-0.6.9-informational?style=flat-square)
->>>>>>> [Common] Refactor Services (#212):charts/calibre-web/2.0.0/README.md
+![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: auto](https://img.shields.io/badge/AppVersion-auto-informational?style=flat-square)
 
 Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database.
 
@@ -26,11 +22,7 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-<<<<<<< HEAD:charts/calibre-web/1.6.4/README.md
-| https://charts.truecharts.org/ | common | 1.6.7 |
-=======
-| https://charts.truecharts.org/ | common | 1.6.1 |
->>>>>>> [Common] Refactor Services (#212):charts/calibre-web/2.0.0/README.md
+| https://charts.truecharts.org/ | common | 2.0.0 |
 
 ## Installing the Chart
 
@@ -59,5 +51,6 @@ The command removes all the Kubernetes components associated with the chart **in
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)
 - Ask a [question](https://github.com/truecharts/charts/discussions)
 
+
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
diff --git a/charts/calibre-web/2.0.0/charts/common-2.0.0.tgz b/charts/calibre-web/2.0.0/charts/common-2.0.0.tgz
diff --git a/charts/calibre-web/2.0.0/questions.yaml b/charts/calibre-web/2.0.0/questions.yaml
@@ -236,6 +236,7 @@ questions:
                   default: "config"
                   required: true
                   editable: false
+                  hidden: true
               - variable: mountPath
                 label: "Mount Path"
                 description: "Path to mount inside the pod"
@@ -292,6 +293,7 @@ questions:
                   default: "media"
                   required: true
                   editable: false
+                  hidden: true
               - variable: mountPath
                 label: "Mount Path"
                 description: "Path to mount inside the pod"

diff --git a/charts/collabora-online/2.0.0/Chart.yaml b/charts/collabora-online/2.0.0/Chart.yaml
@@ -1,11 +1,7 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: collabora-online
-<<<<<<< HEAD:charts/collabora-online/1.6.4/Chart.yaml
-version: 1.6.4
-=======
 version: 2.0.0
->>>>>>> [Common] Refactor Services (#212):charts/collabora-online/2.0.0/Chart.yaml
 # upstream_version:
 appVersion: "auto"
 description: Collabora Online Development Edition – an awesome, Online Office suite image suitable for home use.
@@ -23,11 +19,7 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
-<<<<<<< HEAD:charts/collabora-online/1.6.4/Chart.yaml
-    version: 1.6.7
-=======
     version: 2.0.0
->>>>>>> [Common] Refactor Services (#212):charts/collabora-online/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:

diff --git a/charts/collabora-online/2.0.0/README.md b/charts/collabora-online/2.0.0/README.md
@@ -1,10 +1,6 @@
 # Introduction
 
-<<<<<<< HEAD:charts/collabora-online/1.6.4/README.md
-![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.4.6.1](https://img.shields.io/badge/AppVersion-6.4.6.1-informational?style=flat-square)
-=======
-![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.4.6.1](https://img.shields.io/badge/AppVersion-6.4.6.1-informational?style=flat-square)
->>>>>>> [Common] Refactor Services (#212):charts/collabora-online/2.0.0/README.md
+![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: auto](https://img.shields.io/badge/AppVersion-auto-informational?style=flat-square)
 
 Collabora Online Development Edition – an awesome, Online Office suite image suitable for home use.
 
@@ -26,11 +22,7 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-<<<<<<< HEAD:charts/collabora-online/1.6.4/README.md
-| https://charts.truecharts.org/ | common | 1.6.7 |
-=======
-| https://charts.truecharts.org/ | common | 1.6.1 |
->>>>>>> [Common] Refactor Services (#212):charts/collabora-online/2.0.0/README.md
+| https://charts.truecharts.org/ | common | 2.0.0 |
 
 ## Installing the Chart
 
@@ -59,5 +51,6 @@ The command removes all the Kubernetes components associated with the chart **in
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)
 - Ask a [question](https://github.com/truecharts/charts/discussions)
 
+
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
diff --git a/charts/collabora-online/2.0.0/charts/common-2.0.0.tgz b/charts/collabora-online/2.0.0/charts/common-2.0.0.tgz
diff --git a/charts/collabora-online/2.0.0/questions.yaml b/charts/collabora-online/2.0.0/questions.yaml
@@ -120,7 +120,7 @@ questions:
           schema:
             type: string
             private: true
-            default: "changeme"
+            default: ""
             required: true
         - variable: dictionaries
           label: "Dictionaries to use, leave empty to use all"

diff --git a/charts/deluge/2.0.0/Chart.yaml b/charts/deluge/2.0.0/Chart.yaml
@@ -1,11 +1,7 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: deluge
-<<<<<<< HEAD:charts/deluge/1.6.4/Chart.yaml
-version: 1.6.4
-=======
 version: 2.0.0
->>>>>>> [Common] Refactor Services (#212):charts/deluge/2.0.0/Chart.yaml
 upstream_version: 1.1.1
 appVersion: "latest"
 description: Deluge is a torrent download client
@@ -23,11 +19,7 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
-<<<<<<< HEAD:charts/deluge/1.6.4/Chart.yaml
-    version: 1.6.7
-=======
     version: 2.0.0
->>>>>>> [Common] Refactor Services (#212):charts/deluge/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:

diff --git a/charts/deluge/2.0.0/README.md b/charts/deluge/2.0.0/README.md
@@ -1,10 +1,6 @@
 # Introduction
 
-<<<<<<< HEAD:charts/deluge/1.6.4/README.md
-![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.0.3-2201906121747](https://img.shields.io/badge/AppVersion-v2.0.3--2201906121747-informational?style=flat-square)
-=======
-![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.0.3-2201906121747](https://img.shields.io/badge/AppVersion-v2.0.3--2201906121747-informational?style=flat-square)
->>>>>>> [Common] Refactor Services (#212):charts/deluge/2.0.0/README.md
+![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 
 Deluge is a torrent download client
 
@@ -26,11 +22,7 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-<<<<<<< HEAD:charts/deluge/1.6.4/README.md
-| https://charts.truecharts.org/ | common | 1.6.7 |
-=======
-| https://charts.truecharts.org/ | common | 1.6.1 |
->>>>>>> [Common] Refactor Services (#212):charts/deluge/2.0.0/README.md
+| https://charts.truecharts.org/ | common | 2.0.0 |
 
 ## Installing the Chart
 
@@ -59,5 +51,6 @@ The command removes all the Kubernetes components associated with the chart **in
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)
 - Ask a [question](https://github.com/truecharts/charts/discussions)
 
+
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
diff --git a/charts/deluge/2.0.0/charts/common-2.0.0.tgz b/charts/deluge/2.0.0/charts/common-2.0.0.tgz
diff --git a/charts/deluge/2.0.0/questions.yaml b/charts/deluge/2.0.0/questions.yaml
@@ -363,6 +363,7 @@ questions:
                   default: "config"
                   required: true
                   editable: false
+                  hidden: true
               - variable: mountPath
                 label: "Mount Path"
                 description: "Path to mount inside the pod"