Skip to content

Commit e8f9ef0

Browse files
kjeld Schouten-Lebbingdjs52stavros-kjustinclift
committed
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 <[email protected]> Co-authored-by: Stavros Kois <[email protected]> Co-authored-by: Justin Clift <[email protected]>
1 parent 1257de6 commit e8f9ef0

File tree

185 files changed

+515
-1211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+515
-1211
lines changed

‎.github/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ Installing TrueCharts within TrueNAS SCALE, still requires the CLI. However it's
1818
- enter `cli`
1919
- enter `app catalog create repository="https://github.com/truecharts/truecharts" label="TrueCharts"`
2020

21-
For more information, please visit our wiki:
22-
https://wiki.truecharts.org
21+
For more information, please visit our website:
22+
https://truecharts.org
2323

2424
## FAQ
2525

26-
Please refer to our [FAQ](https://wiki.truecharts.org/FAQ) and [Issue tracker](https://github.com/truecharts/charts/issues) before creating an issue.
26+
Please refer to our [FAQ](https://truecharts.org/about/FAQ/) and [Issue tracker](https://github.com/truecharts/charts/issues) before creating an issue.
2727
There is a significant chance your issue has been reported before!
2828

2929
## Getting into creating Apps

‎.github/workflows/wiki-create-docs.yaml

+1-13
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ jobs:
4343
- name: Create general website
4444
run: |
4545
cd master
46-
<<<<<<< HEAD
47-
cp -Rf .github/docs/* ../website/content/
46+
cp -Rf docs/* ../website/content/
4847
cp .github/README.md ../website/content/about/index.md || echo "readme copy failed, continuing..."
4948
cp .github/CODE_OF_CONDUCT ../website/content/about/code_of_conduct.md || echo "CODE_OF_CONDUCT copy failed, continuing..."
5049
cp .github/CONTRIBUTING ../website/content/development/contributing.md || echo "CONTRIBUTING copy failed, continuing..."
@@ -53,17 +52,6 @@ jobs:
5352
cp NOTICE ../website/content/about/NOTICE.md || echo "license copy failed, continuing..."
5453
sed -i '1s/^/# NOTICE<br>\n\n/' ../website/content/about/NOTICE.md
5554
ls ../website/content/
56-
=======
57-
cp -Rf docs/* ../wiki/content/
58-
cp .github/README.md ../wiki/content/index.md || echo "readme copy failed, continuing..."
59-
cp .github/CODE_OF_CONDUCT ../wiki/content/code_of_conduct.md || echo "CODE_OF_CONDUCT copy failed, continuing..."
60-
cp .github/CONTRIBUTING ../wiki/content/development/contributing.md || echo "CONTRIBUTING copy failed, continuing..."
61-
cp LICENSE ../wiki/content/legal/LICENSE.md || echo "license copy failed, continuing..."
62-
sed -i '1s/^/# License<br>\n\n/' ../wiki/content/legal/LICENSE.md
63-
cp NOTICE ../wiki/content/legal/NOTICE.md || echo "license copy failed, continuing..."
64-
sed -i '1s/^/# NOTICE<br>\n\n/' ../wiki/content/legal/NOTICE.md
65-
ls ../wiki/content/
66-
>>>>>>> Move docs from .github to project root (#223)
6755
cd ..
6856
6957
- name: Create apps website

‎.helmdocsignore

Whitespace-only changes.

‎.tools/templates/chart/app-readme.md.gotmpl

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{{- define "custom.notes" -}}
22
{{- end -}}
3-
43
{{ template "chart.description" . }}
54
{{ template "custom.notes" . }}

‎.tools/tests/charts/common-test_spec.rb

+16
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,30 @@ class Test < ChartTest
4242
it 'defaults to false = runAs 568' do
4343
jq('.spec.template.spec.securityContext.runAsUser', resource('Deployment')).must_equal 568
4444
jq('.spec.template.spec.securityContext.runAsGroup', resource('Deployment')).must_equal 568
45+
jq('.spec.template.spec.securityContext.fsGroup', resource('Deployment')).must_equal 568
4546
jq('.spec.template.spec.securityContext.runAsNonRoot', resource('Deployment')).must_equal true
47+
jq('.spec.template.spec.securityContext.supplementalGroups', resource('Deployment')).must_equal []
48+
end
49+
50+
it 'allow settingsupplementalGroups' do
51+
values = {
52+
supplementalGroups: "5,20"
53+
}
54+
chart.value values
55+
jq('.spec.template.spec.securityContext.runAsUser', resource('Deployment')).must_equal 568
56+
jq('.spec.template.spec.securityContext.runAsGroup', resource('Deployment')).must_equal 568
57+
jq('.spec.template.spec.securityContext.fsGroup', resource('Deployment')).must_equal 568
58+
jq('.spec.template.spec.securityContext.runAsNonRoot', resource('Deployment')).must_equal true
59+
jq('.spec.template.spec.securityContext.supplementalGroups', resource('Deployment')).must_equal [5,20]
4660
end
4761

4862
it 'can be enabled = runAs nil' do
4963
chart.value startAsRoot: true
5064
jq('.spec.template.spec.securityContext.runAsUser', resource('Deployment')).must_equal nil
5165
jq('.spec.template.spec.securityContext.runAsGroup', resource('Deployment')).must_equal nil
5266
jq('.spec.template.spec.securityContext.runAsNonRoot', resource('Deployment')).must_equal nil
67+
jq('.spec.template.spec.securityContext.fsGroup', resource('Deployment')).must_equal nil
68+
jq('.spec.template.spec.securityContext.supplementalGroups', resource('Deployment')).must_equal nil
5369
end
5470
end
5571

‎charts/bazarr/2.0.0/Chart.yaml

-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
apiVersion: v2
22
kubeVersion: ">=1.16.0-0"
33
name: bazarr
4-
<<<<<<< HEAD:charts/bazarr/1.6.4/Chart.yaml
5-
version: 1.6.4
6-
=======
74
version: 2.0.0
8-
>>>>>>> [Common] Refactor Services (#212):charts/bazarr/2.0.0/Chart.yaml
95
upstream_version: 5.2.1
106
appVersion: "auto"
117
description: Bazarr is a companion application to Bazarr and Radarr. It manages and downloads subtitles based on your requirements
@@ -28,11 +24,7 @@ sources:
2824
dependencies:
2925
- name: common
3026
repository: https://charts.truecharts.org/
31-
<<<<<<< HEAD:charts/bazarr/1.6.4/Chart.yaml
32-
version: 1.6.7
33-
=======
3427
version: 2.0.0
35-
>>>>>>> [Common] Refactor Services (#212):charts/bazarr/2.0.0/Chart.yaml
3628
# condition:
3729
# tags:
3830
# import-values:

‎charts/bazarr/2.0.0/README.md

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# Introduction
22

3-
<<<<<<< HEAD:charts/bazarr/1.6.4/README.md
4-
![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)
5-
=======
6-
![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)
7-
>>>>>>> [Common] Refactor Services (#212):charts/bazarr/2.0.0/README.md
3+
![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)
84

95
Bazarr is a companion application to Bazarr and Radarr. It manages and downloads subtitles based on your requirements
106

@@ -26,11 +22,7 @@ Kubernetes: `>=1.16.0-0`
2622

2723
| Repository | Name | Version |
2824
|------------|------|---------|
29-
<<<<<<< HEAD:charts/bazarr/1.6.4/README.md
30-
| https://charts.truecharts.org/ | common | 1.6.7 |
31-
=======
32-
| https://charts.truecharts.org/ | common | 1.6.1 |
33-
>>>>>>> [Common] Refactor Services (#212):charts/bazarr/2.0.0/README.md
25+
| https://charts.truecharts.org/ | common | 2.0.0 |
3426

3527
## Installing the Chart
3628

@@ -59,5 +51,6 @@ The command removes all the Kubernetes components associated with the chart **in
5951
- Open a [issue](https://github.com/truecharts/charts/issues/new/choose)
6052
- Ask a [question](https://github.com/truecharts/charts/discussions)
6153

54+
6255
----------------------------------------------
6356
Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)

‎charts/bazarr/2.0.0/charts/common-2.0.0.tgz

118 Bytes
Binary file not shown.

‎charts/bazarr/2.0.0/questions.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ questions:
238238
default: "config"
239239
required: true
240240
editable: false
241+
hidden: true
241242
- variable: mountPath
242243
label: "Mount Path"
243244
description: "Path to mount inside the pod"
@@ -294,6 +295,7 @@ questions:
294295
default: "media"
295296
required: true
296297
editable: false
298+
hidden: true
297299
- variable: mountPath
298300
label: "Mount Path"
299301
description: "Path to mount inside the pod"

‎charts/calibre-web/2.0.0/Chart.yaml

-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
apiVersion: v2
22
kubeVersion: ">=1.16.0-0"
33
name: calibre-web
4-
<<<<<<< HEAD:charts/calibre-web/1.6.4/Chart.yaml
5-
version: 1.6.4
6-
=======
74
version: 2.0.0
8-
>>>>>>> [Common] Refactor Services (#212):charts/calibre-web/2.0.0/Chart.yaml
95
upstream_version: 4.3.1
106
appVersion: "auto"
117
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:
2521
dependencies:
2622
- name: common
2723
repository: https://charts.truecharts.org/
28-
<<<<<<< HEAD:charts/calibre-web/1.6.4/Chart.yaml
29-
version: 1.6.7
30-
=======
3124
version: 2.0.0
32-
>>>>>>> [Common] Refactor Services (#212):charts/calibre-web/2.0.0/Chart.yaml
3325
# condition:
3426
# tags:
3527
# import-values:

‎charts/calibre-web/2.0.0/README.md

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# Introduction
22

3-
<<<<<<< HEAD:charts/calibre-web/1.6.4/README.md
4-
![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)
5-
=======
6-
![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)
7-
>>>>>>> [Common] Refactor Services (#212):charts/calibre-web/2.0.0/README.md
3+
![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)
84

95
Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database.
106

@@ -26,11 +22,7 @@ Kubernetes: `>=1.16.0-0`
2622

2723
| Repository | Name | Version |
2824
|------------|------|---------|
29-
<<<<<<< HEAD:charts/calibre-web/1.6.4/README.md
30-
| https://charts.truecharts.org/ | common | 1.6.7 |
31-
=======
32-
| https://charts.truecharts.org/ | common | 1.6.1 |
33-
>>>>>>> [Common] Refactor Services (#212):charts/calibre-web/2.0.0/README.md
25+
| https://charts.truecharts.org/ | common | 2.0.0 |
3426

3527
## Installing the Chart
3628

@@ -59,5 +51,6 @@ The command removes all the Kubernetes components associated with the chart **in
5951
- Open a [issue](https://github.com/truecharts/charts/issues/new/choose)
6052
- Ask a [question](https://github.com/truecharts/charts/discussions)
6153

54+
6255
----------------------------------------------
6356
Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)

‎charts/calibre-web/2.0.0/charts/common-2.0.0.tgz

118 Bytes
Binary file not shown.

‎charts/calibre-web/2.0.0/questions.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ questions:
236236
default: "config"
237237
required: true
238238
editable: false
239+
hidden: true
239240
- variable: mountPath
240241
label: "Mount Path"
241242
description: "Path to mount inside the pod"
@@ -292,6 +293,7 @@ questions:
292293
default: "media"
293294
required: true
294295
editable: false
296+
hidden: true
295297
- variable: mountPath
296298
label: "Mount Path"
297299
description: "Path to mount inside the pod"

‎charts/collabora-online/2.0.0/Chart.yaml

-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
apiVersion: v2
22
kubeVersion: ">=1.16.0-0"
33
name: collabora-online
4-
<<<<<<< HEAD:charts/collabora-online/1.6.4/Chart.yaml
5-
version: 1.6.4
6-
=======
74
version: 2.0.0
8-
>>>>>>> [Common] Refactor Services (#212):charts/collabora-online/2.0.0/Chart.yaml
95
# upstream_version:
106
appVersion: "auto"
117
description: Collabora Online Development Edition – an awesome, Online Office suite image suitable for home use.
@@ -23,11 +19,7 @@ sources:
2319
dependencies:
2420
- name: common
2521
repository: https://charts.truecharts.org/
26-
<<<<<<< HEAD:charts/collabora-online/1.6.4/Chart.yaml
27-
version: 1.6.7
28-
=======
2922
version: 2.0.0
30-
>>>>>>> [Common] Refactor Services (#212):charts/collabora-online/2.0.0/Chart.yaml
3123
# condition:
3224
# tags:
3325
# import-values:

‎charts/collabora-online/2.0.0/README.md

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# Introduction
22

3-
<<<<<<< HEAD:charts/collabora-online/1.6.4/README.md
4-
![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)
5-
=======
6-
![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)
7-
>>>>>>> [Common] Refactor Services (#212):charts/collabora-online/2.0.0/README.md
3+
![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)
84

95
Collabora Online Development Edition – an awesome, Online Office suite image suitable for home use.
106

@@ -26,11 +22,7 @@ Kubernetes: `>=1.16.0-0`
2622

2723
| Repository | Name | Version |
2824
|------------|------|---------|
29-
<<<<<<< HEAD:charts/collabora-online/1.6.4/README.md
30-
| https://charts.truecharts.org/ | common | 1.6.7 |
31-
=======
32-
| https://charts.truecharts.org/ | common | 1.6.1 |
33-
>>>>>>> [Common] Refactor Services (#212):charts/collabora-online/2.0.0/README.md
25+
| https://charts.truecharts.org/ | common | 2.0.0 |
3426

3527
## Installing the Chart
3628

@@ -59,5 +51,6 @@ The command removes all the Kubernetes components associated with the chart **in
5951
- Open a [issue](https://github.com/truecharts/charts/issues/new/choose)
6052
- Ask a [question](https://github.com/truecharts/charts/discussions)
6153

54+
6255
----------------------------------------------
6356
Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)

‎charts/collabora-online/2.0.0/charts/common-2.0.0.tgz

118 Bytes
Binary file not shown.

‎charts/collabora-online/2.0.0/questions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ questions:
120120
schema:
121121
type: string
122122
private: true
123-
default: "changeme"
123+
default: ""
124124
required: true
125125
- variable: dictionaries
126126
label: "Dictionaries to use, leave empty to use all"

‎charts/deluge/2.0.0/Chart.yaml

-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
apiVersion: v2
22
kubeVersion: ">=1.16.0-0"
33
name: deluge
4-
<<<<<<< HEAD:charts/deluge/1.6.4/Chart.yaml
5-
version: 1.6.4
6-
=======
74
version: 2.0.0
8-
>>>>>>> [Common] Refactor Services (#212):charts/deluge/2.0.0/Chart.yaml
95
upstream_version: 1.1.1
106
appVersion: "latest"
117
description: Deluge is a torrent download client
@@ -23,11 +19,7 @@ sources:
2319
dependencies:
2420
- name: common
2521
repository: https://charts.truecharts.org/
26-
<<<<<<< HEAD:charts/deluge/1.6.4/Chart.yaml
27-
version: 1.6.7
28-
=======
2922
version: 2.0.0
30-
>>>>>>> [Common] Refactor Services (#212):charts/deluge/2.0.0/Chart.yaml
3123
# condition:
3224
# tags:
3325
# import-values:

‎charts/deluge/2.0.0/README.md

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# Introduction
22

3-
<<<<<<< HEAD:charts/deluge/1.6.4/README.md
4-
![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)
5-
=======
6-
![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)
7-
>>>>>>> [Common] Refactor Services (#212):charts/deluge/2.0.0/README.md
3+
![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)
84

95
Deluge is a torrent download client
106

@@ -26,11 +22,7 @@ Kubernetes: `>=1.16.0-0`
2622

2723
| Repository | Name | Version |
2824
|------------|------|---------|
29-
<<<<<<< HEAD:charts/deluge/1.6.4/README.md
30-
| https://charts.truecharts.org/ | common | 1.6.7 |
31-
=======
32-
| https://charts.truecharts.org/ | common | 1.6.1 |
33-
>>>>>>> [Common] Refactor Services (#212):charts/deluge/2.0.0/README.md
25+
| https://charts.truecharts.org/ | common | 2.0.0 |
3426

3527
## Installing the Chart
3628

@@ -59,5 +51,6 @@ The command removes all the Kubernetes components associated with the chart **in
5951
- Open a [issue](https://github.com/truecharts/charts/issues/new/choose)
6052
- Ask a [question](https://github.com/truecharts/charts/discussions)
6153

54+
6255
----------------------------------------------
6356
Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)

‎charts/deluge/2.0.0/charts/common-2.0.0.tgz

118 Bytes
Binary file not shown.

‎charts/deluge/2.0.0/questions.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ questions:
363363
default: "config"
364364
required: true
365365
editable: false
366+
hidden: true
366367
- variable: mountPath
367368
label: "Mount Path"
368369
description: "Path to mount inside the pod"

0 commit comments

Comments
 (0)