From 2fda3a9e3e1100066be1b9eaa714f5853bd0bc3c Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Wed, 19 May 2021 15:12:45 +0200 Subject: [PATCH 01/11] Common 4.0 App Refactor Part 1 - Ornias remove common references to the addons (we don't use them yet) (+23 squashed commit) Squashed commit: [042fc006] try slight modification to testing framework [6955bdad] another small qbittorrent fix [30af6b78] fix one bitwarden error (anotherone left [ac54db9f] enable firefly port [a9e58eca] push qbittorrent fix [99840038] fixed transmission [ffe8a49e] template all the things... [26c7b4d1] this should just work (tm) [fcacae4c] try a transmission fix [8d21bd91] merge unittests and app tests to limit amount of running jobs [343ba579] more services polish [c133342f] some small fixes [5979e653] fix some port references [15a1defa] oops [2458d7e9] increase common version again [7f74f1cf] change way ports are handled [73c479cb] fix services naming scheme [501aeffc] update common version again [726954b0] fix emptydir reference for tests [66774955] pump major versions [6fa711d1] update common-version for all [671a7b31] PUID and PGID changes for automated tests (non-gui changes) [3dc21053] hostpathmounts and gpu changes --- .github/workflows/apps.yaml | 86 +++---- charts/deprecated/nzbhydra/Chart.yaml | 4 +- .../deprecated/nzbhydra/SCALE/questions.yaml | 2 +- charts/deprecated/nzbhydra/values.yaml | 16 +- charts/incubator/appdaemon/Chart.yaml | 4 +- .../incubator/appdaemon/SCALE/questions.yaml | 2 +- charts/incubator/appdaemon/values.yaml | 18 +- charts/incubator/bazarr/Chart.yaml | 4 +- charts/incubator/bazarr/SCALE/questions.yaml | 2 +- charts/incubator/bazarr/values.yaml | 10 +- charts/incubator/calibre-web/Chart.yaml | 4 +- .../calibre-web/SCALE/questions.yaml | 2 +- charts/incubator/calibre-web/values.yaml | 10 +- charts/incubator/deluge/Chart.yaml | 4 +- charts/incubator/deluge/SCALE/questions.yaml | 2 +- charts/incubator/deluge/values.yaml | 33 +-- charts/incubator/fireflyiii/Chart.yaml | 4 +- .../incubator/fireflyiii/SCALE/questions.yaml | 2 +- .../fireflyiii/templates/secrets.yaml | 2 - charts/incubator/fireflyiii/values.yaml | 27 +- charts/incubator/freshrss/Chart.yaml | 4 +- .../incubator/freshrss/SCALE/questions.yaml | 2 +- charts/incubator/freshrss/values.yaml | 10 +- charts/incubator/gaps/Chart.yaml | 4 +- charts/incubator/gaps/SCALE/questions.yaml | 2 +- charts/incubator/gaps/values.yaml | 10 +- charts/incubator/grocy/Chart.yaml | 4 +- charts/incubator/grocy/SCALE/questions.yaml | 2 +- charts/incubator/grocy/values.yaml | 10 +- charts/incubator/heimdall/Chart.yaml | 4 +- .../incubator/heimdall/SCALE/questions.yaml | 2 +- charts/incubator/heimdall/values.yaml | 10 +- charts/incubator/lazylibrarian/Chart.yaml | 4 +- .../lazylibrarian/SCALE/questions.yaml | 2 +- charts/incubator/lazylibrarian/values.yaml | 10 +- charts/incubator/lychee/Chart.yaml | 4 +- charts/incubator/lychee/SCALE/questions.yaml | 2 +- charts/incubator/lychee/values.yaml | 10 +- charts/incubator/navidrome/Chart.yaml | 4 +- .../incubator/navidrome/SCALE/questions.yaml | 2 +- charts/incubator/navidrome/values.yaml | 10 +- charts/incubator/node-red/Chart.yaml | 4 +- .../incubator/node-red/SCALE/questions.yaml | 2 +- charts/incubator/node-red/values.yaml | 10 +- charts/incubator/nzbget/Chart.yaml | 4 +- charts/incubator/nzbget/SCALE/questions.yaml | 2 +- charts/incubator/nzbget/values.yaml | 10 +- charts/incubator/organizr/Chart.yaml | 4 +- .../incubator/organizr/SCALE/questions.yaml | 2 +- charts/incubator/organizr/values.yaml | 10 +- charts/incubator/podgrab/Chart.yaml | 4 +- charts/incubator/podgrab/SCALE/questions.yaml | 2 +- charts/incubator/podgrab/values.yaml | 21 +- charts/incubator/qbittorrent/Chart.yaml | 4 +- .../qbittorrent/SCALE/questions.yaml | 2 +- .../{configmap.yaml => _configmap.tpl} | 23 +- .../qbittorrent/templates/common.yaml | 5 + charts/incubator/qbittorrent/values.yaml | 37 ++- charts/incubator/readarr/Chart.yaml | 4 +- charts/incubator/readarr/SCALE/questions.yaml | 2 +- charts/incubator/readarr/values.yaml | 10 +- charts/incubator/sabnzbd/Chart.yaml | 4 +- charts/incubator/sabnzbd/SCALE/questions.yaml | 2 +- charts/incubator/sabnzbd/values.yaml | 10 +- charts/incubator/tvheadend/Chart.yaml | 4 +- .../incubator/tvheadend/SCALE/questions.yaml | 2 +- charts/incubator/tvheadend/values.yaml | 19 +- charts/incubator/unifi/Chart.yaml | 4 +- charts/incubator/unifi/SCALE/ix_values.yaml | 4 +- charts/incubator/unifi/SCALE/questions.yaml | 2 +- charts/incubator/unifi/values.yaml | 36 +-- charts/library/common-test/values.yaml | 7 +- charts/library/common/values.yaml | 238 +----------------- charts/stable/bitwarden/Chart.yaml | 4 +- charts/stable/bitwarden/SCALE/questions.yaml | 2 +- .../{configmap.yaml => _configmap.tpl} | 6 +- .../templates/{secrets.yaml => _secrets.tpl} | 6 +- charts/stable/bitwarden/templates/common.yaml | 6 + charts/stable/bitwarden/values.yaml | 22 +- charts/stable/collabora-online/Chart.yaml | 4 +- .../collabora-online/SCALE/questions.yaml | 2 +- charts/stable/collabora-online/values.yaml | 8 +- charts/stable/deepstack-cpu/Chart.yaml | 4 +- .../stable/deepstack-cpu/SCALE/ix_values.yaml | 4 +- .../stable/deepstack-cpu/SCALE/questions.yaml | 2 +- charts/stable/deepstack-cpu/values.yaml | 20 +- charts/stable/emby/Chart.yaml | 4 +- charts/stable/emby/SCALE/questions.yaml | 6 +- charts/stable/emby/values.yaml | 10 +- charts/stable/esphome/Chart.yaml | 4 +- charts/stable/esphome/SCALE/questions.yaml | 2 +- charts/stable/esphome/values.yaml | 10 +- charts/stable/handbrake/Chart.yaml | 4 +- charts/stable/handbrake/SCALE/ix_values.yaml | 4 +- charts/stable/handbrake/SCALE/questions.yaml | 2 +- charts/stable/handbrake/values.yaml | 23 +- charts/stable/home-assistant/Chart.yaml | 4 +- .../home-assistant/SCALE/questions.yaml | 2 +- charts/stable/home-assistant/values.yaml | 11 +- charts/stable/jackett/Chart.yaml | 4 +- charts/stable/jackett/SCALE/questions.yaml | 2 +- charts/stable/jackett/values.yaml | 25 +- charts/stable/jellyfin/Chart.yaml | 4 +- charts/stable/jellyfin/SCALE/questions.yaml | 6 +- charts/stable/jellyfin/values.yaml | 10 +- charts/stable/kms/Chart.yaml | 4 +- charts/stable/kms/SCALE/questions.yaml | 2 +- charts/stable/kms/values.yaml | 7 +- charts/stable/lidarr/Chart.yaml | 4 +- charts/stable/lidarr/SCALE/questions.yaml | 2 +- charts/stable/lidarr/values.yaml | 10 +- charts/stable/ombi/Chart.yaml | 4 +- charts/stable/ombi/SCALE/questions.yaml | 2 +- charts/stable/ombi/values.yaml | 10 +- charts/stable/plex/Chart.yaml | 4 +- charts/stable/plex/SCALE/questions.yaml | 6 +- charts/stable/plex/values.yaml | 10 +- charts/stable/radarr/Chart.yaml | 4 +- charts/stable/radarr/SCALE/questions.yaml | 2 +- charts/stable/radarr/values.yaml | 10 +- charts/stable/sonarr/Chart.yaml | 4 +- charts/stable/sonarr/SCALE/questions.yaml | 2 +- charts/stable/sonarr/values.yaml | 10 +- charts/stable/syncthing/Chart.yaml | 4 +- charts/stable/syncthing/SCALE/questions.yaml | 2 +- charts/stable/syncthing/values.yaml | 12 +- charts/stable/tautulli/Chart.yaml | 4 +- charts/stable/tautulli/SCALE/questions.yaml | 2 +- charts/stable/tautulli/values.yaml | 10 +- charts/stable/traefik/Chart.yaml | 4 +- charts/stable/traefik/values.yaml | 2 +- charts/stable/transmission/Chart.lock | 6 + charts/stable/transmission/Chart.yaml | 4 +- .../stable/transmission/SCALE/questions.yaml | 2 +- .../transmission/charts/common-4.1.1.tgz | Bin 0 -> 24520 bytes .../{configmap.yaml => _configmap.tpl} | 4 + .../stable/transmission/templates/common.yaml | 4 + charts/stable/transmission/values.yaml | 33 ++- charts/stable/truecommand/Chart.yaml | 4 +- .../stable/truecommand/SCALE/questions.yaml | 2 +- charts/stable/truecommand/values.yaml | 10 +- charts/stable/zwavejs2mqtt/Chart.yaml | 4 +- .../stable/zwavejs2mqtt/SCALE/questions.yaml | 2 +- charts/stable/zwavejs2mqtt/values.yaml | 19 +- 144 files changed, 558 insertions(+), 744 deletions(-) rename charts/incubator/qbittorrent/templates/{configmap.yaml => _configmap.tpl} (58%) rename charts/stable/bitwarden/templates/{configmap.yaml => _configmap.tpl} (98%) rename charts/stable/bitwarden/templates/{secrets.yaml => _secrets.tpl} (96%) create mode 100644 charts/stable/transmission/Chart.lock create mode 100644 charts/stable/transmission/charts/common-4.1.1.tgz rename charts/stable/transmission/templates/{configmap.yaml => _configmap.tpl} (78%) diff --git a/.github/workflows/apps.yaml b/.github/workflows/apps.yaml index 0d160a3ced5..e93c61ff675 100644 --- a/.github/workflows/apps.yaml +++ b/.github/workflows/apps.yaml @@ -59,15 +59,18 @@ jobs: echo "::set-output name=empty_matrix::false" fi - app-unit-tests: + app-tests: needs: [changes] if: ${{ needs.changes.outputs.empty_matrix == 'false' }} - name: App Unit Tests + name: App Tests runs-on: ubuntu-latest strategy: matrix: ${{ fromJson(needs.changes.outputs.matrix) }} fail-fast: false steps: + ## + # GENERAL SECTION + ## - name: Checkout if: ${{ matrix.app != '.gitkee' }} uses: actions/checkout@v2 @@ -93,24 +96,44 @@ jobs: fi echo ::set-output name=train::${train} if test -d "./charts/${train}/${{ matrix.app }}/tests/"; then - unittests='true' + unittests='true' echo "::set-output name=unittests::true" else unittests="false" echo "::set-output name=unittests::false" fi + - name: Install Helm + if: ${{ matrix.app != '.gitkee' }} + uses: azure/setup-helm@v1 + with: + version: v3.5.3 + + - uses: actions/setup-python@v2 + if: ${{ matrix.app != '.gitkee' }} + with: + python-version: 3.7 + + - name: Set up chart-testing + if: ${{ matrix.app != '.gitkee' }} + uses: helm/chart-testing-action@v2.0.1 + - uses: actions/setup-go@v2 if: ${{ steps.prep-lint.outputs.unittests == 'true' }} with: go-version: '^1.16' + ## + # Unit-Test section + ## + # Get values for cache paths to be used in later steps - id: go-cache-paths if: ${{ steps.prep-lint.outputs.unittests == 'true' }} run: | echo "::set-output name=go-build::$(go env GOCACHE)" echo "::set-output name=go-mod::$(go env GOMODCACHE)" + # Cache go build cache, used to speedup go test - name: Go Build Cache if: ${{ steps.prep-lint.outputs.unittests == 'true' }} @@ -133,54 +156,10 @@ jobs: with: test-results: test.json - app-tests: - needs: [changes] - if: ${{ needs.changes.outputs.empty_matrix == 'false' }} - name: App Tests - runs-on: ubuntu-latest - strategy: - matrix: ${{ fromJson(needs.changes.outputs.matrix) }} - fail-fast: false - steps: - - name: Checkout - if: ${{ matrix.app != '.gitkee' }} - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Prepare-Lint - if: ${{ matrix.app != '.gitkee' }} - id: prep-lint - run: | - if test -f "./charts/stable/${{ matrix.app }}/Chart.yaml"; then - train="stable" - elif test -f "./charts/incubator/${{ matrix.app }}/Chart.yaml"; then - train="incubator" - elif test -f "./charts/deprecated/${{ matrix.app }}/Chart.yaml"; then - train="deprecated" - elif test -f "./charts/non-free/${{ matrix.app }}/Chart.yaml"; then - train="non-free" - elif test -f "./charts/library/${{ matrix.app }}/Chart.yaml"; then - train="library" - else - train="develop" - fi - echo ::set-output name=train::${train} - - - name: Install Helm - if: ${{ matrix.app != '.gitkee' }} - uses: azure/setup-helm@v1 - with: - version: v3.5.3 - - - uses: actions/setup-python@v2 - if: ${{ matrix.app != '.gitkee' }} - with: - python-version: 3.7 - - - name: Set up chart-testing - if: ${{ matrix.app != '.gitkee' }} - uses: helm/chart-testing-action@v2.0.1 + ## + # Chart-Testing Section + ## - name: Run chart-testing (lint) if: ${{ matrix.app != '.gitkee' }} @@ -199,7 +178,7 @@ jobs: run: ct install --config .github/ct-install.yaml --charts 'charts/${{ steps.prep-lint.outputs.train }}/${{ matrix.app }}' app-tests-complete: - needs: [app-tests, app-unit-tests] + needs: [app-tests] name: Apps Test Complete runs-on: ubuntu-latest steps: @@ -207,7 +186,7 @@ jobs: run: echo "App Tests Completed Successfully" pre-release: - needs: [app-tests, app-unit-tests] + needs: [app-tests] runs-on: ubuntu-latest outputs: release: ${{ steps.prep.outputs.release }} @@ -233,10 +212,8 @@ jobs: catalog-release: runs-on: ubuntu-latest needs: pre-release - if: needs.pre-release.outputs.release == 'true' container: image: ixsystems/catalog_validation:latest - steps: - uses: actions/checkout@v2 name: Checkout @@ -323,6 +300,7 @@ jobs: cd catalog /bin/bash -c "PWD=${pwd}; /usr/local/bin/catalog_validate validate --path $PWD" - name: Commit and Push new App releases + if: ${{ steps.pre-release.outputs.release == 'true' }} run: | cd catalog git config user.name "TrueCharts-Bot" diff --git a/charts/deprecated/nzbhydra/Chart.yaml b/charts/deprecated/nzbhydra/Chart.yaml index 4d18a33f0b1..70772c18c0a 100644 --- a/charts/deprecated/nzbhydra/Chart.yaml +++ b/charts/deprecated/nzbhydra/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: nzbhydra -version: 3.1.7 +version: 4.0.0 upstream_version: 5.3.1 appVersion: "auto" description: Usenet meta search @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: [] # annotations: diff --git a/charts/deprecated/nzbhydra/SCALE/questions.yaml b/charts/deprecated/nzbhydra/SCALE/questions.yaml index a620bab6782..f79377ad637 100644 --- a/charts/deprecated/nzbhydra/SCALE/questions.yaml +++ b/charts/deprecated/nzbhydra/SCALE/questions.yaml @@ -221,7 +221,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/deprecated/nzbhydra/values.yaml b/charts/deprecated/nzbhydra/values.yaml index 5baf1ad7705..bcf68a9c7c7 100644 --- a/charts/deprecated/nzbhydra/values.yaml +++ b/charts/deprecated/nzbhydra/values.yaml @@ -8,10 +8,11 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 5076 + ports: + main: + port: 5076 env: {} # TZ: UTC @@ -26,7 +27,7 @@ probes: failureThreshold: 5 httpGet: path: /actuator/health/livenessState - port: http + port: main initialDelaySeconds: 30 periodSeconds: 10 timeoutSeconds: 10 @@ -37,7 +38,7 @@ probes: failureThreshold: 5 httpGet: path: /actuator/health/readinessState - port: http + port: main initialDelaySeconds: 30 periodSeconds: 10 timeoutSeconds: 10 @@ -48,7 +49,7 @@ probes: failureThreshold: 5 httpGet: path: /actuator/health/readinessState - port: http + port: main initialDelaySeconds: 30 periodSeconds: 10 timeoutSeconds: 10 @@ -58,7 +59,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/appdaemon/Chart.yaml b/charts/incubator/appdaemon/Chart.yaml index 9b4e7336894..39e3baac776 100644 --- a/charts/incubator/appdaemon/Chart.yaml +++ b/charts/incubator/appdaemon/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: appdaemon -version: 0.1.4 +version: 1.0.0 appVersion: v4.0.8 description: AppDaemon is a loosely coupled, multithreaded, sandboxed python execution environment for writing automation apps for Home Assistant home automation software. It also provides a configurable dashboard (HADashboard) suitable for wall mounted tablets. type: application @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 maintainers: - name: TrueCharts email: info@truecharts.org diff --git a/charts/incubator/appdaemon/SCALE/questions.yaml b/charts/incubator/appdaemon/SCALE/questions.yaml index eae94631868..914ed862848 100644 --- a/charts/incubator/appdaemon/SCALE/questions.yaml +++ b/charts/incubator/appdaemon/SCALE/questions.yaml @@ -215,7 +215,7 @@ questions: required: true ## TrueCharts Specific - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/appdaemon/values.yaml b/charts/incubator/appdaemon/values.yaml index 031febf01d9..5b7d9738b8e 100644 --- a/charts/incubator/appdaemon/values.yaml +++ b/charts/incubator/appdaemon/values.yaml @@ -21,19 +21,21 @@ env: ELEVATION: 1217 DASH_URL: "http://0.0.0.0:5050" -services: +service: main: - port: - port: 5050 + ports: + main: + port: 5050 tcp: enabled: true type: ClusterIP - port: - port: 51050 - protocol: TCP - targetPort: 51050 + ports: + tcp: + enabled: true + port: 51050 + protocol: TCP -customStorage: +hostPathMounts: - name: config enabled: true mountPath: /conf diff --git a/charts/incubator/bazarr/Chart.yaml b/charts/incubator/bazarr/Chart.yaml index 947fe1ae2dd..4f753bb0b50 100644 --- a/charts/incubator/bazarr/Chart.yaml +++ b/charts/incubator/bazarr/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: bazarr -version: 3.1.7 +version: 4.0.0 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 @@ -24,7 +24,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/bazarr/SCALE/questions.yaml b/charts/incubator/bazarr/SCALE/questions.yaml index 3ed159455b4..469f7241654 100644 --- a/charts/incubator/bazarr/SCALE/questions.yaml +++ b/charts/incubator/bazarr/SCALE/questions.yaml @@ -221,7 +221,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/bazarr/values.yaml b/charts/incubator/bazarr/values.yaml index 73afc5b9931..b402a888cea 100644 --- a/charts/incubator/bazarr/values.yaml +++ b/charts/incubator/bazarr/values.yaml @@ -8,10 +8,11 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 6767 + ports: + main: + port: 6767 env: {} # TZ: UTC @@ -22,7 +23,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/calibre-web/Chart.yaml b/charts/incubator/calibre-web/Chart.yaml index 8f0015f206b..5dc23b04622 100644 --- a/charts/incubator/calibre-web/Chart.yaml +++ b/charts/incubator/calibre-web/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: calibre-web -version: 3.1.6 +version: 4.0.0 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. @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/calibre-web/SCALE/questions.yaml b/charts/incubator/calibre-web/SCALE/questions.yaml index 9039761f6a2..7794744cb58 100644 --- a/charts/incubator/calibre-web/SCALE/questions.yaml +++ b/charts/incubator/calibre-web/SCALE/questions.yaml @@ -220,7 +220,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/calibre-web/values.yaml b/charts/incubator/calibre-web/values.yaml index 5e2636af9e7..79415093c51 100644 --- a/charts/incubator/calibre-web/values.yaml +++ b/charts/incubator/calibre-web/values.yaml @@ -15,10 +15,11 @@ podSecurityContext: runAsGroup: 0 fsGroup: 0 -services: +service: main: - port: - port: 8083 + ports: + main: + port: 8083 env: {} # TZ: @@ -31,7 +32,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/deluge/Chart.yaml b/charts/incubator/deluge/Chart.yaml index 0797da7b3ad..3884f7dc4f1 100644 --- a/charts/incubator/deluge/Chart.yaml +++ b/charts/incubator/deluge/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: deluge -version: 3.1.6 +version: 4.0.0 # upstream_version: appVersion: "auto" description: Deluge App for TrueNAS SCALE @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/deluge/SCALE/questions.yaml b/charts/incubator/deluge/SCALE/questions.yaml index d4db5c6ef24..e0dd3e505e3 100644 --- a/charts/incubator/deluge/SCALE/questions.yaml +++ b/charts/incubator/deluge/SCALE/questions.yaml @@ -149,7 +149,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/deluge/values.yaml b/charts/incubator/deluge/values.yaml index 127213f2464..b0ddfc33d5f 100644 --- a/charts/incubator/deluge/values.yaml +++ b/charts/incubator/deluge/values.yaml @@ -15,30 +15,31 @@ podSecurityContext: runAsGroup: 0 fsGroup: 0 -services: +service: main: - port: - port: 8112 - tcp: + ports: + main: + port: 8112 + torrent: enabled: true type: ClusterIP - port: - port: 51413 - protocol: TCP - targetPort: 51413 - udp: - enabled: true - type: ClusterIP - port: - port: 51413 - protocol: UDP - targetPort: 51413 + ports: + tcp: + enabled: true + port: 51413 + protocol: TCP + udp: + enabled: true + port: 51413 + protocol: UDP + persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/fireflyiii/Chart.yaml b/charts/incubator/fireflyiii/Chart.yaml index 0d26f685086..8c8aa79594c 100644 --- a/charts/incubator/fireflyiii/Chart.yaml +++ b/charts/incubator/fireflyiii/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: fireflyiii -version: 1.0.2 +version: 2.0.2 appVersion: "auto" description: A free and open source personal finance manager type: application @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 - name: postgresql version: 10.4.3 repository: https://charts.bitnami.com/bitnami diff --git a/charts/incubator/fireflyiii/SCALE/questions.yaml b/charts/incubator/fireflyiii/SCALE/questions.yaml index f2ebe1aa1e0..8a46f4e8a93 100644 --- a/charts/incubator/fireflyiii/SCALE/questions.yaml +++ b/charts/incubator/fireflyiii/SCALE/questions.yaml @@ -347,7 +347,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/fireflyiii/templates/secrets.yaml b/charts/incubator/fireflyiii/templates/secrets.yaml index 2227b0eb37a..5d262741617 100644 --- a/charts/incubator/fireflyiii/templates/secrets.yaml +++ b/charts/incubator/fireflyiii/templates/secrets.yaml @@ -1,8 +1,6 @@ apiVersion: v1 kind: Secret metadata: - labels: - {{- include "common.labels" . | nindent 4 }} name: dbcreds {{- $previous := lookup "v1" "Secret" .Release.Namespace "dbcreds" }} {{- $dbPass := "" }} diff --git a/charts/incubator/fireflyiii/values.yaml b/charts/incubator/fireflyiii/values.yaml index 7c5ca26703d..d9c1c780cb5 100644 --- a/charts/incubator/fireflyiii/values.yaml +++ b/charts/incubator/fireflyiii/values.yaml @@ -1,4 +1,4 @@ -# Default values for Bitwarden. +# Default values for fireflyIII. image: repository: jc5x/firefly-iii @@ -14,17 +14,19 @@ podSecurityContext: runAsGroup: 0 fsGroup: 0 -services: +service: main: - port: - port: 8080 + ports: + main: + port: 8080 tcp: enabled: true type: ClusterIP - port: - port: 51080 - protocol: TCP - targetPort: 51080 + ports: + tcp: + enabled: true + port: 51080 + protocol: TCP env: DB_USERNAME: firefly @@ -47,20 +49,23 @@ persistence: data: enabled: true mountPath: "/var/www/html/storage/upload" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" db: nameOverride: "db" enabled: true - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" dbbackup: enabled: true - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/freshrss/Chart.yaml b/charts/incubator/freshrss/Chart.yaml index fd7630e8ce2..dcd5baff67a 100644 --- a/charts/incubator/freshrss/Chart.yaml +++ b/charts/incubator/freshrss/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: freshrss -version: 3.1.6 +version: 4.0.0 upstream_version: 2.3.1 appVersion: "auto" description: FreshRSS is a self-hosted RSS feed aggregator @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/freshrss/SCALE/questions.yaml b/charts/incubator/freshrss/SCALE/questions.yaml index ffb0a95de0e..daa2d01503b 100644 --- a/charts/incubator/freshrss/SCALE/questions.yaml +++ b/charts/incubator/freshrss/SCALE/questions.yaml @@ -222,7 +222,7 @@ questions: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/freshrss/values.yaml b/charts/incubator/freshrss/values.yaml index 4c31242e4bb..f0a86a9284d 100644 --- a/charts/incubator/freshrss/values.yaml +++ b/charts/incubator/freshrss/values.yaml @@ -15,10 +15,11 @@ podSecurityContext: runAsGroup: 0 fsGroup: 0 -services: +service: main: - port: - port: 80 + ports: + main: + port: 80 env: {} # TZ: UTC @@ -29,7 +30,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/gaps/Chart.yaml b/charts/incubator/gaps/Chart.yaml index 243b41cf826..e0a7c7548d6 100644 --- a/charts/incubator/gaps/Chart.yaml +++ b/charts/incubator/gaps/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: gaps -version: 3.1.6 +version: 4.0.0 upstream_version: 1.1.1 appVersion: "auto" description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/gaps/SCALE/questions.yaml b/charts/incubator/gaps/SCALE/questions.yaml index 7447b50559d..c12954889d2 100644 --- a/charts/incubator/gaps/SCALE/questions.yaml +++ b/charts/incubator/gaps/SCALE/questions.yaml @@ -222,7 +222,7 @@ questions: default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/gaps/values.yaml b/charts/incubator/gaps/values.yaml index ed003b80129..8f8e194b1e6 100644 --- a/charts/incubator/gaps/values.yaml +++ b/charts/incubator/gaps/values.yaml @@ -8,10 +8,11 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 8484 + ports: + main: + port: 8484 env: {} # TZ: UTC @@ -20,7 +21,8 @@ persistence: data: enabled: true mountPath: "/usr/data" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/grocy/Chart.yaml b/charts/incubator/grocy/Chart.yaml index 31a3a618b10..4533a256f2f 100644 --- a/charts/incubator/grocy/Chart.yaml +++ b/charts/incubator/grocy/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: grocy -version: 3.1.6 +version: 4.0.0 upstream_version: 4.3.1 appVersion: "auto" description: ERP beyond your fridge - grocy is a web-based self-hosted groceries & household management solution for your home @@ -18,7 +18,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/grocy/SCALE/questions.yaml b/charts/incubator/grocy/SCALE/questions.yaml index a0354443e39..a5eb28f5404 100644 --- a/charts/incubator/grocy/SCALE/questions.yaml +++ b/charts/incubator/grocy/SCALE/questions.yaml @@ -220,7 +220,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/grocy/values.yaml b/charts/incubator/grocy/values.yaml index a6a2a176916..4c23b96081d 100644 --- a/charts/incubator/grocy/values.yaml +++ b/charts/incubator/grocy/values.yaml @@ -15,10 +15,11 @@ podSecurityContext: runAsGroup: 0 fsGroup: 0 -services: +service: main: - port: - port: 80 + ports: + main: + port: 80 env: {} # TZ: @@ -29,7 +30,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/heimdall/Chart.yaml b/charts/incubator/heimdall/Chart.yaml index 0659b1fae11..fe1be1acfab 100644 --- a/charts/incubator/heimdall/Chart.yaml +++ b/charts/incubator/heimdall/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: heimdall -version: 3.1.6 +version: 4.0.0 upstream_version: 4.1.1 appVersion: "auto" description: An Application dashboard and launcher @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/heimdall/SCALE/questions.yaml b/charts/incubator/heimdall/SCALE/questions.yaml index 581817325e0..13b2d038c7d 100644 --- a/charts/incubator/heimdall/SCALE/questions.yaml +++ b/charts/incubator/heimdall/SCALE/questions.yaml @@ -221,7 +221,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/heimdall/values.yaml b/charts/incubator/heimdall/values.yaml index ae76faf7353..54a57efc7c9 100644 --- a/charts/incubator/heimdall/values.yaml +++ b/charts/incubator/heimdall/values.yaml @@ -15,10 +15,11 @@ podSecurityContext: runAsGroup: 0 fsGroup: 0 -services: +service: main: - port: - port: 80 + ports: + main: + port: 80 env: {} # TZ: @@ -33,7 +34,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/lazylibrarian/Chart.yaml b/charts/incubator/lazylibrarian/Chart.yaml index cd5d5554cb4..39fcc67d1fd 100644 --- a/charts/incubator/lazylibrarian/Chart.yaml +++ b/charts/incubator/lazylibrarian/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: lazylibrarian -version: 3.1.6 +version: 4.0.0 upstream_version: 2.1.0 appVersion: "latest" description: Get all your books, like series with Sonarr... @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/lazylibrarian/SCALE/questions.yaml b/charts/incubator/lazylibrarian/SCALE/questions.yaml index 248cf4c910c..07284e32de8 100644 --- a/charts/incubator/lazylibrarian/SCALE/questions.yaml +++ b/charts/incubator/lazylibrarian/SCALE/questions.yaml @@ -222,7 +222,7 @@ questions: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/lazylibrarian/values.yaml b/charts/incubator/lazylibrarian/values.yaml index 23d51564417..4c1b4d126c4 100644 --- a/charts/incubator/lazylibrarian/values.yaml +++ b/charts/incubator/lazylibrarian/values.yaml @@ -15,10 +15,11 @@ podSecurityContext: runAsGroup: 0 fsGroup: 0 -services: +service: main: - port: - port: 5299 + ports: + main: + port: 5299 env: {} # TZ: UTC @@ -29,7 +30,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/lychee/Chart.yaml b/charts/incubator/lychee/Chart.yaml index c5ce3a0f6d8..46aa847ed41 100644 --- a/charts/incubator/lychee/Chart.yaml +++ b/charts/incubator/lychee/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: lychee -version: 3.1.6 +version: 4.0.0 upstream_version: 2.3.1 appVersion: "auto" description: Lychee is a free photo-management tool, which runs on your server or web-space @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/lychee/SCALE/questions.yaml b/charts/incubator/lychee/SCALE/questions.yaml index 53e656bbf90..b25a085a456 100644 --- a/charts/incubator/lychee/SCALE/questions.yaml +++ b/charts/incubator/lychee/SCALE/questions.yaml @@ -221,7 +221,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/lychee/values.yaml b/charts/incubator/lychee/values.yaml index d333576fd38..2ef4320a969 100644 --- a/charts/incubator/lychee/values.yaml +++ b/charts/incubator/lychee/values.yaml @@ -15,10 +15,11 @@ podSecurityContext: runAsGroup: 0 fsGroup: 0 -services: +service: main: - port: - port: 80 + ports: + main: + port: 80 env: {} # PHP_TZ: UTC @@ -29,7 +30,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/navidrome/Chart.yaml b/charts/incubator/navidrome/Chart.yaml index 066609e8d1b..9c347c1a888 100644 --- a/charts/incubator/navidrome/Chart.yaml +++ b/charts/incubator/navidrome/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: navidrome -version: 3.1.6 +version: 4.0.0 upstream_version: 2.3.1 appVersion: "auto" description: Navidrome is an open source web-based music collection server and streamer @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/navidrome/SCALE/questions.yaml b/charts/incubator/navidrome/SCALE/questions.yaml index 8758663bce0..f5601c5518f 100644 --- a/charts/incubator/navidrome/SCALE/questions.yaml +++ b/charts/incubator/navidrome/SCALE/questions.yaml @@ -221,7 +221,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/navidrome/values.yaml b/charts/incubator/navidrome/values.yaml index 2446a844f64..574d19e5a55 100644 --- a/charts/incubator/navidrome/values.yaml +++ b/charts/incubator/navidrome/values.yaml @@ -8,10 +8,11 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 4533 + ports: + main: + port: 4533 env: ND_SCANINTERVAL: "15m" @@ -24,7 +25,8 @@ persistence: data: enabled: true mountPath: "/data" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/node-red/Chart.yaml b/charts/incubator/node-red/Chart.yaml index 5192c9e04e6..92e1e393e92 100644 --- a/charts/incubator/node-red/Chart.yaml +++ b/charts/incubator/node-red/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: node-red -version: 3.1.6 +version: 4.0.0 upstream_version: 5.2.1 appVersion: "auto" description: Node-RED is low-code programming for event-driven applications @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/node-red/SCALE/questions.yaml b/charts/incubator/node-red/SCALE/questions.yaml index eb29b285f07..d5b9a6f4822 100644 --- a/charts/incubator/node-red/SCALE/questions.yaml +++ b/charts/incubator/node-red/SCALE/questions.yaml @@ -221,7 +221,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/node-red/values.yaml b/charts/incubator/node-red/values.yaml index 4339f588fc5..c211e7ebf61 100644 --- a/charts/incubator/node-red/values.yaml +++ b/charts/incubator/node-red/values.yaml @@ -17,16 +17,18 @@ env: {} # NODE_RED_ENABLE_SAFE_MODE: # FLOWS: -services: +service: main: - port: - port: 1880 + ports: + main: + port: 1880 persistence: data: enabled: true mountPath: "/data" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/nzbget/Chart.yaml b/charts/incubator/nzbget/Chart.yaml index 05a3cf88a9b..f527d53741d 100644 --- a/charts/incubator/nzbget/Chart.yaml +++ b/charts/incubator/nzbget/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: nzbget -version: 3.1.6 +version: 4.0.0 upstream_version: 7.3.1 appVersion: "auto" description: NZBGet is a Usenet downloader client @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/nzbget/SCALE/questions.yaml b/charts/incubator/nzbget/SCALE/questions.yaml index 842b21e7381..85010f5d717 100644 --- a/charts/incubator/nzbget/SCALE/questions.yaml +++ b/charts/incubator/nzbget/SCALE/questions.yaml @@ -221,7 +221,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/nzbget/values.yaml b/charts/incubator/nzbget/values.yaml index 212877c5f1d..36301618ece 100644 --- a/charts/incubator/nzbget/values.yaml +++ b/charts/incubator/nzbget/values.yaml @@ -8,16 +8,18 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 6789 + ports: + main: + port: 6789 persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/organizr/Chart.yaml b/charts/incubator/organizr/Chart.yaml index 2080299380a..3f217bee621 100644 --- a/charts/incubator/organizr/Chart.yaml +++ b/charts/incubator/organizr/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: organizr -version: 3.1.6 +version: 4.0.0 upstream_version: 3.2.1 appVersion: "latest" description: HTPC/Homelab Services Organizer @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/organizr/SCALE/questions.yaml b/charts/incubator/organizr/SCALE/questions.yaml index 3505123038f..1f01a33b628 100644 --- a/charts/incubator/organizr/SCALE/questions.yaml +++ b/charts/incubator/organizr/SCALE/questions.yaml @@ -273,7 +273,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/organizr/values.yaml b/charts/incubator/organizr/values.yaml index c784dfb75e7..4ccff62bf14 100644 --- a/charts/incubator/organizr/values.yaml +++ b/charts/incubator/organizr/values.yaml @@ -15,10 +15,11 @@ podSecurityContext: runAsGroup: 0 fsGroup: 0 -services: +service: main: - port: - port: 80 + ports: + main: + port: 80 env: {} # TZ: UTC @@ -29,7 +30,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/podgrab/Chart.yaml b/charts/incubator/podgrab/Chart.yaml index b8520b9ff34..8417e82b0cd 100644 --- a/charts/incubator/podgrab/Chart.yaml +++ b/charts/incubator/podgrab/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: podgrab -version: 1.0.4 +version: 2.0.0 upstream_version: 1.0.0 appVersion: "latest" description: A self-hosted podcast manager to download episodes as soon as they become live. @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 maintainers: - name: TrueCharts email: info@truecharts.org diff --git a/charts/incubator/podgrab/SCALE/questions.yaml b/charts/incubator/podgrab/SCALE/questions.yaml index 023e9e17ad7..41f89e33092 100644 --- a/charts/incubator/podgrab/SCALE/questions.yaml +++ b/charts/incubator/podgrab/SCALE/questions.yaml @@ -245,7 +245,7 @@ questions: type: string default: "1Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/podgrab/values.yaml b/charts/incubator/podgrab/values.yaml index 6982fed0a46..95a7869a7e1 100644 --- a/charts/incubator/podgrab/values.yaml +++ b/charts/incubator/podgrab/values.yaml @@ -15,17 +15,19 @@ podSecurityContext: runAsGroup: 568 fsGroup: 568 -services: +service: main: - port: - port: 8080 + ports: + main: + port: 8080 tcp: enabled: true type: ClusterIP - port: - port: 51080 - protocol: TCP - targetPort: 51080 + ports: + tcp: + enabled: true + port: 51080 + protocol: TCP env: PASSWORD: secretpasswordgoeshere @@ -35,12 +37,13 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" -customStorage: +hostPathMounts: - name: assets enabled: true mountPath: "/assets" diff --git a/charts/incubator/qbittorrent/Chart.yaml b/charts/incubator/qbittorrent/Chart.yaml index 2d016185c60..7880e80e728 100644 --- a/charts/incubator/qbittorrent/Chart.yaml +++ b/charts/incubator/qbittorrent/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: qbittorrent -version: 3.1.6 +version: 4.0.0 upstream_version: 7.2.1 appVersion: "auto" description: qBittorrent is a cross-platform free and open-source BitTorrent client @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/qbittorrent/SCALE/questions.yaml b/charts/incubator/qbittorrent/SCALE/questions.yaml index d2494a1b011..dff064e6bf0 100644 --- a/charts/incubator/qbittorrent/SCALE/questions.yaml +++ b/charts/incubator/qbittorrent/SCALE/questions.yaml @@ -348,7 +348,7 @@ questions: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/qbittorrent/templates/configmap.yaml b/charts/incubator/qbittorrent/templates/_configmap.tpl similarity index 58% rename from charts/incubator/qbittorrent/templates/configmap.yaml rename to charts/incubator/qbittorrent/templates/_configmap.tpl index f8549d96fc0..d52c601514c 100644 --- a/charts/incubator/qbittorrent/templates/configmap.yaml +++ b/charts/incubator/qbittorrent/templates/_configmap.tpl @@ -1,21 +1,7 @@ -## -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# `SPDX-License-Identifier: Apache-2.0` -# -# This file is considered to be modified by the TrueCharts Project. -## +{{/* Define the configmap */}} +{{- define "qbittorrent.configmap" -}} +--- apiVersion: v1 kind: ConfigMap metadata: @@ -24,7 +10,7 @@ metadata: {{- include "common.labels" . | nindent 4 }} data: {{- $bittorrentPort := "" -}} - {{- $bittorrentPort = .Values.services.tcp.port.port -}} + {{- $bittorrentPort = .Values.service.torrent.ports.tcp.port -}} {{- if $bittorrentPort }} 31-update-port: |- #!/bin/bash @@ -43,3 +29,4 @@ data: fi fi {{- end }} +{{- end -}} diff --git a/charts/incubator/qbittorrent/templates/common.yaml b/charts/incubator/qbittorrent/templates/common.yaml index a6613c2ce21..bcb4715aa18 100644 --- a/charts/incubator/qbittorrent/templates/common.yaml +++ b/charts/incubator/qbittorrent/templates/common.yaml @@ -1 +1,6 @@ +{{/* Render the templates */}} {{ include "common.all" . }} + + +{{/* Render the configmap */}} +{{ include "qbittorrent.configmap" . }} diff --git a/charts/incubator/qbittorrent/values.yaml b/charts/incubator/qbittorrent/values.yaml index 02e101f8e44..5458be87365 100644 --- a/charts/incubator/qbittorrent/values.yaml +++ b/charts/incubator/qbittorrent/values.yaml @@ -14,31 +14,30 @@ env: {} # PGID: 1001 # UMASK: 022 -services: +service: main: - port: - port: 8080 - tcp: + ports: + main: + port: 8080 + torrent: enabled: true type: ClusterIP - port: - port: 6881 - protocol: TCP - targetPort: 51413 - udp: - enabled: true - type: ClusterIP - port: - port: 6881 - protocol: UDP - targetPort: 51413 - + ports: + tcp: + enabled: true + port: 6881 + protocol: TCP + udp: + enabled: true + port: 6881 + protocol: UDP persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" @@ -54,7 +53,3 @@ additionalVolumes: additionalVolumeMounts: - mountPath: /config/custom-cont-init.d name: qbittorrent-scripts - - -appAdditionalServicesEnabled: true -appAdditionalServices: diff --git a/charts/incubator/readarr/Chart.yaml b/charts/incubator/readarr/Chart.yaml index 4ef769b61cb..7d4e01010d4 100644 --- a/charts/incubator/readarr/Chart.yaml +++ b/charts/incubator/readarr/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: readarr -version: 3.1.6 +version: 4.0.0 upstream_version: 2.1.0 appVersion: "auto" description: A fork of Radarr to work with Books & AudioBooks @@ -23,7 +23,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/readarr/SCALE/questions.yaml b/charts/incubator/readarr/SCALE/questions.yaml index 840fe89a298..83303799858 100644 --- a/charts/incubator/readarr/SCALE/questions.yaml +++ b/charts/incubator/readarr/SCALE/questions.yaml @@ -221,7 +221,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/readarr/values.yaml b/charts/incubator/readarr/values.yaml index 09676bb4b4c..44982d0113c 100644 --- a/charts/incubator/readarr/values.yaml +++ b/charts/incubator/readarr/values.yaml @@ -8,10 +8,11 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 8787 + ports: + main: + port: 8787 env: {} # TZ: UTC @@ -43,7 +44,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/sabnzbd/Chart.yaml b/charts/incubator/sabnzbd/Chart.yaml index 8f204efe9e3..e7d2429d53a 100644 --- a/charts/incubator/sabnzbd/Chart.yaml +++ b/charts/incubator/sabnzbd/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: sabnzbd -version: 3.1.6 +version: 4.0.0 upstream_version: 5.0.1 appVersion: "auto" description: Free and easy binary newsreader @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/sabnzbd/SCALE/questions.yaml b/charts/incubator/sabnzbd/SCALE/questions.yaml index d47bf0592df..73d64929e0b 100644 --- a/charts/incubator/sabnzbd/SCALE/questions.yaml +++ b/charts/incubator/sabnzbd/SCALE/questions.yaml @@ -237,7 +237,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/sabnzbd/values.yaml b/charts/incubator/sabnzbd/values.yaml index b5ccdd612ae..314240a80f0 100644 --- a/charts/incubator/sabnzbd/values.yaml +++ b/charts/incubator/sabnzbd/values.yaml @@ -8,10 +8,11 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 8080 + ports: + main: + port: 8080 env: {} # TZ: UTC @@ -22,7 +23,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/tvheadend/Chart.yaml b/charts/incubator/tvheadend/Chart.yaml index ecebf1acb1c..fcb8fb015e8 100644 --- a/charts/incubator/tvheadend/Chart.yaml +++ b/charts/incubator/tvheadend/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: tvheadend -version: 4.1.6 +version: 5.0.0 upstream_version: 1.1.2 appVersion: "latest" description: TVheadend - a TV streaming server and digital video recorder @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/tvheadend/SCALE/questions.yaml b/charts/incubator/tvheadend/SCALE/questions.yaml index 5a869bcc9df..b293ef126cc 100644 --- a/charts/incubator/tvheadend/SCALE/questions.yaml +++ b/charts/incubator/tvheadend/SCALE/questions.yaml @@ -263,7 +263,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/tvheadend/values.yaml b/charts/incubator/tvheadend/values.yaml index 4d5ca71d069..2607534d9d8 100644 --- a/charts/incubator/tvheadend/values.yaml +++ b/charts/incubator/tvheadend/values.yaml @@ -22,23 +22,26 @@ env: {} # TZ: Europe/London # RUN_OPTS: -services: +service: main: - port: - port: 9981 + ports: + main: + port: 9981 htsp: enabled: true type: ClusterIP - port: - port: 9982 - protocol: TCP - targetPort: 9982 + ports: + htsp: + enabled: true + port: 9982 + protocol: TCP persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/incubator/unifi/Chart.yaml b/charts/incubator/unifi/Chart.yaml index 6397b66982b..11712846e9b 100644 --- a/charts/incubator/unifi/Chart.yaml +++ b/charts/incubator/unifi/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: unifi -version: 3.1.6 +version: 4.0.0 upstream_version: 1.5.1 appVersion: "auto" description: Ubiquiti Network's Unifi Controller @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/unifi/SCALE/ix_values.yaml b/charts/incubator/unifi/SCALE/ix_values.yaml index a7c2aa22ea3..44a5d83c850 100644 --- a/charts/incubator/unifi/SCALE/ix_values.yaml +++ b/charts/incubator/unifi/SCALE/ix_values.yaml @@ -12,8 +12,8 @@ image: envTpl: # Permissions Settings - UNIFI_GID: "{{ .Values.PUID }}" - UNIFI_UID: "{{ .Values.PGID }}" + UNIFI_GID: "568" + UNIFI_UID: "568" ## # Most other defaults are set in questions.yaml diff --git a/charts/incubator/unifi/SCALE/questions.yaml b/charts/incubator/unifi/SCALE/questions.yaml index 9b32989224e..3e55996d9bd 100644 --- a/charts/incubator/unifi/SCALE/questions.yaml +++ b/charts/incubator/unifi/SCALE/questions.yaml @@ -348,7 +348,7 @@ questions: default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/incubator/unifi/values.yaml b/charts/incubator/unifi/values.yaml index b89890317e2..28f58e8d137 100644 --- a/charts/incubator/unifi/values.yaml +++ b/charts/incubator/unifi/values.yaml @@ -17,27 +17,26 @@ podSecurityContext: envTpl: # Permissions Settings - UNIFI_GID: "{{ .Values.PUID }}" - UNIFI_UID: "{{ .Values.PGID }}" + UNIFI_GID: "568" + UNIFI_UID: "568" -services: +service: main: - port: - port: 8443 - tcp: + ports: + main: + port: 8443 + conn: enabled: true type: ClusterIP - port: - port: 8080 - protocol: TCP - targetPort: 8080 - udp: - enabled: true - type: ClusterIP - port: - port: 3478 - protocol: UDP - targetPort: 3478 + ports: + http: + enabled: true + port: 8080 + protocol: TCP + stun: + enabled: true + port: 3478 + protocol: UDP env: {} # TZ: @@ -48,7 +47,8 @@ persistence: config: enabled: true mountPath: "/unifi" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/library/common-test/values.yaml b/charts/library/common-test/values.yaml index f12e55c316f..5146a18c6a5 100644 --- a/charts/library/common-test/values.yaml +++ b/charts/library/common-test/values.yaml @@ -3,7 +3,8 @@ image: tag: latest pullPolicy: IfNotPresent -services: +service: main: - port: - port: 8080 + ports: + main: + port: 8080 diff --git a/charts/library/common/values.yaml b/charts/library/common/values.yaml index 5e5c87dbfd3..1f49f5d113b 100644 --- a/charts/library/common/values.yaml +++ b/charts/library/common/values.yaml @@ -236,7 +236,7 @@ service: # -- Port protocol. # Support values are `HTTP`, `HTTPS`, `TCP` and `UDP`. # HTTPS and HTTPS spawn a TCP service and get used for internal URL and name generation - protocol: HTTP + protocol: HTTP # -- Specify a service targetPort if you wish to differ the service port from the application port. # If `targetPort` is specified, this port number is used in the container definition instead of @@ -412,239 +412,3 @@ resources: {} # requests: # cpu: 100m # memory: 128Mi - -# -- The common chart supports several add-ons. These can be configured under this key. -# @default -- See below -addons: - - # -- The common chart supports adding a VPN add-on. It can be configured under this key. - # For more info, check out [our docs](http://docs.k8s-at-home.com/our-helm-charts/common-library-add-ons/#wireguard-vpn) - # @default -- See values.yaml - vpn: - # -- Enable running a VPN in the pod to route traffic through a VPN - enabled: false - - # -- Specify the VPN type. Valid options are openvpn or wireguard - type: openvpn - - # -- OpenVPN specific configuration - # @default -- See below - openvpn: - image: - # -- Specify the openvpn client image - repository: dperson/openvpn-client - # -- Specify the openvpn client image tag - tag: latest - # -- Specify the openvpn client image pull policy - pullPolicy: IfNotPresent - - # -- Credentials to connect to the VPN Service (used with -a) - auth: # "user;password" - # -- Optionally specify an existing secret that contains the credentials. - # Credentials should be stored under the `VPN_AUTH` key - authSecret: # my-vpn-secret - - # -- WireGuard specific configuration - # @default -- See below - wireguard: - image: - # -- Specify the WireGuard image - repository: docker pull ghcr.io/k8s-at-home/wireguard - # -- Specify the WireGuard image tag - tag: v1.0.20210424 - # -- Specify the WireGuard image pull policy - pullPolicy: IfNotPresent - - # -- Set the VPN container securityContext - # @default -- See values.yaml - securityContext: - capabilities: - add: - - NET_ADMIN - - SYS_MODULE - - # -- All variables specified here will be added to the vpn sidecar container - # See the documentation of the VPN image for all config values - env: {} - # TZ: UTC - - # -- Provide a customized vpn configuration file to be used by the VPN. - configFile: # |- - # Some Example Config - # remote greatvpnhost.com 8888 - # auth-user-pass - # Cipher AES - - # -- Reference an existing secret that contains the VPN configuration file - # The chart expects it to be present under the `vpnConfigfile` key. - configFileSecret: - - # -- Provide custom up/down scripts that can be used by the vpn configuration. - # @default -- See values.yaml - scripts: - up: # |- - # #!/bin/bash - # echo "connected" > /shared/vpnstatus - down: # |- - # #!/bin/bash - # echo "disconnected" > /shared/vpnstatus - - additionalVolumeMounts: [] - - # -- Optionally specify a livenessProbe, e.g. to check if the connection is still - # being protected by the VPN - livenessProbe: {} - # exec: - # command: - # - sh - # - -c - # - if [ $(curl -s https://ipinfo.io/country) == 'US' ]; then exit 0; else exit $?; fi - # initialDelaySeconds: 30 - # periodSeconds: 60 - # failureThreshold: 1 - - # If set to true, will deploy a network policy that blocks all outbound - # traffic except traffic specified as allowed - networkPolicy: - enabled: false - - # The egress configuration for your network policy, All outbound traffic - # From the pod will be blocked unless specified here. Your cluster must - # have a CNI that supports network policies (Canal, Calico, etc...) - # https://kubernetes.io/docs/concepts/services-networking/network-policies/ - # https://github.com/ahmetb/kubernetes-network-policy-recipes - egress: - # - to: - # - ipBlock: - # cidr: 0.0.0.0/0 - # ports: - # - port: 53 - # protocol: UDP - # - port: 53 - # protocol: TCP - - # -- The common library supports adding a code-server add-on to access files. It can be configured under this key. - # For more info, check out [our docs](http://docs.k8s-at-home.com/our-helm-charts/common-library-add-ons/#code-server) - # @default -- See values.yaml - codeserver: - # -- Enable running a code-server container in the pod - enabled: false - - image: - # -- Specify the code-server image - repository: codercom/code-server - # -- Specify the code-server image tag - tag: 3.9.2 - # -- Specify the code-server image pull policy - pullPolicy: IfNotPresent - - # -- Set any environment variables for code-server here - env: {} - # TZ: UTC - - # -- Set codeserver command line arguments. - # Consider setting --user-data-dir to a persistent location to preserve code-server setting changes - args: - - --auth - - none - # - --user-data-dir - # - "/config/.vscode" - - # -- Specify a list of volumes that get mounted in the code-server container. - # At least 1 volumeMount is required! - volumeMounts: [] - # - name: config - # mountPath: /data/config - - # -- Specify the working dir that will be opened when code-server starts - # If not given, the app will default to the mountpah of the first specified volumeMount - workingDir: "" - - # -- Optionally allow access a Git repository by passing in a private SSH key - # @default -- See below - git: - # -- Raw SSH private key - deployKey: "" - # -- Base64-encoded SSH private key. When both variables are set, the raw SSH key takes precedence. - deployKeyBase64: "" - # -- Existing secret containing SSH private key - # The chart expects it to be present under the `id_rsa` key. - deployKeySecret: "" - - service: - # -- Enable a service for the code-server add-on. - enabled: true - type: ClusterIP - # Specify the default port information - ports: - codeserver: - port: 12321 - enabled: true - protocol: TCP - targetPort: codeserver - ## Specify the nodePort value for the LoadBalancer and NodePort service types. - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport - ## - # nodePort: - annotations: {} - labels: {} - - ingress: - # -- Enable an ingress for the code-server add-on. - enabled: false - nameOverride: codeserver - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - labels: {} - hosts: - - host: code.chart-example.local - paths: - - path: / - # Ignored if not kubeVersion >= 1.14-0 - pathType: Prefix - tls: [] - # - secretName: chart-example-tls - # hosts: - # - code.chart-example.local - - securityContext: - runAsUser: 0 - - # -- The common library supports adding a promtail add-on to to access logs and ship them to loki. It can be configured under this key. - # @default -- See values.yaml - promtail: - # -- Enable running a promtail container in the pod - enabled: false - - image: - # -- Specify the promtail image - repository: grafana/promtail - # -- Specify the promtail image tag - tag: 2.2.0 - # -- Specify the promtail image pull policy - pullPolicy: IfNotPresent - - # -- Set any environment variables for promtail here - env: {} - - # -- Set promtail command line arguments - args: [] - - # -- The URL to Loki - loki: "" - - # -- The paths to logs on the volume - logs: [] - # - name: log - # path: /config/logs/*.log - - # -- Specify a list of volumes that get mounted in the promtail container. - # At least 1 volumeMount is required! - volumeMounts: [] - # - name: config - # mountPath: /config - # readOnly: true - - securityContext: - runAsUser: 0 diff --git a/charts/stable/bitwarden/Chart.yaml b/charts/stable/bitwarden/Chart.yaml index 6f6711d5bf5..7f5e4ad30fc 100644 --- a/charts/stable/bitwarden/Chart.yaml +++ b/charts/stable/bitwarden/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: bitwarden -version: 1.2.6 +version: 2.0.0 upstream_version: 2.1.5 appVersion: "auto" description: Unofficial Bitwarden compatible server written in Rust @@ -22,7 +22,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: - name: postgresql version: 10.4.3 diff --git a/charts/stable/bitwarden/SCALE/questions.yaml b/charts/stable/bitwarden/SCALE/questions.yaml index 8c1d61d48ea..089138c86d3 100644 --- a/charts/stable/bitwarden/SCALE/questions.yaml +++ b/charts/stable/bitwarden/SCALE/questions.yaml @@ -692,7 +692,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/bitwarden/templates/configmap.yaml b/charts/stable/bitwarden/templates/_configmap.tpl similarity index 98% rename from charts/stable/bitwarden/templates/configmap.yaml rename to charts/stable/bitwarden/templates/_configmap.tpl index 074f8237e6a..f41708c8a5b 100644 --- a/charts/stable/bitwarden/templates/configmap.yaml +++ b/charts/stable/bitwarden/templates/_configmap.tpl @@ -1,9 +1,10 @@ +{{/* Define the configmap */}} +{{- define "bitwarden.configmap" -}} +--- apiVersion: v1 kind: ConfigMap metadata: name: bitwardenconfig - labels: - {{- include "common.labels" . | nindent 4 }} data: ROCKET_PORT: "8080" SIGNUPS_ALLOWED: {{ .Values.bitwardenrs.allowSignups | quote }} @@ -112,3 +113,4 @@ data: {{- else }} ENABLE_DB_WAL: "false" {{- end }} +{{- end -}} diff --git a/charts/stable/bitwarden/templates/secrets.yaml b/charts/stable/bitwarden/templates/_secrets.tpl similarity index 96% rename from charts/stable/bitwarden/templates/secrets.yaml rename to charts/stable/bitwarden/templates/_secrets.tpl index e8e0dcc3e0b..b4aef3556b7 100644 --- a/charts/stable/bitwarden/templates/secrets.yaml +++ b/charts/stable/bitwarden/templates/_secrets.tpl @@ -1,3 +1,6 @@ +{{/* Define the secrets */}} +{{- define "bitwarden.secrets" -}} + {{- $adminToken := "" }} {{- if eq .Values.bitwardenrs.admin.enabled true }} {{- $adminToken = .Values.bitwardenrs.admin.token | default (randAlphaNum 48) | b64enc | quote }} @@ -17,8 +20,6 @@ apiVersion: v1 kind: Secret metadata: name: bitwardensecret - labels: - {{- include "common.labels" . | nindent 4 }} data: {{- if ne $adminToken "" }} ADMIN_TOKEN: {{ $adminToken }} @@ -54,3 +55,4 @@ data: {{- end }} url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }} type: Opaque +{{- end -}} diff --git a/charts/stable/bitwarden/templates/common.yaml b/charts/stable/bitwarden/templates/common.yaml index c83beb6c7ae..9e84d7a7b58 100644 --- a/charts/stable/bitwarden/templates/common.yaml +++ b/charts/stable/bitwarden/templates/common.yaml @@ -4,5 +4,11 @@ {{/* Render the templates */}} {{ include "common.all" . }} +{{/* Render configmap for bitwarden */}} +{{- include "bitwarden.configmap" . }} + +{{/* Render secrets for bitwarden */}} +{{- include "bitwarden.secrets" . }} + {{/* Render special ingress for bitwarden */}} {{- include "bitwarden.ingress" . }} diff --git a/charts/stable/bitwarden/values.yaml b/charts/stable/bitwarden/values.yaml index 49df6477e9a..9d937510ad9 100644 --- a/charts/stable/bitwarden/values.yaml +++ b/charts/stable/bitwarden/values.yaml @@ -8,13 +8,16 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 8080 + ports: + main: + port: 8080 ws: - port: - port: 3012 + ports: + ws: + enabled: true + port: 3012 env: {} @@ -146,20 +149,23 @@ persistence: data: enabled: true mountPath: "/data" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" db: nameOverride: "db" enabled: true - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" dbbackup: enabled: true - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/collabora-online/Chart.yaml b/charts/stable/collabora-online/Chart.yaml index eb007311121..c20547b0d83 100644 --- a/charts/stable/collabora-online/Chart.yaml +++ b/charts/stable/collabora-online/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: collabora-online -version: 3.1.6 +version: 4.0.0 # upstream_version: appVersion: "auto" description: Collabora Online Development Edition – an awesome, Online Office suite image suitable for home use. @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/collabora-online/SCALE/questions.yaml b/charts/stable/collabora-online/SCALE/questions.yaml index 323df49a7aa..9af0a96b809 100644 --- a/charts/stable/collabora-online/SCALE/questions.yaml +++ b/charts/stable/collabora-online/SCALE/questions.yaml @@ -210,7 +210,7 @@ questions: default: 36004 required: true # Reverse Proxy - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/collabora-online/values.yaml b/charts/stable/collabora-online/values.yaml index 8bb78064f4d..45fe358e8d8 100644 --- a/charts/stable/collabora-online/values.yaml +++ b/charts/stable/collabora-online/values.yaml @@ -13,12 +13,12 @@ podSecurityContext: runAsGroup: null fsGroup: null -services: +service: main: type: NodePort - port: - port: 9980 - nodePort: 30980 + ports: + main: + port: 9980 env: domain: nextcloud\.domain\.tld diff --git a/charts/stable/deepstack-cpu/Chart.yaml b/charts/stable/deepstack-cpu/Chart.yaml index e43b6ac2088..5e492a20b17 100644 --- a/charts/stable/deepstack-cpu/Chart.yaml +++ b/charts/stable/deepstack-cpu/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: deepstack-cpu -version: 1.0.4 +version: 2.0.0 # upstream_version: appVersion: "auto" description: DeepStack AI provides AI features including Face Recognition, Object Detection, Scene Recognition and custom AI Models @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/deepstack-cpu/SCALE/ix_values.yaml b/charts/stable/deepstack-cpu/SCALE/ix_values.yaml index 7822f2d7128..aa8a0483d78 100644 --- a/charts/stable/deepstack-cpu/SCALE/ix_values.yaml +++ b/charts/stable/deepstack-cpu/SCALE/ix_values.yaml @@ -18,8 +18,8 @@ podSecurityContext: envTpl: # Permissions Settings - USER_ID: "{{ .Values.PUID }}" - GROUP_ID: "{{ .Values.PGID }}" + USER_ID: "568" + GROUP_ID: "568" ## # Most other defaults are set in questions.yaml diff --git a/charts/stable/deepstack-cpu/SCALE/questions.yaml b/charts/stable/deepstack-cpu/SCALE/questions.yaml index 7f38241590c..0f6d92f0eae 100644 --- a/charts/stable/deepstack-cpu/SCALE/questions.yaml +++ b/charts/stable/deepstack-cpu/SCALE/questions.yaml @@ -286,7 +286,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/deepstack-cpu/values.yaml b/charts/stable/deepstack-cpu/values.yaml index 8131bbfe60c..74068a0c5f3 100644 --- a/charts/stable/deepstack-cpu/values.yaml +++ b/charts/stable/deepstack-cpu/values.yaml @@ -8,11 +8,12 @@ image: strategy: type: Recreate -services: +service: main: enabled: true - port: - port: 5000 + ports: + main: + port: 5000 podSecurityContext: runAsNonRoot: false @@ -22,8 +23,8 @@ podSecurityContext: envTpl: # Permissions Settings - USER_ID: "{{ .Values.PUID }}" - GROUP_ID: "{{ .Values.PGID }}" + USER_ID: "568" + GROUP_ID: "568" env: # TZ: UTC @@ -39,13 +40,8 @@ persistence: config: enabled: true mountPath: "/datastore" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" - -## TrueCharts Values - -ingress: - main: - enabled: false diff --git a/charts/stable/emby/Chart.yaml b/charts/stable/emby/Chart.yaml index 9d18e3bde9e..e29b73f9c01 100644 --- a/charts/stable/emby/Chart.yaml +++ b/charts/stable/emby/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: emby -version: 3.1.6 +version: 4.0.0 # upstream_version: appVersion: "auto" description: Emby Server is a home media server @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/emby/SCALE/questions.yaml b/charts/stable/emby/SCALE/questions.yaml index c3e377c8e9d..e3dc93459f6 100644 --- a/charts/stable/emby/SCALE/questions.yaml +++ b/charts/stable/emby/SCALE/questions.yaml @@ -220,7 +220,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: @@ -275,13 +275,13 @@ questions: type: hostpath required: true # Specify GPU configuration - - variable: gpuConfiguration + - variable: scaleGPU label: "GPU Configuration" group: "Resources and Devices" schema: type: dict $ref: - - "definitions/gpuConfiguration" + - "definitions/scaleGPU" attrs: [] - variable: ingress label: "" diff --git a/charts/stable/emby/values.yaml b/charts/stable/emby/values.yaml index 38ef2fcf7da..29590510e42 100644 --- a/charts/stable/emby/values.yaml +++ b/charts/stable/emby/values.yaml @@ -13,16 +13,18 @@ strategy: podSecurityContext: supplementalGroups: [44, 107] -services: +service: main: - port: - port: 8096 + ports: + main: + port: 8096 persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/esphome/Chart.yaml b/charts/stable/esphome/Chart.yaml index 3481227257e..55a0c8911b7 100644 --- a/charts/stable/esphome/Chart.yaml +++ b/charts/stable/esphome/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: esphome -version: 3.1.6 +version: 4.0.0 upstream_version: 4.3.1 appVersion: "auto" description: ESPHome is a system to control your ESP8266/ESP32 by simple yet powerful configuration files and control them remotely through Home Automation systems. @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/esphome/SCALE/questions.yaml b/charts/stable/esphome/SCALE/questions.yaml index a84aad4c1d1..7a6a47c2c7b 100644 --- a/charts/stable/esphome/SCALE/questions.yaml +++ b/charts/stable/esphome/SCALE/questions.yaml @@ -271,7 +271,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/esphome/values.yaml b/charts/stable/esphome/values.yaml index cfe87616195..01060dc6920 100644 --- a/charts/stable/esphome/values.yaml +++ b/charts/stable/esphome/values.yaml @@ -8,10 +8,11 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 6052 + ports: + main: + port: 6052 env: {} # ESPHOME_DASHBOARD_USE_PING: true @@ -26,7 +27,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/handbrake/Chart.yaml b/charts/stable/handbrake/Chart.yaml index 6df53a51fe5..eb5496db397 100644 --- a/charts/stable/handbrake/Chart.yaml +++ b/charts/stable/handbrake/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: handbrake -version: 3.1.6 +version: 4.0.0 # upstream_version: appVersion: "auto" description: HandBrake is a tool for converting video from nearly any format to a selection of modern, widely supported codecs. @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/handbrake/SCALE/ix_values.yaml b/charts/stable/handbrake/SCALE/ix_values.yaml index 23c3c4086fe..a25da76d817 100644 --- a/charts/stable/handbrake/SCALE/ix_values.yaml +++ b/charts/stable/handbrake/SCALE/ix_values.yaml @@ -20,8 +20,8 @@ podSecurityContext: #All values here are set as the docker defaults. envTpl: # Permissions Settings - USER_ID: "{{ .Values.PUID }}" - GROUP_ID: "{{ .Values.PGID }}" + USER_ID: "568" + GROUP_ID: "568" ## # Most other defaults are set in questions.yaml diff --git a/charts/stable/handbrake/SCALE/questions.yaml b/charts/stable/handbrake/SCALE/questions.yaml index 68b7ab798df..63f3798bab6 100644 --- a/charts/stable/handbrake/SCALE/questions.yaml +++ b/charts/stable/handbrake/SCALE/questions.yaml @@ -369,7 +369,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/handbrake/values.yaml b/charts/stable/handbrake/values.yaml index b248558d259..e6adfa87dc8 100644 --- a/charts/stable/handbrake/values.yaml +++ b/charts/stable/handbrake/values.yaml @@ -16,23 +16,25 @@ podSecurityContext: fsGroup: 0 supplementalGroups: [24, 44, 107] -services: +service: main: - port: - port: 5800 + ports: + main: + port: 5800 vnc: enabled: true type: ClusterIP - port: - port: 5900 - protocol: "TCP" - targetPort: 5900 + ports: + vnc: + enabled: true + port: 5900 + protocol: "TCP" # All values here are set as the docker defaults. envTpl: # Permissions Settings - USER_ID: "{{ .Values.PUID }}" - GROUP_ID: "{{ .Values.PGID }}" + USER_ID: "568" + GROUP_ID: "568" env: # General Settings @@ -53,7 +55,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/home-assistant/Chart.yaml b/charts/stable/home-assistant/Chart.yaml index cb3b2bfabb1..f5934332441 100644 --- a/charts/stable/home-assistant/Chart.yaml +++ b/charts/stable/home-assistant/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: home-assistant -version: 3.1.6 +version: 4.0.0 upstream_version: 5.3.0 appVersion: "auto" description: home-assistant App for TrueNAS SCALE @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: # ## postgresql is currently not ported to SCALE yet. # - name: postgresql diff --git a/charts/stable/home-assistant/SCALE/questions.yaml b/charts/stable/home-assistant/SCALE/questions.yaml index dfec12889c1..c3abc6c105b 100644 --- a/charts/stable/home-assistant/SCALE/questions.yaml +++ b/charts/stable/home-assistant/SCALE/questions.yaml @@ -235,7 +235,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/home-assistant/values.yaml b/charts/stable/home-assistant/values.yaml index f53ebfe58fe..9388d0c895b 100644 --- a/charts/stable/home-assistant/values.yaml +++ b/charts/stable/home-assistant/values.yaml @@ -19,11 +19,11 @@ podSecurityContext: env: {} # TZ: -services: +service: main: - port: - port: 8123 - nodePort: 30023 + ports: + main: + port: 8123 # # Enable devices to be discoverable # hostNetwork: true @@ -53,7 +53,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/jackett/Chart.yaml b/charts/stable/jackett/Chart.yaml index ac5e9ec805e..5de9fb826e7 100644 --- a/charts/stable/jackett/Chart.yaml +++ b/charts/stable/jackett/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: jackett -version: 3.1.6 +version: 4.0.0 upstream_version: 7.0.1 appVersion: "auto" description: API Support for your favorite torrent trackers. @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/jackett/SCALE/questions.yaml b/charts/stable/jackett/SCALE/questions.yaml index 6de48d7f95a..66d7063a650 100644 --- a/charts/stable/jackett/SCALE/questions.yaml +++ b/charts/stable/jackett/SCALE/questions.yaml @@ -219,7 +219,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/jackett/values.yaml b/charts/stable/jackett/values.yaml index 77ee8243700..656c801f421 100644 --- a/charts/stable/jackett/values.yaml +++ b/charts/stable/jackett/values.yaml @@ -9,11 +9,12 @@ strategy: type: Recreate -services: +service: main: enabled: true - port: - port: 9117 + ports: + main: + port: 9117 env: {} # TZ: UTC @@ -25,22 +26,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" - - -## TrueCharts Values - -ingress: - main: - enabled: true - # Used when including ingress using {{ include "common.ingress" . }} - type: "HTTP" - entrypoint: "websecure" - certType: "" - annotations: {} - hosts: - - host: chart-example.local - path: / diff --git a/charts/stable/jellyfin/Chart.yaml b/charts/stable/jellyfin/Chart.yaml index f214464c9f4..87283a46cef 100644 --- a/charts/stable/jellyfin/Chart.yaml +++ b/charts/stable/jellyfin/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: jellyfin -version: 3.1.6 +version: 4.0.0 upstream_version: 4.2.1 appVersion: "auto" description: Jellyfin is a Free Software Media System @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/jellyfin/SCALE/questions.yaml b/charts/stable/jellyfin/SCALE/questions.yaml index 6899287ca23..423f4cb4dd1 100644 --- a/charts/stable/jellyfin/SCALE/questions.yaml +++ b/charts/stable/jellyfin/SCALE/questions.yaml @@ -220,7 +220,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: @@ -275,13 +275,13 @@ questions: type: hostpath required: true # Specify GPU configuration - - variable: gpuConfiguration + - variable: scaleGPU label: "GPU Configuration" group: "Resources and Devices" schema: type: dict $ref: - - "definitions/gpuConfiguration" + - "definitions/scaleGPU" attrs: [] - variable: ingress label: "" diff --git a/charts/stable/jellyfin/values.yaml b/charts/stable/jellyfin/values.yaml index a038fbf8c6a..824009133ac 100644 --- a/charts/stable/jellyfin/values.yaml +++ b/charts/stable/jellyfin/values.yaml @@ -12,16 +12,18 @@ strategy: podSecurityContext: supplementalGroups: [44, 107] -services: +service: main: - port: - port: 8096 + ports: + main: + port: 8096 persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/kms/Chart.yaml b/charts/stable/kms/Chart.yaml index 0a36024f4cc..23c97928994 100644 --- a/charts/stable/kms/Chart.yaml +++ b/charts/stable/kms/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: kms -version: 3.1.6 +version: 4.0.0 # upstream_version: appVersion: "minimal" description: Private Windows Activation Server for development and testing @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/kms/SCALE/questions.yaml b/charts/stable/kms/SCALE/questions.yaml index 5035ba7c633..b12daac9ddd 100644 --- a/charts/stable/kms/SCALE/questions.yaml +++ b/charts/stable/kms/SCALE/questions.yaml @@ -154,7 +154,7 @@ questions: default: 36011 required: true ## TrueCharts Specific - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/kms/values.yaml b/charts/stable/kms/values.yaml index 72f5ad79aa1..f6dd0558b55 100644 --- a/charts/stable/kms/values.yaml +++ b/charts/stable/kms/values.yaml @@ -15,7 +15,8 @@ podSecurityContext: runAsGroup: 0 fsGroup: 0 -services: +service: main: - port: - port: 1688 + ports: + main: + port: 1688 diff --git a/charts/stable/lidarr/Chart.yaml b/charts/stable/lidarr/Chart.yaml index 28732cdb16b..b2dcffb9ce0 100644 --- a/charts/stable/lidarr/Chart.yaml +++ b/charts/stable/lidarr/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: lidarr -version: 3.1.6 +version: 4.0.0 upstream_version: 7.1.0 appVersion: "auto" description: Looks and smells like Sonarr but made for music @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/lidarr/SCALE/questions.yaml b/charts/stable/lidarr/SCALE/questions.yaml index 2182ab54480..9168ca937fb 100644 --- a/charts/stable/lidarr/SCALE/questions.yaml +++ b/charts/stable/lidarr/SCALE/questions.yaml @@ -220,7 +220,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/lidarr/values.yaml b/charts/stable/lidarr/values.yaml index dd450c6f70a..d0df88ce225 100644 --- a/charts/stable/lidarr/values.yaml +++ b/charts/stable/lidarr/values.yaml @@ -8,10 +8,11 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 8686 + ports: + main: + port: 8686 env: {} # TZ: UTC @@ -43,7 +44,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/ombi/Chart.yaml b/charts/stable/ombi/Chart.yaml index 4eb266f7a4d..50a4ee41da4 100644 --- a/charts/stable/ombi/Chart.yaml +++ b/charts/stable/ombi/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: ombi -version: 3.1.6 +version: 4.0.0 upstream_version: 8.0.1 appVersion: "auto" description: Want a Movie or TV Show on Plex or Emby? Use Ombi! @@ -24,7 +24,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/ombi/SCALE/questions.yaml b/charts/stable/ombi/SCALE/questions.yaml index f488835d6fe..b3591906710 100644 --- a/charts/stable/ombi/SCALE/questions.yaml +++ b/charts/stable/ombi/SCALE/questions.yaml @@ -220,7 +220,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/ombi/values.yaml b/charts/stable/ombi/values.yaml index dd6dbe01b36..029f935ea7f 100644 --- a/charts/stable/ombi/values.yaml +++ b/charts/stable/ombi/values.yaml @@ -8,10 +8,11 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 3579 + ports: + main: + port: 3579 env: {} # TZ: UTC @@ -22,7 +23,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/plex/Chart.yaml b/charts/stable/plex/Chart.yaml index 39243362aea..017e458835e 100644 --- a/charts/stable/plex/Chart.yaml +++ b/charts/stable/plex/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: plex -version: 2.1.6 +version: 3.0.0 upstream_version: 4.2.1 appVersion: "auto" description: Plex Media Server @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/plex/SCALE/questions.yaml b/charts/stable/plex/SCALE/questions.yaml index d774afbc2cb..e5a56723493 100644 --- a/charts/stable/plex/SCALE/questions.yaml +++ b/charts/stable/plex/SCALE/questions.yaml @@ -244,7 +244,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: @@ -299,13 +299,13 @@ questions: type: hostpath required: true # Specify GPU configuration - - variable: gpuConfiguration + - variable: scaleGPU label: "GPU Configuration" group: "Resources and Devices" schema: type: dict $ref: - - "definitions/gpuConfiguration" + - "definitions/scaleGPU" attrs: [] - variable: ingress label: "" diff --git a/charts/stable/plex/values.yaml b/charts/stable/plex/values.yaml index 80a60ea41b6..26db6e9719a 100644 --- a/charts/stable/plex/values.yaml +++ b/charts/stable/plex/values.yaml @@ -12,16 +12,18 @@ strategy: podSecurityContext: supplementalGroups: [44, 107] -services: +service: main: - port: - port: 32400 + ports: + main: + port: 32400 persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/radarr/Chart.yaml b/charts/stable/radarr/Chart.yaml index 47ed4970fc8..062cf918e6a 100644 --- a/charts/stable/radarr/Chart.yaml +++ b/charts/stable/radarr/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: radarr -version: 3.1.6 +version: 4.0.0 upstream_version: 9.1.0 appVersion: "auto" description: A fork of Sonarr to work with movies à la Couchpotato @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/radarr/SCALE/questions.yaml b/charts/stable/radarr/SCALE/questions.yaml index 86c7532944b..7e5b75ca0ee 100644 --- a/charts/stable/radarr/SCALE/questions.yaml +++ b/charts/stable/radarr/SCALE/questions.yaml @@ -221,7 +221,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/radarr/values.yaml b/charts/stable/radarr/values.yaml index 73d8136462a..703b9625db6 100644 --- a/charts/stable/radarr/values.yaml +++ b/charts/stable/radarr/values.yaml @@ -8,10 +8,11 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 7878 + ports: + main: + port: 7878 env: {} # TZ: UTC @@ -43,7 +44,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/sonarr/Chart.yaml b/charts/stable/sonarr/Chart.yaml index 4ad5a966ba7..a73ae753df6 100644 --- a/charts/stable/sonarr/Chart.yaml +++ b/charts/stable/sonarr/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: sonarr -version: 3.1.6 +version: 4.0.0 upstream_version: 9.1.0 appVersion: "auto" description: Smart PVR for newsgroup and bittorrent users @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/sonarr/SCALE/questions.yaml b/charts/stable/sonarr/SCALE/questions.yaml index 32868a8e891..58ffeac9845 100644 --- a/charts/stable/sonarr/SCALE/questions.yaml +++ b/charts/stable/sonarr/SCALE/questions.yaml @@ -221,7 +221,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/sonarr/values.yaml b/charts/stable/sonarr/values.yaml index 6ba6a483062..41f7eb4bc9a 100644 --- a/charts/stable/sonarr/values.yaml +++ b/charts/stable/sonarr/values.yaml @@ -8,10 +8,11 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 8989 + ports: + main: + port: 8989 env: {} # TZ: UTC @@ -43,7 +44,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/syncthing/Chart.yaml b/charts/stable/syncthing/Chart.yaml index ca0143bac94..6e2871ccd50 100644 --- a/charts/stable/syncthing/Chart.yaml +++ b/charts/stable/syncthing/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: syncthing -version: 3.1.6 +version: 4.0.0 # upstream_version: appVersion: "auto" description: P2P file synchronization application @@ -18,7 +18,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/syncthing/SCALE/questions.yaml b/charts/stable/syncthing/SCALE/questions.yaml index 9110b80dc08..a9f1dcd08fc 100644 --- a/charts/stable/syncthing/SCALE/questions.yaml +++ b/charts/stable/syncthing/SCALE/questions.yaml @@ -211,7 +211,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/syncthing/values.yaml b/charts/stable/syncthing/values.yaml index b06778687b7..8b4ac24f780 100644 --- a/charts/stable/syncthing/values.yaml +++ b/charts/stable/syncthing/values.yaml @@ -3,20 +3,22 @@ image: repository: syncthing/syncthing pullPolicy: IfNotPresent - tag: 1.16 + tag: "1.16" strategy: type: Recreate -services: +service: main: - port: - port: 8384 + ports: + main: + port: 8384 persistence: config: enabled: true - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/tautulli/Chart.yaml b/charts/stable/tautulli/Chart.yaml index eae5dd5c98e..50b454dd30b 100644 --- a/charts/stable/tautulli/Chart.yaml +++ b/charts/stable/tautulli/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: tautulli -version: 3.1.6 +version: 4.0.0 upstream_version: 7.0.1 appVersion: "auto" description: A Python based monitoring and tracking tool for Plex Media Server @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/tautulli/SCALE/questions.yaml b/charts/stable/tautulli/SCALE/questions.yaml index 9f6bfe4408d..9d0c153dfb3 100644 --- a/charts/stable/tautulli/SCALE/questions.yaml +++ b/charts/stable/tautulli/SCALE/questions.yaml @@ -221,7 +221,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/tautulli/values.yaml b/charts/stable/tautulli/values.yaml index 52adfb5e0b5..3b30c9275b0 100644 --- a/charts/stable/tautulli/values.yaml +++ b/charts/stable/tautulli/values.yaml @@ -8,10 +8,11 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 8181 + ports: + main: + port: 8181 env: {} # TZ: UTC @@ -22,7 +23,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/traefik/Chart.yaml b/charts/stable/traefik/Chart.yaml index 064ce9969b8..2641e0c3bd4 100644 --- a/charts/stable/traefik/Chart.yaml +++ b/charts/stable/traefik/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: traefik -version: 3.2.4 +version: 4.0.0 appVersion: "auto" description: A Traefik based Reverse Proxy and Certificate Manager type: application @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: - name: traefik repository: https://helm.traefik.io/traefik diff --git a/charts/stable/traefik/values.yaml b/charts/stable/traefik/values.yaml index e0ce5d60467..543a728674b 100644 --- a/charts/stable/traefik/values.yaml +++ b/charts/stable/traefik/values.yaml @@ -260,7 +260,7 @@ ingress: # Ignored if not kubeVersion >= 1.14-0 pathType: Prefix -externalServices: +externalservice: - enabled: true name: "test" type: "HTTP" diff --git a/charts/stable/transmission/Chart.lock b/charts/stable/transmission/Chart.lock new file mode 100644 index 00000000000..ccb76cb28d6 --- /dev/null +++ b/charts/stable/transmission/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://truecharts.org/ + version: 4.1.1 +digest: sha256:d13c8b723da27f049ec5a709db8128a96033773c1be13330a453daa4e4d0b7ff +generated: "2021-05-20T18:13:40.3933879+02:00" diff --git a/charts/stable/transmission/Chart.yaml b/charts/stable/transmission/Chart.yaml index 71b006f891c..b2584b3a546 100644 --- a/charts/stable/transmission/Chart.yaml +++ b/charts/stable/transmission/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: transmission -version: 3.1.6 +version: 4.0.0 # upstream_version: appVersion: "auto" description: API Support for your favorite torrent trackers. @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/transmission/SCALE/questions.yaml b/charts/stable/transmission/SCALE/questions.yaml index 0656f1e76a2..bc6bc9ef240 100644 --- a/charts/stable/transmission/SCALE/questions.yaml +++ b/charts/stable/transmission/SCALE/questions.yaml @@ -529,7 +529,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/transmission/charts/common-4.1.1.tgz b/charts/stable/transmission/charts/common-4.1.1.tgz new file mode 100644 index 0000000000000000000000000000000000000000..15aa650faacb6a73cb4f9fa7c5722dc13531149b GIT binary patch literal 24520 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 literal 0 HcmV?d00001 diff --git a/charts/stable/transmission/templates/configmap.yaml b/charts/stable/transmission/templates/_configmap.tpl similarity index 78% rename from charts/stable/transmission/templates/configmap.yaml rename to charts/stable/transmission/templates/_configmap.tpl index 452c943a7dc..c12a54c92f1 100644 --- a/charts/stable/transmission/templates/configmap.yaml +++ b/charts/stable/transmission/templates/_configmap.tpl @@ -1,3 +1,6 @@ +{{/* Define the configmap */}} +{{- define "transmission.configmap" -}} +--- apiVersion: v1 kind: ConfigMap metadata: @@ -8,3 +11,4 @@ data: settings.json: | {{- $dict := merge .Values.transmissionConfig .Values.transmissionFixedConfig }} {{- $dict | mustToPrettyJson | nindent 4 }} +{{- end -}} diff --git a/charts/stable/transmission/templates/common.yaml b/charts/stable/transmission/templates/common.yaml index e0195d0d28f..c43b236c179 100644 --- a/charts/stable/transmission/templates/common.yaml +++ b/charts/stable/transmission/templates/common.yaml @@ -27,5 +27,9 @@ subPath: settings.json {{- $_ := set .Values "additionalVolumeMounts" (deepCopy $additionalVolumeMounts) -}} {{- end -}} + {{/* Render the templates */}} {{ include "common.all" . }} + +{{/* Render the configmap */}} +{{ include "transmission.configmap" . }} diff --git a/charts/stable/transmission/values.yaml b/charts/stable/transmission/values.yaml index 158aae7cf4e..58bb783f4dc 100644 --- a/charts/stable/transmission/values.yaml +++ b/charts/stable/transmission/values.yaml @@ -8,25 +8,23 @@ image: strategy: type: Recreate -services: +service: main: - port: - port: 9091 - tcp: + ports: + main: + port: 9091 + torrent: enabled: true type: ClusterIP - port: - port: 51413 - protocol: TCP - targetPort: 51413 - udp: - enabled: true - type: ClusterIP - port: - port: 51413 - protocol: UDP - targetPort: 51413 - + ports: + tcp: + enabled: true + port: 51413 + protocol: TCP + udp: + enabled: true + port: 51413 + protocol: UDP env: {} # TZ: UTC @@ -37,7 +35,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/truecommand/Chart.yaml b/charts/stable/truecommand/Chart.yaml index ae857e1542c..58dab78c8ce 100644 --- a/charts/stable/truecommand/Chart.yaml +++ b/charts/stable/truecommand/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: truecommand -version: 3.1.6 +version: 4.0.0 # upstream_version: 1.1.0 appVersion: "nightly" description: Aggregated management of TrueNAS devices @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/truecommand/SCALE/questions.yaml b/charts/stable/truecommand/SCALE/questions.yaml index 1701b2417ea..9386cf2bae4 100644 --- a/charts/stable/truecommand/SCALE/questions.yaml +++ b/charts/stable/truecommand/SCALE/questions.yaml @@ -223,7 +223,7 @@ questions: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/truecommand/values.yaml b/charts/stable/truecommand/values.yaml index ee4eb28f3a3..c2fbda7f606 100644 --- a/charts/stable/truecommand/values.yaml +++ b/charts/stable/truecommand/values.yaml @@ -15,10 +15,11 @@ podSecurityContext: runAsGroup: 0 fsGroup: 0 -services: +service: main: - port: - port: 80 + ports: + main: + port: 80 env: {} # TZ: UTC @@ -29,7 +30,8 @@ persistence: data: enabled: true mountPath: "/data" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" diff --git a/charts/stable/zwavejs2mqtt/Chart.yaml b/charts/stable/zwavejs2mqtt/Chart.yaml index 05433352709..d50e1e87978 100644 --- a/charts/stable/zwavejs2mqtt/Chart.yaml +++ b/charts/stable/zwavejs2mqtt/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: zwavejs2mqtt -version: 3.1.6 +version: 4.0.0 upstream_version: 1.1.0 appVersion: "auto" description: Fully configurable Zwave to MQTT gateway and Control Panel using NodeJS and Vue @@ -22,7 +22,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 3.5.8 + version: 4.1.1 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/zwavejs2mqtt/SCALE/questions.yaml b/charts/stable/zwavejs2mqtt/SCALE/questions.yaml index e26ca163704..96a21f53d50 100644 --- a/charts/stable/zwavejs2mqtt/SCALE/questions.yaml +++ b/charts/stable/zwavejs2mqtt/SCALE/questions.yaml @@ -263,7 +263,7 @@ questions: schema: type: string default: "100Gi" - - variable: customStorage + - variable: hostPathMounts label: "Custom app storage" group: "Storage" schema: diff --git a/charts/stable/zwavejs2mqtt/values.yaml b/charts/stable/zwavejs2mqtt/values.yaml index 28126356a3e..85f4a9324b4 100644 --- a/charts/stable/zwavejs2mqtt/values.yaml +++ b/charts/stable/zwavejs2mqtt/values.yaml @@ -66,17 +66,19 @@ probes: # periodSeconds: 10 # timeoutSeconds: 10 -services: +service: main: - port: - port: 8091 + ports: + main: + port: 8091 ws: enabled: true type: ClusterIP - port: - port: 3000 - protocol: TCP - targetPort: 3000 + ports: + ws: + enabled: true + port: 3000 + protocol: TCP # Privileged may be required if USB controller is accessed directly through the host machine # securityContext: @@ -86,7 +88,8 @@ persistence: config: enabled: true mountPath: "/config" - emptyDir: true + emptyDir: + enabled: true accessMode: ReadWriteOnce size: 1Gi storageClass: "" From 5697c5212bece256bed8913aa76972eb3e9c4612 Mon Sep 17 00:00:00 2001 From: Stavros Kois Date: Sat, 22 May 2021 18:59:46 +0300 Subject: [PATCH 02/11] Common 4.0 App Refactor Part 2 - Stavos Squashed commit: [a2bbe555] Update docs for services and groups [f04d91cf] don't require loadbalancer ip settings [188d40c0] fix typo [50735ac0] fix description on persistent storage, fix port names on websockets [42303b07] Refactor services part4 [9486e401] Refactor services part3 [2a0eb1a7] default ClusterIP on websocket (zwave) [43a1ca1b] Refactor services part2 [a80ee6b3] Refactor services part1 [b561be7e] Remove securityContext and podSecurityContext from apps with PGID/PUID [0ad14db2] move UMASK, PGID. PUID to env [3ab8bc1d] Rename environmentVariables to envList and environmentVariable to envItem [58b533af] Move securityContext to Security group [8baefb23] Move podSecurityContext to Security group [dcbf92ae] Rename reverse proxy to ingress [4a72f6c2] Remove ingress for now [9c3dac85] Refactor groups --- .../deprecated/nzbhydra/SCALE/questions.yaml | 244 +++---- .../incubator/appdaemon/SCALE/questions.yaml | 241 +++---- charts/incubator/bazarr/SCALE/questions.yaml | 244 +++---- .../calibre-web/SCALE/questions.yaml | 329 +++------ charts/incubator/deluge/SCALE/questions.yaml | 656 ++++++++---------- .../incubator/fireflyiii/SCALE/questions.yaml | 276 +++----- .../incubator/freshrss/SCALE/questions.yaml | 331 +++------ charts/incubator/gaps/SCALE/questions.yaml | 244 +++---- charts/incubator/grocy/SCALE/questions.yaml | 327 +++------ .../incubator/heimdall/SCALE/questions.yaml | 330 +++------ .../lazylibrarian/SCALE/questions.yaml | 331 +++------ charts/incubator/lychee/SCALE/questions.yaml | 330 +++------ .../incubator/navidrome/SCALE/questions.yaml | 244 +++---- .../incubator/node-red/SCALE/questions.yaml | 244 +++---- charts/incubator/nzbget/SCALE/questions.yaml | 244 +++---- .../incubator/organizr/SCALE/questions.yaml | 330 +++------ charts/incubator/podgrab/SCALE/questions.yaml | 231 +++--- .../qbittorrent/SCALE/questions.yaml | 460 ++++++------ charts/incubator/readarr/SCALE/questions.yaml | 244 +++---- charts/incubator/sabnzbd/SCALE/questions.yaml | 240 +++---- .../incubator/tvheadend/SCALE/questions.yaml | 460 ++++++------ charts/incubator/unifi/SCALE/questions.yaml | 619 +++++++---------- charts/stable/bitwarden/SCALE/questions.yaml | 367 +++++----- .../collabora-online/SCALE/questions.yaml | 220 +++--- .../stable/deepstack-cpu/SCALE/questions.yaml | 282 +++----- charts/stable/emby/SCALE/questions.yaml | 242 +++---- charts/stable/esphome/SCALE/questions.yaml | 223 +++--- charts/stable/handbrake/SCALE/questions.yaml | 418 +++++------ .../home-assistant/SCALE/questions.yaml | 326 +++------ charts/stable/jackett/SCALE/questions.yaml | 241 +++---- charts/stable/jellyfin/SCALE/questions.yaml | 242 +++---- charts/stable/kms/SCALE/questions.yaml | 282 +++----- charts/stable/lidarr/SCALE/questions.yaml | 242 +++---- charts/stable/ombi/SCALE/questions.yaml | 242 +++---- charts/stable/plex/SCALE/questions.yaml | 239 +++---- charts/stable/radarr/SCALE/questions.yaml | 242 +++---- charts/stable/sonarr/SCALE/questions.yaml | 243 +++---- charts/stable/syncthing/SCALE/questions.yaml | 222 +++--- charts/stable/tautulli/SCALE/questions.yaml | 243 +++---- charts/stable/traefik/SCALE/questions.yaml | 139 +--- .../stable/transmission/SCALE/questions.yaml | 459 ++++++------ .../stable/truecommand/SCALE/questions.yaml | 333 +++------ .../stable/zwavejs2mqtt/SCALE/questions.yaml | 348 +++++----- .../app development/questions-yaml.md | 122 +++- docs/development/app development/services.md | 129 ++-- 45 files changed, 5174 insertions(+), 8071 deletions(-) diff --git a/charts/deprecated/nzbhydra/SCALE/questions.yaml b/charts/deprecated/nzbhydra/SCALE/questions.yaml index f79377ad637..88a886ed8d6 100644 --- a/charts/deprecated/nzbhydra/SCALE/questions.yaml +++ b/charts/deprecated/nzbhydra/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,60 +123,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 5076 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 5076 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36041 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 5076 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 5076 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36041 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -275,104 +318,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -384,7 +332,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/incubator/appdaemon/SCALE/questions.yaml b/charts/incubator/appdaemon/SCALE/questions.yaml index 914ed862848..2febfebff00 100644 --- a/charts/incubator/appdaemon/SCALE/questions.yaml +++ b/charts/incubator/appdaemon/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,7 +64,6 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - # Docker specific env - variable: env group: "Configuration" @@ -113,17 +113,21 @@ questions: type: int default: 0 required: true - - + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -136,7 +140,6 @@ questions: label: "Value" schema: type: string - # Enable Host Networking - variable: hostNetwork group: "Networking" @@ -144,14 +147,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -163,58 +166,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 5050 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 51050 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36052 - required: true -## TrueCharts Specific - + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 5050 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 51050 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36052 + required: true + ## TrueCharts Specific - variable: hostPathMounts label: "Custom app storage" group: "Storage" @@ -269,105 +302,9 @@ questions: schema: type: hostpath required: true - - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -379,7 +316,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/incubator/bazarr/SCALE/questions.yaml b/charts/incubator/bazarr/SCALE/questions.yaml index 469f7241654..da449a377b5 100644 --- a/charts/incubator/bazarr/SCALE/questions.yaml +++ b/charts/incubator/bazarr/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,60 +123,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 6767 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 6767 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36025 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 6767 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 6767 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36025 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -275,104 +318,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -384,7 +332,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/incubator/calibre-web/SCALE/questions.yaml b/charts/incubator/calibre-web/SCALE/questions.yaml index 7794744cb58..9b41c36c536 100644 --- a/charts/incubator/calibre-web/SCALE/questions.yaml +++ b/charts/incubator/calibre-web/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -62,16 +64,39 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -91,14 +116,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -110,60 +135,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8083 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8083 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36015 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8083 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8083 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36015 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -274,176 +330,3 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false - # Set Pod Security Policy - - variable: podSecurityContext - group: "Advanced" - label: "Pod Security Context" - schema: - type: dict - attrs: - - variable: runAsNonRoot - label: "runAsNonRoot" - schema: - type: boolean - default: false - - variable: runAsUser - 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" - schema: - type: int - default: 0 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." - schema: - type: int - default: 568 - - variable: fsGroupChangePolicy - label: "When should we take ownership?" - schema: - type: string - default: "OnRootMismatch" - enum: - - value: "OnRootMismatch" - description: "OnRootMismatch" - - value: "Always" - description: "Always" diff --git a/charts/incubator/deluge/SCALE/questions.yaml b/charts/incubator/deluge/SCALE/questions.yaml index e0dd3e505e3..5ae87743f08 100644 --- a/charts/incubator/deluge/SCALE/questions.yaml +++ b/charts/incubator/deluge/SCALE/questions.yaml @@ -6,15 +6,19 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" + - name: "WARNING" + description: "WARNING" portals: web_portal: protocols: @@ -24,7 +28,7 @@ portals: ports: - "$kubernetes-resource_configmap_portal_port" questions: -## Portal Button + ## Portal Button - variable: portal group: "Container Image" label: "Configure Portal Button" @@ -40,7 +44,7 @@ questions: editable: false type: boolean default: true -## Update Policy + ## Update Policy - variable: strategyType group: "Container Image" label: "Update Strategy" @@ -52,7 +56,7 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" -## Configure Time Zone + ## Configure Time Zone - variable: timezone group: "Container Image" label: "Timezone" @@ -61,16 +65,39 @@ questions: default: "Australia/Hobart" $ref: - "definitions/timezone" - -## Configure Enviroment Variables - - variable: environmentVariables + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" + ## Configure Enviroment Variables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -83,16 +110,255 @@ questions: label: "Value" schema: type: string -## Enable Host Network + ## Enable Host Network - variable: hostNetwork group: "Networking" label: "Enable Host Network" schema: type: boolean default: false + - variable: service + group: "Networking" + label: "Configure Service(s)" + schema: + type: dict + attrs: + - variable: main + label: "Main Service" + description: "The Primary service on which the healthcheck runs, often the webUI" + schema: + type: dict + attrs: + - variable: enabled + label: "Enable the service" + schema: + type: boolean + default: true + hidden: true + - variable: type + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" + schema: + type: string + default: "NodePort" + enum: + - value: "NodePort" + description: "NodePort" + - value: "ClusterIP" + description: "ClusterIP" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" + schema: + type: dict + attrs: + - variable: main + label: "Main Service Port Configuration" + schema: + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8112 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8112 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36026 + required: true + - variable: torrent + label: "Torrent Service" + description: "Torrent Service" + schema: + type: dict + attrs: + - variable: enabled + label: "Enable the service" + schema: + type: boolean + default: true + hidden: true + - variable: type + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" + schema: + type: string + default: "NodePort" + enum: + - value: "NodePort" + description: "NodePort" + - value: "ClusterIP" + description: "ClusterIP" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" + schema: + type: dict + attrs: + - variable: tcp + label: "TCP Service Port Configuration" + schema: + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "TCP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 51413 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 51413 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 51413 + required: true + - variable: udp + label: "UDP Service Port Configuration" + schema: + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "UDP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 51413 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 51413 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 51413 + required: true - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -203,369 +469,3 @@ questions: schema: type: hostpath required: true - - variable: services - group: "Networking" - label: "Configure Service" - schema: - type: dict - attrs: - - variable: main - label: "Main service" - description: "The Primary service on which the healthcheck runs, often the webUI" - schema: - type: dict - attrs: - - variable: enabled - label: "Enable the service" - schema: - type: boolean - default: true - hidden: true - - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" - schema: - type: string - default: "ClusterIP" - enum: - - value: "NodePort" - description: "NodePort" - - value: "ClusterIP" - description: "ClusterIP" - - variable: port - label: "Port configuration" - schema: - type: dict - attrs: - - variable: protocol - label: "Port Type" - schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8112 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8112 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36026 - required: true - - variable: tcp - label: "" - description: "TCP port for Torrent Connections" - schema: - type: dict - attrs: - - variable: enabled - label: "Enable TCP port for Torrent Connections" - schema: - type: boolean - default: true - hidden: true - - variable: type - label: "Service type" - schema: - type: string - default: "ClusterIP" - enum: - - value: "NodePort" - description: "NodePort" - - value: "ClusterIP" - description: "ClusterIP" - - variable: port - label: "Port configuration" - schema: - type: dict - attrs: - - variable: name - label: "port name" - schema: - type: string - default: "torrent-tcp" - hidden: true - - variable: protocol - label: "Protocol" - schema: - type: string - default: "TCP" - hidden: true - - variable: port - label: "container port" - schema: - type: int - default: 51413 - editable: false - hidden: true - - variable: targetport - label: "container targetport" - schema: - type: int - default: 51413 - editable: false - hidden: true - - variable: nodePort - label: "Node Port to expose" - schema: - type: int - min: 9000 - max: 65535 - default: 51413 - required: false - - variable: udp - label: "" - description: "UDP port for Torrent Connections" - schema: - type: dict - attrs: - - variable: enabled - label: "Enable UDP port for Torrent Connections" - schema: - type: boolean - default: true - hidden: true - - variable: type - label: "Service type" - schema: - type: string - default: "ClusterIP" - enum: - - value: "NodePort" - description: "NodePort" - - value: "ClusterIP" - description: "ClusterIP" - - variable: port - label: "Port configuration" - schema: - type: dict - attrs: - - variable: name - label: "port name" - schema: - type: string - default: "torrent-udp" - hidden: true - - variable: protocol - label: "Protocol" - schema: - type: string - default: "UDP" - hidden: true - - variable: port - label: "container port" - schema: - type: int - default: 51413 - editable: false - hidden: true - - variable: targetport - label: "container targetport" - schema: - type: int - default: 51413 - editable: false - hidden: true - - variable: nodePort - label: "Node Port to expose" - schema: - type: int - min: 9000 - max: 65535 - default: 51413 - required: false - -## Ingres - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false - # Set Pod Security Policy - - variable: podSecurityContext - group: "Advanced" - label: "Pod Security Context" - schema: - type: dict - attrs: - - variable: runAsNonRoot - label: "runAsNonRoot" - schema: - type: boolean - default: false - - variable: runAsUser - 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" - schema: - type: int - default: 0 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." - schema: - type: int - default: 568 - - variable: fsGroupChangePolicy - label: "When should we take ownership?" - schema: - type: string - default: "OnRootMismatch" - enum: - - value: "OnRootMismatch" - description: "OnRootMismatch" - - value: "Always" - description: "Always" diff --git a/charts/incubator/fireflyiii/SCALE/questions.yaml b/charts/incubator/fireflyiii/SCALE/questions.yaml index 8a46f4e8a93..9507691190c 100644 --- a/charts/incubator/fireflyiii/SCALE/questions.yaml +++ b/charts/incubator/fireflyiii/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -62,28 +64,6 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - # Configure Enviroment Variables - - variable: environmentVariables - label: "Image environment" - group: "Configuration" - schema: - type: list - default: [] - items: - - variable: environmentVariable - label: "Environment Variable" - schema: - type: dict - attrs: - - variable: name - label: "Name" - schema: - type: string - - variable: value - label: "Value" - schema: - type: string - # Docker specific env - variable: env group: "Configuration" @@ -98,7 +78,32 @@ questions: type: string default: "" required: true - + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" + - variable: envList + label: "Image environment" + group: "Configuration" + schema: + type: list + default: [] + items: + - variable: envItem + label: "Environment Variable" + schema: + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string # Enable Host Networking - variable: hostNetwork group: "Networking" @@ -106,14 +111,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -125,61 +130,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8080 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 51080 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36048 - required: true - -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8080 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 51080 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36048 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -401,104 +436,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -510,7 +450,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/incubator/freshrss/SCALE/questions.yaml b/charts/incubator/freshrss/SCALE/questions.yaml index daa2d01503b..7714f4b6faf 100644 --- a/charts/incubator/freshrss/SCALE/questions.yaml +++ b/charts/incubator/freshrss/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,39 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +116,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,60 +135,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 80 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 80 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36029 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 80 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 80 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36029 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -221,7 +276,6 @@ questions: schema: type: string default: "100Gi" - - variable: hostPathMounts label: "Custom app storage" group: "Storage" @@ -276,176 +330,3 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false - # Set Pod Security Policy - - variable: podSecurityContext - group: "Advanced" - label: "Pod Security Context" - schema: - type: dict - attrs: - - variable: runAsNonRoot - label: "runAsNonRoot" - schema: - type: boolean - default: false - - variable: runAsUser - 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" - schema: - type: int - default: 0 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." - schema: - type: int - default: 568 - - variable: fsGroupChangePolicy - label: "When should we take ownership?" - schema: - type: string - default: "OnRootMismatch" - enum: - - value: "OnRootMismatch" - description: "OnRootMismatch" - - value: "Always" - description: "Always" diff --git a/charts/incubator/gaps/SCALE/questions.yaml b/charts/incubator/gaps/SCALE/questions.yaml index c12954889d2..8ef13745ffe 100644 --- a/charts/incubator/gaps/SCALE/questions.yaml +++ b/charts/incubator/gaps/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,59 +123,90 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8484 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8484 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36030 - required: true + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8484 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8484 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36030 + required: true - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -220,8 +263,6 @@ questions: schema: type: string default: "100Gi" - - - variable: hostPathMounts label: "Custom app storage" group: "Storage" @@ -276,104 +317,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -385,7 +331,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/incubator/grocy/SCALE/questions.yaml b/charts/incubator/grocy/SCALE/questions.yaml index a5eb28f5404..439df3f618d 100644 --- a/charts/incubator/grocy/SCALE/questions.yaml +++ b/charts/incubator/grocy/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,40 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +117,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,59 +136,90 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 80 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 80 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36031 - required: true + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 80 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 80 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36031 + required: true - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -274,176 +330,3 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false - # Set Pod Security Policy - - variable: podSecurityContext - group: "Advanced" - label: "Pod Security Context" - schema: - type: dict - attrs: - - variable: runAsNonRoot - label: "runAsNonRoot" - schema: - type: boolean - default: false - - variable: runAsUser - 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" - schema: - type: int - default: 0 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." - schema: - type: int - default: 568 - - variable: fsGroupChangePolicy - label: "When should we take ownership?" - schema: - type: string - default: "OnRootMismatch" - enum: - - value: "OnRootMismatch" - description: "OnRootMismatch" - - value: "Always" - description: "Always" diff --git a/charts/incubator/heimdall/SCALE/questions.yaml b/charts/incubator/heimdall/SCALE/questions.yaml index 13b2d038c7d..2be6b567771 100644 --- a/charts/incubator/heimdall/SCALE/questions.yaml +++ b/charts/incubator/heimdall/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,39 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +116,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,60 +135,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 80 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 80 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36033 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 80 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 80 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36033 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -275,176 +330,3 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false - # Set Pod Security Policy - - variable: podSecurityContext - group: "Advanced" - label: "Pod Security Context" - schema: - type: dict - attrs: - - variable: runAsNonRoot - label: "runAsNonRoot" - schema: - type: boolean - default: false - - variable: runAsUser - 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" - schema: - type: int - default: 0 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." - schema: - type: int - default: 568 - - variable: fsGroupChangePolicy - label: "When should we take ownership?" - schema: - type: string - default: "OnRootMismatch" - enum: - - value: "OnRootMismatch" - description: "OnRootMismatch" - - value: "Always" - description: "Always" diff --git a/charts/incubator/lazylibrarian/SCALE/questions.yaml b/charts/incubator/lazylibrarian/SCALE/questions.yaml index 07284e32de8..487a7ac7d53 100644 --- a/charts/incubator/lazylibrarian/SCALE/questions.yaml +++ b/charts/incubator/lazylibrarian/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,39 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +116,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,60 +135,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 5299 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 5299 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36033 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 5299 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 5299 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36033 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -221,7 +276,6 @@ questions: schema: type: string default: "100Gi" - - variable: hostPathMounts label: "Custom app storage" group: "Storage" @@ -276,176 +330,3 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false - # Set Pod Security Policy - - variable: podSecurityContext - group: "Advanced" - label: "Pod Security Context" - schema: - type: dict - attrs: - - variable: runAsNonRoot - label: "runAsNonRoot" - schema: - type: boolean - default: false - - variable: runAsUser - 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" - schema: - type: int - default: 0 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." - schema: - type: int - default: 568 - - variable: fsGroupChangePolicy - label: "When should we take ownership?" - schema: - type: string - default: "OnRootMismatch" - enum: - - value: "OnRootMismatch" - description: "OnRootMismatch" - - value: "Always" - description: "Always" diff --git a/charts/incubator/lychee/SCALE/questions.yaml b/charts/incubator/lychee/SCALE/questions.yaml index b25a085a456..3200f1acc91 100644 --- a/charts/incubator/lychee/SCALE/questions.yaml +++ b/charts/incubator/lychee/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,39 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +116,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,60 +135,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 80 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 80 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36034 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 80 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 80 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36034 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -275,176 +330,3 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false - # Set Pod Security Policy - - variable: podSecurityContext - group: "Advanced" - label: "Pod Security Context" - schema: - type: dict - attrs: - - variable: runAsNonRoot - label: "runAsNonRoot" - schema: - type: boolean - default: false - - variable: runAsUser - 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" - schema: - type: int - default: 0 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." - schema: - type: int - default: 568 - - variable: fsGroupChangePolicy - label: "When should we take ownership?" - schema: - type: string - default: "OnRootMismatch" - enum: - - value: "OnRootMismatch" - description: "OnRootMismatch" - - value: "Always" - description: "Always" diff --git a/charts/incubator/navidrome/SCALE/questions.yaml b/charts/incubator/navidrome/SCALE/questions.yaml index f5601c5518f..f65cb1436fb 100644 --- a/charts/incubator/navidrome/SCALE/questions.yaml +++ b/charts/incubator/navidrome/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,60 +123,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 4533 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 4533 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36027 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 4533 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 4533 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36027 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -275,104 +318,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -384,7 +332,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/incubator/node-red/SCALE/questions.yaml b/charts/incubator/node-red/SCALE/questions.yaml index d5b9a6f4822..544eafb56cb 100644 --- a/charts/incubator/node-red/SCALE/questions.yaml +++ b/charts/incubator/node-red/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,60 +123,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 1880 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 1880 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36028 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 1880 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 1880 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36028 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -275,104 +318,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -384,7 +332,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/incubator/nzbget/SCALE/questions.yaml b/charts/incubator/nzbget/SCALE/questions.yaml index 85010f5d717..22928683a7e 100644 --- a/charts/incubator/nzbget/SCALE/questions.yaml +++ b/charts/incubator/nzbget/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,60 +123,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 6789 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 6789 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36021 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 6789 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 6789 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36021 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -275,104 +318,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -384,7 +332,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/incubator/organizr/SCALE/questions.yaml b/charts/incubator/organizr/SCALE/questions.yaml index 1f01a33b628..d732f75a518 100644 --- a/charts/incubator/organizr/SCALE/questions.yaml +++ b/charts/incubator/organizr/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,39 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +116,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,60 +135,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 80 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 80 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36046 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 80 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 80 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36046 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -327,176 +382,3 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false - # Set Pod Security Policy - - variable: podSecurityContext - group: "Advanced" - label: "Pod Security Context" - schema: - type: dict - attrs: - - variable: runAsNonRoot - label: "runAsNonRoot" - schema: - type: boolean - default: false - - variable: runAsUser - 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" - schema: - type: int - default: 0 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." - schema: - type: int - default: 568 - - variable: fsGroupChangePolicy - label: "When should we take ownership?" - schema: - type: string - default: "OnRootMismatch" - enum: - - value: "OnRootMismatch" - description: "OnRootMismatch" - - value: "Always" - description: "Always" diff --git a/charts/incubator/podgrab/SCALE/questions.yaml b/charts/incubator/podgrab/SCALE/questions.yaml index 41f89e33092..0f3bd6aacdb 100644 --- a/charts/incubator/podgrab/SCALE/questions.yaml +++ b/charts/incubator/podgrab/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,8 +64,7 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - -# App env variables + # App env variables - variable: env group: "Configuration" label: "Image Environment" @@ -85,16 +85,15 @@ questions: type: int default: 240 required: true - # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -107,7 +106,6 @@ questions: label: "Value" schema: type: string - # Enable Host Networking - variable: hostNetwork group: "Networking" @@ -115,14 +113,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -134,60 +132,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8080 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 51080 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36047 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8080 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 51080 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36047 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Config Storage" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -244,7 +273,6 @@ questions: schema: type: string default: "1Gi" - - variable: hostPathMounts label: "Custom app storage" group: "Storage" @@ -299,97 +327,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -399,10 +339,9 @@ questions: schema: type: boolean default: false - # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/incubator/qbittorrent/SCALE/questions.yaml b/charts/incubator/qbittorrent/SCALE/questions.yaml index dff064e6bf0..01d504645f0 100644 --- a/charts/incubator/qbittorrent/SCALE/questions.yaml +++ b/charts/incubator/qbittorrent/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,59 +123,90 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8080 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8080 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36039 - required: true - - variable: tcp - label: "TCP Torrent connections" - description: "This service is used to process incomming torrent connections over TCP" + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8080 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8080 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36039 + required: true + - variable: torrent + label: "Torrent Service" + description: "Torrent Service" schema: type: dict attrs: @@ -174,8 +217,8 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string default: "NodePort" @@ -184,113 +227,126 @@ questions: description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" - schema: - type: dict - attrs: - - variable: protocol - label: "Port Type" - schema: - type: string - default: "TCP" - hidden: true - enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - - variable: port - label: "container port" - schema: - type: int - default: 6881 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 51413 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36040 - required: true - - variable: udp - label: "UDP Torrent connections" - description: "This service is used to process incomming torrent connections over UDP" - schema: - type: dict - attrs: - - variable: enabled - label: "Enable the service" - schema: - type: boolean - default: true - hidden: true - - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" schema: + show_if: [["type", "=", "LoadBalancer"]] type: string - default: "NodePort" - enum: - - value: "NodePort" - description: "NodePort" - - value: "ClusterIP" - description: "ClusterIP" - - variable: port - label: "Port configuration" + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: tcp + label: "TCP Service Port Configuration" schema: - type: string - default: "UDP" - hidden: true - enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - - variable: port - label: "container port" + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "TCP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 51413 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 51413 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36040 + required: true + - variable: udp + label: "UDP Service Port Configuration" schema: - type: int - default: 6881 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 51413 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36040 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "UDP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 51413 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 51413 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36040 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -347,7 +403,6 @@ questions: schema: type: string default: "100Gi" - - variable: hostPathMounts label: "Custom app storage" group: "Storage" @@ -402,104 +457,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -511,7 +471,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/incubator/readarr/SCALE/questions.yaml b/charts/incubator/readarr/SCALE/questions.yaml index 83303799858..f842de7a3a3 100644 --- a/charts/incubator/readarr/SCALE/questions.yaml +++ b/charts/incubator/readarr/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,60 +123,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8787 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8787 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36038 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8787 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8787 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36038 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -275,104 +318,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -384,7 +332,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/incubator/sabnzbd/SCALE/questions.yaml b/charts/incubator/sabnzbd/SCALE/questions.yaml index 73d64929e0b..68c99166689 100644 --- a/charts/incubator/sabnzbd/SCALE/questions.yaml +++ b/charts/incubator/sabnzbd/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,8 +64,6 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - - # Docker specific env - variable: env group: "Configuration" @@ -79,15 +78,21 @@ questions: type: string default: "" required: false + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -100,7 +105,6 @@ questions: label: "Value" schema: type: string - # Enable Host Networking - variable: hostNetwork group: "Networking" @@ -108,14 +112,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -127,60 +131,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8080 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8080 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36045 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8080 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8080 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36045 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -291,104 +326,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -400,7 +340,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/incubator/tvheadend/SCALE/questions.yaml b/charts/incubator/tvheadend/SCALE/questions.yaml index b293ef126cc..5ad48392a21 100644 --- a/charts/incubator/tvheadend/SCALE/questions.yaml +++ b/charts/incubator/tvheadend/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -54,7 +55,6 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - variable: timezone group: "Container Image" @@ -64,8 +64,50 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - - # Service Configuration + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" + - variable: envList + label: "Image environment" + group: "Configuration" + schema: + type: list + default: [] + items: + - variable: envItem + label: "Environment Variable" + schema: + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string # Enable Host Networking - variable: hostNetwork group: "Networking" @@ -73,14 +115,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -92,59 +134,90 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 9981 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 9981 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36042 - required: true + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 9981 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 9981 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36042 + required: true - variable: htsp - label: "HTSP service" - description: "Service to connect to htsp" + label: "HTSP Service" + description: "HTSP service" schema: type: dict attrs: @@ -153,60 +226,92 @@ questions: schema: type: boolean default: true + hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: tcp + label: "TCP Service Port Configuration" schema: - type: string - default: "TCP" - hidden: true - enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - - variable: port - label: "container port" - schema: - type: int - default: 9982 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 9982 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36043 - required: true + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "TCP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 9982 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 9982 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36043 + required: true - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -317,176 +422,3 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false - # Set Pod Security Policy - - variable: podSecurityContext - group: "Advanced" - label: "Pod Security Context" - schema: - type: dict - attrs: - - variable: runAsNonRoot - label: "runAsNonRoot" - schema: - type: boolean - default: false - - variable: runAsUser - 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" - schema: - type: int - default: 0 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." - schema: - type: int - default: 568 - - variable: fsGroupChangePolicy - label: "When should we take ownership?" - schema: - type: string - default: "OnRootMismatch" - enum: - - value: "OnRootMismatch" - description: "OnRootMismatch" - - value: "Always" - description: "Always" diff --git a/charts/incubator/unifi/SCALE/questions.yaml b/charts/incubator/unifi/SCALE/questions.yaml index 3e55996d9bd..89d3472596d 100644 --- a/charts/incubator/unifi/SCALE/questions.yaml +++ b/charts/incubator/unifi/SCALE/questions.yaml @@ -6,18 +6,19 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" description: "WARNING" -portals: web_portal: protocols: - "$kubernetes-resource_configmap_portal_protocol" @@ -41,7 +42,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +63,39 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +115,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,59 +134,90 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTPS" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8443 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8443 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36035 - required: true - - variable: tcp - label: "Unifi Device Communications" - description: "This services is used for devices to communicate with the controller" + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8443 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8443 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36035 + required: true + - variable: comm + label: "Unifi Device Communication Service" + description: "Unifi Device Communication Service" schema: type: dict attrs: @@ -174,59 +228,90 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "LoadBalancer" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: tcp + label: "TCP Service Port Configuration" schema: - type: string - default: "TCP" - hidden: true - enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - - variable: port - label: "container port" - schema: - type: int - default: 8080 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8080 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36036 - required: true - - variable: udp - label: "Stun Device Communications" - description: "This services is used for devices to communicate with the controller using STUN" + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "TCP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8080 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8080 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36036 + required: true + - variable: stun + label: "STUN Device Communication Service" + description: "STUN Device Communication Service" schema: type: dict attrs: @@ -237,59 +322,90 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "LoadBalancer" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: tcp + label: "TCP Service Port Configuration" schema: - type: string - default: "UDP" - hidden: true - enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - - variable: port - label: "container port" - schema: - type: int - default: 3478 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 3478 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36037 - required: true + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "UDP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 3478 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 3478 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36037 + required: true - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -346,8 +462,6 @@ questions: schema: type: string default: "100Gi" - - - variable: hostPathMounts label: "Custom app storage" group: "Storage" @@ -402,234 +516,3 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - variable: tcp - label: "TCP Ingress Configuration" - schema: - type: dict - attrs: - - variable: enabled - label: "Enable TCP Ingress" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Select Ingress Type" - schema: - type: string - default: "TCP" - required: true - editable: false - hidden: true - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "unificom" - required: true - enum: - - value: "unificom" - description: "Unifi Communications TCP: port 8080" - - variable: udp - label: "UDP Ingress Configuration" - schema: - type: dict - attrs: - - variable: enabled - label: "Enable UDP Ingress" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Select Ingress Type" - schema: - type: string - default: "UDP" - required: true - editable: false - hidden: true - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "stun-udp" - required: true - enum: - - value: "stun-udp" - description: "STUN UDP: port 3478" - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false - # Set Pod Security Policy - - variable: podSecurityContext - group: "Advanced" - label: "Pod Security Context" - schema: - type: dict - attrs: - - variable: runAsNonRoot - label: "runAsNonRoot" - schema: - type: boolean - default: false - - variable: runAsUser - 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" - schema: - type: int - default: 0 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." - schema: - type: int - default: 568 - - variable: fsGroupChangePolicy - label: "When should we take ownership?" - schema: - type: string - default: "OnRootMismatch" - enum: - - value: "OnRootMismatch" - description: "OnRootMismatch" - - value: "Always" - description: "Always" diff --git a/charts/stable/bitwarden/SCALE/questions.yaml b/charts/stable/bitwarden/SCALE/questions.yaml index 089138c86d3..d35ae274ff7 100644 --- a/charts/stable/bitwarden/SCALE/questions.yaml +++ b/charts/stable/bitwarden/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -62,7 +64,7 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" -# Configure Bitwarden: + # Configure Bitwarden: - variable: bitwardenrs label: "" group: "Configuration" @@ -173,7 +175,6 @@ questions: schema: type: string default: "" - - variable: smtp label: "SMTP Settings (Email)" schema: @@ -256,7 +257,6 @@ questions: schema: type: boolean default: false - - variable: allowSignups label: "Allow Signup" description: "Allow any user to sign-up: https://github.com/dani-garcia/bitwarden_rs/wiki/Disable-registration-of-new-users" @@ -275,14 +275,12 @@ questions: schema: type: string default: "" - - variable: showPasswordHint label: "Show password hints" description: "https://github.com/dani-garcia/bitwarden_rs/wiki/Password-hint-display" schema: type: boolean default: true - - variable: signupwhitelistenable label: "Enable Signup Whitelist" description: "allowSignups is ignored if set" @@ -360,15 +358,27 @@ questions: schema: type: string default: "" + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -389,19 +399,17 @@ questions: type: boolean default: false hidden: true - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict - hidden: true attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict - hidden: true attrs: - variable: enabled label: "Enable the service" @@ -410,60 +418,92 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" - hidden: true + default: "NodePort" enum: + - value: "NodePort" + description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: true - enum: - - value: HTTP - description: "HTTP" - - variable: port - label: "container port" - schema: - type: int - default: 8080 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8080 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36000 - required: true - hidden: true + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8080 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8080 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36000 + required: true - variable: ws - label: "Websocket service" - description: "Websocket Service" + label: "WebSocket Service" + description: "WebSocket Service" schema: type: dict - hidden: true attrs: - variable: enabled label: "Enable the service" @@ -472,59 +512,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string default: "ClusterIP" - hidden: true enum: + - value: "NodePort" + description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: ws + label: "WebSocket Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: true - enum: - - value: HTTP - description: "HTTP" - - variable: port - label: "container port" - schema: - type: int - default: 3012 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 3012 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36001 - required: true - hidden: true - -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 3012 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 3012 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36001 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -746,104 +818,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -855,7 +832,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/stable/collabora-online/SCALE/questions.yaml b/charts/stable/collabora-online/SCALE/questions.yaml index 9af0a96b809..186da46c71b 100644 --- a/charts/stable/collabora-online/SCALE/questions.yaml +++ b/charts/stable/collabora-online/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -42,7 +44,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -64,8 +65,7 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - - # environmentVariables Configuraiton + # envList Configuraiton - variable: env group: "Configuration" label: "Environment Variables Configuration" @@ -111,14 +111,14 @@ questions: type: string default: 'collabora\.domain\.tld' # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -131,8 +131,6 @@ questions: label: "Value" schema: type: string - - # Service Configuration # Enable Host Networking - variable: hostNetwork group: "Networking" @@ -140,14 +138,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -159,56 +157,87 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 9980 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 9980 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36004 - required: true + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 9980 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 9980 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36004 + required: true # Reverse Proxy - variable: hostPathMounts label: "Custom app storage" @@ -264,90 +293,3 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" diff --git a/charts/stable/deepstack-cpu/SCALE/questions.yaml b/charts/stable/deepstack-cpu/SCALE/questions.yaml index 0f6d92f0eae..ec6504e10ec 100644 --- a/charts/stable/deepstack-cpu/SCALE/questions.yaml +++ b/charts/stable/deepstack-cpu/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -26,7 +28,6 @@ portals: ports: - "$kubernetes-resource_configmap_portal_port" questions: - # Portal - variable: portal group: "Container Image" @@ -43,7 +44,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -65,16 +65,39 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -87,7 +110,6 @@ questions: label: "Value" schema: type: string - - variable: env group: "Configuration" label: "Image Environment" @@ -147,24 +169,21 @@ questions: type: string default: "/modelstore/detection" required: true - # Enable Host Networking - - variable: hostNetwork group: "Networking" label: "Enable Host Networking" schema: type: boolean default: false - - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -176,58 +195,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 5000 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 5000 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36005 - required: true - -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 5000 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 5000 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36005 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" group: "Storage" @@ -340,124 +389,3 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false diff --git a/charts/stable/emby/SCALE/questions.yaml b/charts/stable/emby/SCALE/questions.yaml index e3dc93459f6..7ab7940ecbb 100644 --- a/charts/stable/emby/SCALE/questions.yaml +++ b/charts/stable/emby/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,57 +123,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8096 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8096 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36006 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8096 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8096 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36006 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" group: "Storage" @@ -283,104 +326,9 @@ questions: $ref: - "definitions/scaleGPU" attrs: [] - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -392,7 +340,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/stable/esphome/SCALE/questions.yaml b/charts/stable/esphome/SCALE/questions.yaml index 7a6a47c2c7b..751ee59700c 100644 --- a/charts/stable/esphome/SCALE/questions.yaml +++ b/charts/stable/esphome/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -63,15 +65,15 @@ questions: $ref: - "definitions/timezone" # Configure Enviroment Variables - - variable: environment + - variable: envList + label: "Image environment" group: "Configuration" - label: "Environment Variables" schema: type: list default: [] items: - - variable: environmentVariable - label: "" + - variable: envItem + label: "Environment Variable" schema: type: dict attrs: @@ -83,7 +85,6 @@ questions: label: "Value" schema: type: string - # Service Configuration # Enable Host Networking - variable: hostNetwork group: "Networking" @@ -91,14 +92,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -110,56 +111,87 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 6052 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 6052 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36007 - required: true + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 6052 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 6052 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36007 + required: true # Configure app volumes - variable: persistence label: "Integrated Persistent Storage" @@ -325,96 +357,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -426,7 +371,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/stable/handbrake/SCALE/questions.yaml b/charts/stable/handbrake/SCALE/questions.yaml index 63f3798bab6..9cdf9d820f8 100644 --- a/charts/stable/handbrake/SCALE/questions.yaml +++ b/charts/stable/handbrake/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -26,7 +28,6 @@ portals: ports: - "$kubernetes-resource_configmap_portal_port" questions: - # Portal - variable: portal group: "Container Image" @@ -43,7 +44,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -65,16 +65,39 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - - # Configure Enviroment Variables - - variable: environmentVariables + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" + # Configure Enviroment Variables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -87,7 +110,6 @@ questions: label: "Value" schema: type: string - - variable: env group: "Configuration" label: "Image Environment" @@ -103,28 +125,28 @@ questions: show_subquestions_if: true subquestions: - variable: DISPLAY_WIDTH - label: "DISPLAY_WIDTH" + label: "DISPLAY_WIDTH" description: "Width (in pixels) of the application's window." schema: type: string default: "1280" required: true - variable: DISPLAY_HEIGHT - label: "DISPLAY_HEIGHT" + label: "DISPLAY_HEIGHT" description: "Height (in pixels) of the application's window." schema: type: string default: "768" required: true - variable: SECURE_CONNECTION - label: "SECURE_CONNECTION" + label: "SECURE_CONNECTION" description: "When set to 1, an encrypted connection is used to access the application's GUI (either via a web browser or VNC client). See the Security section for more details." schema: type: string default: "0" required: true - variable: VNC_PASSWORD - label: "VNC_PASSWORD" + label: "VNC_PASSWORD" description: "Password needed to connect to the application's GUI. See the VNC Password section for more details." schema: private: true @@ -139,52 +161,48 @@ questions: show_subquestions_if: true subquestions: - variable: AUTOMATED_CONVERSION_PRESET - label: "AUTOMATED_CONVERSION_PRESET" + label: "AUTOMATED_CONVERSION_PRESET" description: "HandBrake preset used by the automatic video converter. Identification of a preset must follow the format /" schema: type: string - default: 'General/Very Fast 1080p30' + default: "General/Very Fast 1080p30" required: true - variable: AUTOMATED_CONVERSION_FORMAT - label: "AUTOMATED_CONVERSION_FORMAT" + label: "AUTOMATED_CONVERSION_FORMAT" description: "Video container format used by the automatic video converter for output files. This is typically the video filename extension." schema: type: string - default: 'mp4' + default: "mp4" required: true - variable: AUTOMATED_CONVERSION_KEEP_SOURCE - label: "AUTOMATED_CONVERSION_KEEP_SOURCE" + label: "AUTOMATED_CONVERSION_KEEP_SOURCE" description: "When set to 0, a video that has been successfully converted is removed from the watch folder." schema: type: string default: "1" required: true - variable: AUTOMATED_CONVERSION_NON_VIDEO_FILE_ACTION - label: "AUTOMATED_CONVERSION_NON_VIDEO_FILE_ACTION" + label: "AUTOMATED_CONVERSION_NON_VIDEO_FILE_ACTION" description: "When set to ignore, a non-video file found in the watch folder is ignored. If set to copy, a non-video file is copied as-is to the output folder." schema: type: string - default: 'ignore' + default: "ignore" required: true - - # Enable Host Networking - - variable: hostNetwork group: "Networking" label: "Enable Host Networking" schema: type: boolean default: false - - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -196,58 +214,89 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 5800 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 5800 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36002 - required: true + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 5800 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 5800 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36002 + required: true - variable: vnc - label: "VNC service" + label: "VNC Service" description: "VNC Service" schema: type: dict @@ -259,58 +308,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: tcp + label: "TCP Service Port Configuration" schema: - type: string - default: "TCP" - hidden: true - enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - - variable: port - label: "container port" - schema: - type: int - default: 5900 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 5900 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36003 - required: true - -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "TCP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 5900 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 5900 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36003 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" group: "Storage" @@ -458,124 +537,3 @@ questions: required: true default: "/dev/ttyACM0" editable: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false diff --git a/charts/stable/home-assistant/SCALE/questions.yaml b/charts/stable/home-assistant/SCALE/questions.yaml index c3abc6c105b..4701eef3711 100644 --- a/charts/stable/home-assistant/SCALE/questions.yaml +++ b/charts/stable/home-assistant/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -62,7 +64,6 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - - variable: git group: "Configuration" label: "Home-Assistant Git Settings" @@ -79,15 +80,39 @@ questions: schema: type: string default: "" + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -107,14 +132,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -126,57 +151,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8123 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8123 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36008 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8123 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8123 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36008 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" group: "Storage" @@ -324,175 +380,3 @@ questions: required: true default: "/dev/ttyACM0" editable: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false - # Set Pod Security Policy - - variable: podSecurityContext - group: "Advanced" - label: "Pod Security Context" - schema: - type: dict - attrs: - - variable: runAsNonRoot - label: "runAsNonRoot" - schema: - type: boolean - default: false - - variable: runAsUser - 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" - schema: - type: int - default: 0 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [5, 20, 24] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - - variable: fsGroup - label: "The group that should own ALL storage." - schema: - type: int - default: 0 - - variable: fsGroupChangePolicy - label: "When should we chmod/chown?" - schema: - type: string - default: "OnRootMismatch" - enum: - - value: "OnRootMismatch" - description: "OnRootMismatch" - - value: "Always" - description: "Always" diff --git a/charts/stable/jackett/SCALE/questions.yaml b/charts/stable/jackett/SCALE/questions.yaml index 66d7063a650..ad1c7e7dbd8 100644 --- a/charts/stable/jackett/SCALE/questions.yaml +++ b/charts/stable/jackett/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -62,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -91,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -110,57 +123,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 9117 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 9117 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36009 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 9117 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 9117 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36009 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" group: "Storage" @@ -273,104 +317,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -382,7 +331,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/stable/jellyfin/SCALE/questions.yaml b/charts/stable/jellyfin/SCALE/questions.yaml index 423f4cb4dd1..73071952139 100644 --- a/charts/stable/jellyfin/SCALE/questions.yaml +++ b/charts/stable/jellyfin/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,57 +123,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8096 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8096 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36010 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8096 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8096 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36010 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" group: "Storage" @@ -283,104 +326,9 @@ questions: $ref: - "definitions/scaleGPU" attrs: [] - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -392,7 +340,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/stable/kms/SCALE/questions.yaml b/charts/stable/kms/SCALE/questions.yaml index b12daac9ddd..ca8feb22d28 100644 --- a/charts/stable/kms/SCALE/questions.yaml +++ b/charts/stable/kms/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -33,7 +35,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -55,16 +56,39 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -84,14 +108,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -103,57 +127,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 1688 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 1688 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36011 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 1688 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 1688 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36011 + required: true + ## TrueCharts Specific - variable: hostPathMounts label: "Custom app storage" group: "Storage" @@ -208,130 +263,3 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "KMS Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: enabled - label: "Enable TCP Reverse Proxy" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Select Reverse Proxy Type" - schema: - type: string - default: "TCP" - required: true - editable: false - hidden: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "kms" - required: true - enum: - - value: "kms" - description: "KMS: port 1688" - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false - # Set Pod Security Policy - - variable: podSecurityContext - group: "Advanced" - label: "Pod Security Context" - schema: - type: dict - attrs: - - variable: runAsNonRoot - label: "runAsNonRoot" - schema: - type: boolean - default: false - - variable: runAsUser - 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" - schema: - type: int - default: 0 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 0 - - variable: fsGroup - label: "The group that should own ALL storage." - schema: - type: int - default: 0 - - variable: fsGroupChangePolicy - label: "When should we chmod/chown?" - schema: - type: string - default: "OnRootMismatch" - enum: - - value: "OnRootMismatch" - description: "OnRootMismatch" - - value: "Always" - description: "Always" diff --git a/charts/stable/lidarr/SCALE/questions.yaml b/charts/stable/lidarr/SCALE/questions.yaml index 9168ca937fb..59fed53cdbd 100644 --- a/charts/stable/lidarr/SCALE/questions.yaml +++ b/charts/stable/lidarr/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,57 +123,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8686 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8686 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36012 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8686 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8686 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36012 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" group: "Storage" @@ -274,104 +317,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -383,7 +331,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/stable/ombi/SCALE/questions.yaml b/charts/stable/ombi/SCALE/questions.yaml index b3591906710..3fac0408d29 100644 --- a/charts/stable/ombi/SCALE/questions.yaml +++ b/charts/stable/ombi/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -92,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -111,57 +123,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 3579 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 3579 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36013 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 3579 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 3579 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36013 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" group: "Storage" @@ -274,104 +317,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -383,7 +331,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/stable/plex/SCALE/questions.yaml b/charts/stable/plex/SCALE/questions.yaml index e5a56723493..28f0251e267 100644 --- a/charts/stable/plex/SCALE/questions.yaml +++ b/charts/stable/plex/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,7 +64,6 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - - variable: env group: "Configuration" label: "Image Environment" @@ -88,15 +88,21 @@ questions: schema: type: string default: "" + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -116,14 +122,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -135,57 +141,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTPS" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 32400 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 32400 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 32400 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTPS" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 32400 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 32400 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 32400 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" group: "Storage" @@ -307,107 +344,9 @@ questions: $ref: - "definitions/scaleGPU" attrs: [] - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - value: "plex" - description: "Plex: HTTPS/TLS port 32400" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -419,7 +358,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/stable/radarr/SCALE/questions.yaml b/charts/stable/radarr/SCALE/questions.yaml index 7e5b75ca0ee..ea13281786c 100644 --- a/charts/stable/radarr/SCALE/questions.yaml +++ b/charts/stable/radarr/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,17 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -93,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -112,57 +123,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 7878 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 7878 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36016 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 7878 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 7878 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36016 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" group: "Storage" @@ -275,103 +317,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -383,7 +331,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/stable/sonarr/SCALE/questions.yaml b/charts/stable/sonarr/SCALE/questions.yaml index 58ffeac9845..752d2be3911 100644 --- a/charts/stable/sonarr/SCALE/questions.yaml +++ b/charts/stable/sonarr/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -85,7 +97,6 @@ questions: label: "Value" schema: type: string - # Enable Host Networking - variable: hostNetwork group: "Networking" @@ -93,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -112,57 +123,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8989 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8989 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36017 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8989 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8989 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36017 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" group: "Storage" @@ -275,104 +317,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -384,7 +331,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/stable/syncthing/SCALE/questions.yaml b/charts/stable/syncthing/SCALE/questions.yaml index a9f1dcd08fc..bf343fda1cb 100644 --- a/charts/stable/syncthing/SCALE/questions.yaml +++ b/charts/stable/syncthing/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -53,16 +55,15 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -75,7 +76,6 @@ questions: label: "Value" schema: type: string - # Enable Host Networking - variable: hostNetwork group: "Networking" @@ -83,14 +83,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -102,57 +102,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "Container port" - schema: - type: int - default: 8384 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8384 - editable: false - hidden: true - # - variable: nodePort - # label: "Host nodePort to expose to (optional)" - # description: "Only gets used when nodePort is selected" - # schema: - # type: int - # min: 9000 - # max: 65535 - # default: 36024 - # required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8384 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8384 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36024 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" group: "Storage" @@ -265,96 +296,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -366,7 +310,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/stable/tautulli/SCALE/questions.yaml b/charts/stable/tautulli/SCALE/questions.yaml index 9d0c153dfb3..e9b9d33bbf4 100644 --- a/charts/stable/tautulli/SCALE/questions.yaml +++ b/charts/stable/tautulli/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,27 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -85,7 +97,6 @@ questions: label: "Value" schema: type: string - # Enable Host Networking - variable: hostNetwork group: "Networking" @@ -93,14 +104,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -112,57 +123,88 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8181 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8181 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36018 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8181 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8181 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36018 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" group: "Storage" @@ -275,104 +317,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -384,7 +331,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/stable/traefik/SCALE/questions.yaml b/charts/stable/traefik/SCALE/questions.yaml index 04324aa77e5..ae208854589 100644 --- a/charts/stable/traefik/SCALE/questions.yaml +++ b/charts/stable/traefik/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -50,103 +52,18 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" + - variable: env + group: "Configuration" + label: "Image Environment" schema: type: dict attrs: - - variable: main - label: "WebUI" + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" schema: - type: dict - attrs: - - variable: enabled - label: "Enable Web Reverse Proxy" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP-IR" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "api@internal" - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "TraefikService" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + default: "002" - variable: traefik label: "(Advanced) Traefik Settings" group: "Advanced" @@ -742,17 +659,9 @@ questions: schema: type: string default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -764,7 +673,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict @@ -819,12 +728,12 @@ questions: description: "Please be sure to set the UI to a different port or adapter" group: "WARNING" schema: - type: dict - attrs: - - variable: confirm-warning - description: "Check this to confirm you have made precautions against conflicts on port 80 and 443, such as running the TrueNAS SCALE UI on a different port or adapter." - label: "I understand above warning and its consequences" - schema: - type: boolean - default: false - required: true + type: dict + attrs: + - variable: confirm-warning + description: "Check this to confirm you have made precautions against conflicts on port 80 and 443, such as running the TrueNAS SCALE UI on a different port or adapter." + label: "I understand above warning and its consequences" + schema: + type: boolean + default: false + required: true diff --git a/charts/stable/transmission/SCALE/questions.yaml b/charts/stable/transmission/SCALE/questions.yaml index bc6bc9ef240..3b30aad8db8 100644 --- a/charts/stable/transmission/SCALE/questions.yaml +++ b/charts/stable/transmission/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,7 +64,6 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - - variable: transmissionConfig group: "Configuration" label: "Transmission Settings" @@ -245,16 +245,27 @@ questions: schema: type: int default: 14 - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -267,7 +278,6 @@ questions: label: "Value" schema: type: string - # Enable Host Networking - variable: hostNetwork group: "Networking" @@ -275,14 +285,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -294,59 +304,90 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 9091 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 9091 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36019 - required: true - - variable: tcp - label: "TCP Torrent connections" - description: "This service is used to process incomming torrent connections over TCP" + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 9091 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 9091 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36019 + required: true + - variable: torrent + label: "Torrent Service" + description: "Torrent service" schema: type: dict attrs: @@ -357,8 +398,8 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string default: "NodePort" @@ -367,110 +408,123 @@ questions: description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" - schema: - type: dict - attrs: - - variable: protocol - label: "Port Type" - schema: - type: string - default: "TCP" - hidden: true - enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - - variable: port - label: "container port" - schema: - type: int - default: 51413 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 51413 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36020 - required: true - - variable: udp - label: "UDP Torrent connections" - description: "This service is used to process incomming torrent connections over UDP" - schema: - type: dict - attrs: - - variable: enabled - label: "Enable the service" - schema: - type: boolean - default: true - hidden: true - - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" schema: + show_if: [["type", "=", "LoadBalancer"]] type: string - default: "NodePort" - enum: - - value: "NodePort" - description: "NodePort" - - value: "ClusterIP" - description: "ClusterIP" - - variable: port - label: "Port configuration" + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: tcp + label: "TCP Service Port Configuration" schema: - type: string - default: "UDP" - hidden: true - enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - - variable: port - label: "container port" + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "TCP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 51413 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 51413 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36020 + required: true + - variable: udp + label: "UDP Service Port Configuration" schema: - type: int - default: 51413 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 51413 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36020 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "UDP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 51413 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 51413 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36020 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" group: "Storage" @@ -583,104 +637,9 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -692,7 +651,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/charts/stable/truecommand/SCALE/questions.yaml b/charts/stable/truecommand/SCALE/questions.yaml index 9386cf2bae4..3039865a702 100644 --- a/charts/stable/truecommand/SCALE/questions.yaml +++ b/charts/stable/truecommand/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -41,7 +43,6 @@ questions: editable: false type: boolean default: true - # Update Policy - variable: strategyType group: "Container Image" @@ -63,16 +64,39 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Configure Enviroment Variables - - variable: environmentVariables + - variable: envList label: "Image environment" group: "Configuration" schema: type: list default: [] items: - - variable: environmentVariable + - variable: envItem label: "Environment Variable" schema: type: dict @@ -85,7 +109,6 @@ questions: label: "Value" schema: type: string - # Enable Host Networking - variable: hostNetwork group: "Networking" @@ -93,14 +116,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -112,60 +135,91 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 80 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 80 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36044 - required: true -## TrueCharts Specific + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 80 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 80 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36044 + required: true + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" - description: "Websocket Service" + description: "Integrated Persistent Storage" group: "Storage" schema: type: dict @@ -222,7 +276,6 @@ questions: schema: type: string default: "100Gi" - - variable: hostPathMounts label: "Custom app storage" group: "Storage" @@ -277,177 +330,3 @@ questions: schema: type: hostpath required: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" - - - variable: PUID - group: "Advanced" - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - - variable: PGID - group: "Advanced" - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" - # Enable privileged - - variable: securityContext - group: "Advanced" - label: "Security Context" - schema: - type: dict - attrs: - - variable: privileged - label: "Enable privileged mode for Common-Chart based charts" - schema: - type: boolean - default: false - # Set Pod Security Policy - - variable: podSecurityContext - group: "Advanced" - label: "Pod Security Context" - schema: - type: dict - attrs: - - variable: runAsNonRoot - label: "runAsNonRoot" - schema: - type: boolean - default: false - - variable: runAsUser - 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" - schema: - type: int - default: 0 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." - schema: - type: int - default: 568 - - variable: fsGroupChangePolicy - label: "When should we take ownership?" - schema: - type: string - default: "OnRootMismatch" - enum: - - value: "OnRootMismatch" - description: "OnRootMismatch" - - value: "Always" - description: "Always" diff --git a/charts/stable/zwavejs2mqtt/SCALE/questions.yaml b/charts/stable/zwavejs2mqtt/SCALE/questions.yaml index 96a21f53d50..cb2d11d4438 100644 --- a/charts/stable/zwavejs2mqtt/SCALE/questions.yaml +++ b/charts/stable/zwavejs2mqtt/SCALE/questions.yaml @@ -6,13 +6,15 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" + description: "Configure Network and Services for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -53,7 +55,6 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - variable: timezone group: "Container Image" @@ -63,8 +64,26 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - - # Service Configuration + - variable: envList + label: "Image environment" + group: "Configuration" + schema: + type: list + default: [] + items: + - variable: envItem + label: "Environment Variable" + schema: + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string # Enable Host Networking - variable: hostNetwork group: "Networking" @@ -72,14 +91,14 @@ questions: schema: type: boolean default: false - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict @@ -91,59 +110,90 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 8091 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 8091 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36022 - required: true + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 8091 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 8091 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36022 + required: true - variable: ws - label: "WebSocket service" - description: "This server is used to process WebSocket Connections" + label: "WebSocket Service" + description: "WebSocket Service" schema: type: dict attrs: @@ -154,8 +204,8 @@ questions: default: true hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string default: "ClusterIP" @@ -164,46 +214,77 @@ questions: description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + - variable: externalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: ws + label: "WebSocket Service Port Configuration" schema: - type: string - default: "TCP" - hidden: true - enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - - variable: port - label: "container port" - schema: - type: int - default: 3000 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 3000 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36023 - required: true + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "TCP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 3000 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 3000 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36023 + required: true # Configure app volumes - variable: persistence label: "Integrated Persistent Storage" @@ -352,96 +433,9 @@ questions: required: true default: "/dev/ttyACM0" editable: true - - variable: ingress - label: "" - group: "Reverse Proxy Configuration" - schema: - type: dict - attrs: - - variable: main - label: "WebUI" - schema: - type: dict - attrs: - - variable: certType - label: "Select Reverse-Proxy Type" - schema: - type: string - default: "disabled" - enum: - - value: "disabled" - description: "Disabled" - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: type - label: "Reverse Proxy Type" - schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - show_if: [["certType", "!=", "disabled"]] - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - show_if: [["certType", "!=", "disabled"]] - type: string - default: "" # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -453,7 +447,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Advanced" + group: "Security" label: "Pod Security Context" schema: type: dict diff --git a/docs/development/app development/questions-yaml.md b/docs/development/app development/questions-yaml.md index 89b30cf1326..d759844cdcc 100644 --- a/docs/development/app development/questions-yaml.md +++ b/docs/development/app development/questions-yaml.md @@ -88,21 +88,27 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure / service for container" - - name: "Storage and Devices" + description: "Configure Network and Services for container" + - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Reverse Proxy Configuration" - description: "Reverse Proxy configuration" + - name: "Ingress Configuration" + description: "Ingress Configuration" + - name: "Security" + description: "Configure security context" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" ``` ##### General Configuration options -These options are always included because almost every chart (eventually) has a use for them and/or other parts of the common chart depend on them. +These options are always* included because almost every chart (eventually) has a use for them and/or other parts of the common chart depend on them. They are called general options, because they affect the basic functionalities of a chart. For example: Custom User environment variables, permissions and timezones. +*`PUID`, `PGID`, `UMASK` are only included when they are needed. + ``` - variable: timezone group: "Configuration" @@ -113,6 +119,31 @@ They are called general options, because they affect the basic functionalities o $ref: - "definitions/timezone" + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: PUID + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" + # Configure Custom Enviroment Variables - variable: environmentVariables label: "Image environment" @@ -136,33 +167,12 @@ They are called general options, because they affect the basic functionalities o type: string ``` -And at the bottom some advanced settings: -``` - - variable: PUID - group: "Advanced" - label: "Common Group ID" - description: "The UserID of the user running any included common chart-based pods" - schema: - type: int - default: 568 +##### Security Context Configuration options - - variable: PGID - group: "Advanced" - label: "Storage and Common Group ID" - description: "The groupID of the user/group running any included common chart-based pods and owning the files!" - schema: - type: int - default: 568 - - variable: UMASK - group: "Advanced" - label: "UMASK (Common Chart)" - description: "The UMASK used (if supported) by any included common chart-based pod" - schema: - type: string - default: "002" +``` # Enable privileged - variable: securityContext - group: "Advanced" + group: "Security" label: "Security Context" schema: type: dict @@ -172,4 +182,56 @@ And at the bottom some advanced settings: schema: type: boolean default: false -``` + # Set Pod Security Policy + - variable: podSecurityContext + group: "Security" + label: "Pod Security Context" + schema: + type: dict + attrs: + - variable: runAsNonRoot + label: "runAsNonRoot" + schema: + type: boolean + default: false + - variable: runAsUser + 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" + schema: + type: int + default: 0 + - variable: supplementalGroups + label: "supplementalGroups" + description: "Additional groups this App needs access to" + schema: + type: list + default: [] + items: + - variable: Group + label: "Group" + schema: + type: int + default: 568 + - variable: fsGroup + label: "fsGroup" + description: "The group that should own ALL storage." + schema: + type: int + default: 568 + - variable: fsGroupChangePolicy + label: "When should we take ownership?" + schema: + type: string + default: "OnRootMismatch" + enum: + - value: "OnRootMismatch" + description: "OnRootMismatch" + - value: "Always" + description: "Always" +``` \ No newline at end of file diff --git a/docs/development/app development/services.md b/docs/development/app development/services.md index 43c1fbd2ff6..84987a0fc97 100644 --- a/docs/development/app development/services.md +++ b/docs/development/app development/services.md @@ -26,75 +26,108 @@ Every App is required to have a main service, the primary thing that users (or o Please keep in mind that every App is different, some just have one service (which *ALWAYS* has to be called `main`) and others need more (which each has to have an unique name). Every App also uses different ports, so please alter accordingly. ``` - - variable: services + - variable: service group: "Networking" - label: "Configure Service" + label: "Configure Service(s)" schema: type: dict attrs: - variable: main - label: "Main service" + label: "Main Service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict attrs: - variable: enabled - label: "Enable the service" - schema: - type: boolean - default: true - hidden: true + label: "Enable the service" + schema: + type: boolean + default: true + hidden: true - variable: type - label: "Service type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" schema: type: string - default: "ClusterIP" + default: "NodePort" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - - variable: port - label: "Port configuration" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + required: true + - variable: exetrnalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + required: true + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" schema: type: dict attrs: - - variable: protocol - label: "Port Type" + - variable: main + label: "Main Service Port Configuration" schema: - type: string - default: "HTTP" - hidden: false - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - variable: port - label: "container port" - schema: - type: int - default: 80 - editable: false - hidden: true - - variable: targetport - label: "Internal Service port" - description: "When connecting internally to this App, you'll need this port" - schema: - type: int - default: 80 - editable: false - hidden: true - - variable: nodePort - label: "(optional) host nodePort to expose to" - description: "only get used when nodePort is selected" - schema: - type: int - min: 9000 - max: 65535 - default: 36052 - required: true + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 5076 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 5076 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 36041 + required: true ``` ##### Unlimited custom services From f94206ee60a67ec764dee103ced3d8251fa19a79 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sat, 22 May 2021 22:43:29 +0200 Subject: [PATCH 03/11] Common 4.0 App Refactor Part 3 - Ornias --- .github/workflows/apps.yaml | 12 ++ charts/deprecated/nzbhydra/Chart.yaml | 2 +- charts/incubator/appdaemon/Chart.yaml | 2 +- charts/incubator/bazarr/Chart.yaml | 2 +- charts/incubator/calibre-web/Chart.yaml | 2 +- charts/incubator/deluge/Chart.yaml | 2 +- charts/incubator/fireflyiii/Chart.yaml | 2 +- charts/incubator/freshrss/Chart.yaml | 2 +- charts/incubator/gaps/Chart.yaml | 2 +- charts/incubator/grocy/Chart.yaml | 2 +- charts/incubator/heimdall/Chart.yaml | 2 +- charts/incubator/lazylibrarian/Chart.yaml | 2 +- charts/incubator/lychee/Chart.yaml | 2 +- charts/incubator/navidrome/Chart.yaml | 2 +- charts/incubator/node-red/Chart.yaml | 2 +- charts/incubator/nzbget/Chart.yaml | 2 +- charts/incubator/organizr/Chart.yaml | 2 +- charts/incubator/podgrab/Chart.yaml | 2 +- charts/incubator/qbittorrent/Chart.yaml | 2 +- charts/incubator/readarr/Chart.yaml | 2 +- charts/incubator/sabnzbd/Chart.yaml | 2 +- charts/incubator/tvheadend/Chart.yaml | 2 +- charts/incubator/unifi/Chart.yaml | 2 +- charts/library/common-test/Chart.yaml | 2 +- .../library/common-test/ci/basic-values.yaml | 22 +++ charts/library/common-test/values.yaml | 6 - charts/library/common/values.yaml | 2 +- charts/stable/bitwarden/Chart.yaml | 2 +- .../stable/bitwarden/templates/_secrets.tpl | 1 + charts/stable/collabora-online/Chart.yaml | 2 +- charts/stable/deepstack-cpu/Chart.yaml | 2 +- charts/stable/emby/Chart.yaml | 2 +- charts/stable/esphome/Chart.yaml | 2 +- charts/stable/handbrake/Chart.yaml | 2 +- charts/stable/handbrake/values.yaml | 6 - charts/stable/home-assistant/Chart.yaml | 2 +- charts/stable/jackett/Chart.yaml | 2 +- charts/stable/jellyfin/Chart.yaml | 2 +- charts/stable/kms/Chart.yaml | 2 +- charts/stable/lidarr/Chart.yaml | 2 +- charts/stable/ombi/Chart.yaml | 2 +- charts/stable/plex/Chart.yaml | 2 +- charts/stable/radarr/Chart.yaml | 2 +- charts/stable/sonarr/Chart.yaml | 2 +- charts/stable/syncthing/Chart.yaml | 2 +- charts/stable/tautulli/Chart.yaml | 2 +- charts/stable/traefik/Chart.yaml | 4 +- charts/stable/traefik/SCALE/questions.yaml | 139 +++++++++++++++--- charts/stable/traefik/values.yaml | 2 +- charts/stable/transmission/Chart.lock | 6 - charts/stable/transmission/Chart.yaml | 2 +- .../transmission/charts/common-4.1.1.tgz | Bin 24520 -> 0 bytes charts/stable/truecommand/Chart.yaml | 2 +- charts/stable/zwavejs2mqtt/Chart.yaml | 2 +- 54 files changed, 197 insertions(+), 89 deletions(-) create mode 100644 charts/library/common-test/ci/basic-values.yaml delete mode 100644 charts/stable/transmission/Chart.lock delete mode 100644 charts/stable/transmission/charts/common-4.1.1.tgz diff --git a/.github/workflows/apps.yaml b/.github/workflows/apps.yaml index e93c61ff675..a68f406640f 100644 --- a/.github/workflows/apps.yaml +++ b/.github/workflows/apps.yaml @@ -156,6 +156,18 @@ jobs: with: test-results: test.json + - name: Run tests + if: ${{ steps.prep-lint.outputs.unittests == 'true' }} + run: | + if grep -q "FAIL" test.json + then + echo "Unit Test reported FAILED"; + exit 1 + else + echo "Unit Test reported OK"; + exit 0 + fi + ## # Chart-Testing Section diff --git a/charts/deprecated/nzbhydra/Chart.yaml b/charts/deprecated/nzbhydra/Chart.yaml index 70772c18c0a..841e9fa964e 100644 --- a/charts/deprecated/nzbhydra/Chart.yaml +++ b/charts/deprecated/nzbhydra/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: [] # annotations: diff --git a/charts/incubator/appdaemon/Chart.yaml b/charts/incubator/appdaemon/Chart.yaml index 39e3baac776..7254c1bf332 100644 --- a/charts/incubator/appdaemon/Chart.yaml +++ b/charts/incubator/appdaemon/Chart.yaml @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 maintainers: - name: TrueCharts email: info@truecharts.org diff --git a/charts/incubator/bazarr/Chart.yaml b/charts/incubator/bazarr/Chart.yaml index 4f753bb0b50..bda4f6d83ca 100644 --- a/charts/incubator/bazarr/Chart.yaml +++ b/charts/incubator/bazarr/Chart.yaml @@ -24,7 +24,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/calibre-web/Chart.yaml b/charts/incubator/calibre-web/Chart.yaml index 5dc23b04622..dec6cf53b21 100644 --- a/charts/incubator/calibre-web/Chart.yaml +++ b/charts/incubator/calibre-web/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/deluge/Chart.yaml b/charts/incubator/deluge/Chart.yaml index 3884f7dc4f1..f7e89bdb546 100644 --- a/charts/incubator/deluge/Chart.yaml +++ b/charts/incubator/deluge/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/fireflyiii/Chart.yaml b/charts/incubator/fireflyiii/Chart.yaml index 8c8aa79594c..443c8bdb9e5 100644 --- a/charts/incubator/fireflyiii/Chart.yaml +++ b/charts/incubator/fireflyiii/Chart.yaml @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 - name: postgresql version: 10.4.3 repository: https://charts.bitnami.com/bitnami diff --git a/charts/incubator/freshrss/Chart.yaml b/charts/incubator/freshrss/Chart.yaml index dcd5baff67a..3b4afe40c2a 100644 --- a/charts/incubator/freshrss/Chart.yaml +++ b/charts/incubator/freshrss/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/gaps/Chart.yaml b/charts/incubator/gaps/Chart.yaml index e0a7c7548d6..873f2391296 100644 --- a/charts/incubator/gaps/Chart.yaml +++ b/charts/incubator/gaps/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/grocy/Chart.yaml b/charts/incubator/grocy/Chart.yaml index 4533a256f2f..f7095368175 100644 --- a/charts/incubator/grocy/Chart.yaml +++ b/charts/incubator/grocy/Chart.yaml @@ -18,7 +18,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/heimdall/Chart.yaml b/charts/incubator/heimdall/Chart.yaml index fe1be1acfab..75be911696e 100644 --- a/charts/incubator/heimdall/Chart.yaml +++ b/charts/incubator/heimdall/Chart.yaml @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/lazylibrarian/Chart.yaml b/charts/incubator/lazylibrarian/Chart.yaml index 39fcc67d1fd..0d9e1d67c84 100644 --- a/charts/incubator/lazylibrarian/Chart.yaml +++ b/charts/incubator/lazylibrarian/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/lychee/Chart.yaml b/charts/incubator/lychee/Chart.yaml index 46aa847ed41..2074dbf88b7 100644 --- a/charts/incubator/lychee/Chart.yaml +++ b/charts/incubator/lychee/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/navidrome/Chart.yaml b/charts/incubator/navidrome/Chart.yaml index 9c347c1a888..5ffc8ef0487 100644 --- a/charts/incubator/navidrome/Chart.yaml +++ b/charts/incubator/navidrome/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/node-red/Chart.yaml b/charts/incubator/node-red/Chart.yaml index 92e1e393e92..13783327756 100644 --- a/charts/incubator/node-red/Chart.yaml +++ b/charts/incubator/node-red/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/nzbget/Chart.yaml b/charts/incubator/nzbget/Chart.yaml index f527d53741d..d46b3f98f46 100644 --- a/charts/incubator/nzbget/Chart.yaml +++ b/charts/incubator/nzbget/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/organizr/Chart.yaml b/charts/incubator/organizr/Chart.yaml index 3f217bee621..2e3cc7b9e55 100644 --- a/charts/incubator/organizr/Chart.yaml +++ b/charts/incubator/organizr/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/podgrab/Chart.yaml b/charts/incubator/podgrab/Chart.yaml index 8417e82b0cd..ae2183a978d 100644 --- a/charts/incubator/podgrab/Chart.yaml +++ b/charts/incubator/podgrab/Chart.yaml @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 maintainers: - name: TrueCharts email: info@truecharts.org diff --git a/charts/incubator/qbittorrent/Chart.yaml b/charts/incubator/qbittorrent/Chart.yaml index 7880e80e728..b6be5d8468a 100644 --- a/charts/incubator/qbittorrent/Chart.yaml +++ b/charts/incubator/qbittorrent/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/readarr/Chart.yaml b/charts/incubator/readarr/Chart.yaml index 7d4e01010d4..ea50d4c127e 100644 --- a/charts/incubator/readarr/Chart.yaml +++ b/charts/incubator/readarr/Chart.yaml @@ -23,7 +23,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/sabnzbd/Chart.yaml b/charts/incubator/sabnzbd/Chart.yaml index e7d2429d53a..0d766e7c00e 100644 --- a/charts/incubator/sabnzbd/Chart.yaml +++ b/charts/incubator/sabnzbd/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/tvheadend/Chart.yaml b/charts/incubator/tvheadend/Chart.yaml index fcb8fb015e8..b3eb53abae1 100644 --- a/charts/incubator/tvheadend/Chart.yaml +++ b/charts/incubator/tvheadend/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/unifi/Chart.yaml b/charts/incubator/unifi/Chart.yaml index 11712846e9b..b00f32187cc 100644 --- a/charts/incubator/unifi/Chart.yaml +++ b/charts/incubator/unifi/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/library/common-test/Chart.yaml b/charts/library/common-test/Chart.yaml index ce562118ed3..7df02189db9 100644 --- a/charts/library/common-test/Chart.yaml +++ b/charts/library/common-test/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: common-test -version: 3.0.0 +version: 3.0.1 # upstream_version: appVersion: none description: Helper chart to test different use cases of the common library diff --git a/charts/library/common-test/ci/basic-values.yaml b/charts/library/common-test/ci/basic-values.yaml new file mode 100644 index 00000000000..887d72a801d --- /dev/null +++ b/charts/library/common-test/ci/basic-values.yaml @@ -0,0 +1,22 @@ +image: + repository: b4bz/homer + tag: latest + pullPolicy: IfNotPresent + +service: + main: + ports: + main: + port: 8080 + +ingress: + main: + enabled: true + +probes: + liveness: + enabled: true + readiness: + enabled: true + startup: + enabled: true diff --git a/charts/library/common-test/values.yaml b/charts/library/common-test/values.yaml index 5146a18c6a5..6937e0fa59c 100644 --- a/charts/library/common-test/values.yaml +++ b/charts/library/common-test/values.yaml @@ -2,9 +2,3 @@ image: repository: b4bz/homer tag: latest pullPolicy: IfNotPresent - -service: - main: - ports: - main: - port: 8080 diff --git a/charts/library/common/values.yaml b/charts/library/common/values.yaml index 1f49f5d113b..644de4cb3ee 100644 --- a/charts/library/common/values.yaml +++ b/charts/library/common/values.yaml @@ -236,7 +236,7 @@ service: # -- Port protocol. # Support values are `HTTP`, `HTTPS`, `TCP` and `UDP`. # HTTPS and HTTPS spawn a TCP service and get used for internal URL and name generation - protocol: HTTP + protocol: HTTP # -- Specify a service targetPort if you wish to differ the service port from the application port. # If `targetPort` is specified, this port number is used in the container definition instead of diff --git a/charts/stable/bitwarden/Chart.yaml b/charts/stable/bitwarden/Chart.yaml index 7f5e4ad30fc..3351476b348 100644 --- a/charts/stable/bitwarden/Chart.yaml +++ b/charts/stable/bitwarden/Chart.yaml @@ -22,7 +22,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: - name: postgresql version: 10.4.3 diff --git a/charts/stable/bitwarden/templates/_secrets.tpl b/charts/stable/bitwarden/templates/_secrets.tpl index b4aef3556b7..63c49240e83 100644 --- a/charts/stable/bitwarden/templates/_secrets.tpl +++ b/charts/stable/bitwarden/templates/_secrets.tpl @@ -15,6 +15,7 @@ {{- if eq .Values.bitwardenrs.yubico.enabled true }} {{- $yubicoClientId = required "Yubico Client ID required" .Values.bitwardenrs.yubico.clientId | toString | b64enc | quote }} {{- end -}} +--- apiVersion: v1 kind: Secret diff --git a/charts/stable/collabora-online/Chart.yaml b/charts/stable/collabora-online/Chart.yaml index c20547b0d83..5a3d739f8c9 100644 --- a/charts/stable/collabora-online/Chart.yaml +++ b/charts/stable/collabora-online/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/deepstack-cpu/Chart.yaml b/charts/stable/deepstack-cpu/Chart.yaml index 5e492a20b17..d0e37f6c530 100644 --- a/charts/stable/deepstack-cpu/Chart.yaml +++ b/charts/stable/deepstack-cpu/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/emby/Chart.yaml b/charts/stable/emby/Chart.yaml index e29b73f9c01..83eca634e8e 100644 --- a/charts/stable/emby/Chart.yaml +++ b/charts/stable/emby/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/esphome/Chart.yaml b/charts/stable/esphome/Chart.yaml index 55a0c8911b7..411b108a109 100644 --- a/charts/stable/esphome/Chart.yaml +++ b/charts/stable/esphome/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/handbrake/Chart.yaml b/charts/stable/handbrake/Chart.yaml index eb5496db397..dd430287af1 100644 --- a/charts/stable/handbrake/Chart.yaml +++ b/charts/stable/handbrake/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/handbrake/values.yaml b/charts/stable/handbrake/values.yaml index e6adfa87dc8..367e8559c67 100644 --- a/charts/stable/handbrake/values.yaml +++ b/charts/stable/handbrake/values.yaml @@ -6,14 +6,8 @@ image: strategy: type: Recreate -startAsRoot: true - # Configure the Security Context for the Pod podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 supplementalGroups: [24, 44, 107] service: diff --git a/charts/stable/home-assistant/Chart.yaml b/charts/stable/home-assistant/Chart.yaml index f5934332441..8b4c6422262 100644 --- a/charts/stable/home-assistant/Chart.yaml +++ b/charts/stable/home-assistant/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: # ## postgresql is currently not ported to SCALE yet. # - name: postgresql diff --git a/charts/stable/jackett/Chart.yaml b/charts/stable/jackett/Chart.yaml index 5de9fb826e7..c8edd69f09f 100644 --- a/charts/stable/jackett/Chart.yaml +++ b/charts/stable/jackett/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/jellyfin/Chart.yaml b/charts/stable/jellyfin/Chart.yaml index 87283a46cef..355c5317c26 100644 --- a/charts/stable/jellyfin/Chart.yaml +++ b/charts/stable/jellyfin/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/kms/Chart.yaml b/charts/stable/kms/Chart.yaml index 23c97928994..83c998b62ea 100644 --- a/charts/stable/kms/Chart.yaml +++ b/charts/stable/kms/Chart.yaml @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/lidarr/Chart.yaml b/charts/stable/lidarr/Chart.yaml index b2dcffb9ce0..3b70a19aa2a 100644 --- a/charts/stable/lidarr/Chart.yaml +++ b/charts/stable/lidarr/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/ombi/Chart.yaml b/charts/stable/ombi/Chart.yaml index 50a4ee41da4..a3acb5becbb 100644 --- a/charts/stable/ombi/Chart.yaml +++ b/charts/stable/ombi/Chart.yaml @@ -24,7 +24,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/plex/Chart.yaml b/charts/stable/plex/Chart.yaml index 017e458835e..76afd99e6d3 100644 --- a/charts/stable/plex/Chart.yaml +++ b/charts/stable/plex/Chart.yaml @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/radarr/Chart.yaml b/charts/stable/radarr/Chart.yaml index 062cf918e6a..c73b592f19d 100644 --- a/charts/stable/radarr/Chart.yaml +++ b/charts/stable/radarr/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/sonarr/Chart.yaml b/charts/stable/sonarr/Chart.yaml index a73ae753df6..7bc4269bac9 100644 --- a/charts/stable/sonarr/Chart.yaml +++ b/charts/stable/sonarr/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/syncthing/Chart.yaml b/charts/stable/syncthing/Chart.yaml index 6e2871ccd50..fddaa071d07 100644 --- a/charts/stable/syncthing/Chart.yaml +++ b/charts/stable/syncthing/Chart.yaml @@ -18,7 +18,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/tautulli/Chart.yaml b/charts/stable/tautulli/Chart.yaml index 50b454dd30b..04f89b081f1 100644 --- a/charts/stable/tautulli/Chart.yaml +++ b/charts/stable/tautulli/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/traefik/Chart.yaml b/charts/stable/traefik/Chart.yaml index 2641e0c3bd4..064ce9969b8 100644 --- a/charts/stable/traefik/Chart.yaml +++ b/charts/stable/traefik/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: traefik -version: 4.0.0 +version: 3.2.4 appVersion: "auto" description: A Traefik based Reverse Proxy and Certificate Manager type: application @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 3.5.8 # condition: - name: traefik repository: https://helm.traefik.io/traefik diff --git a/charts/stable/traefik/SCALE/questions.yaml b/charts/stable/traefik/SCALE/questions.yaml index ae208854589..04324aa77e5 100644 --- a/charts/stable/traefik/SCALE/questions.yaml +++ b/charts/stable/traefik/SCALE/questions.yaml @@ -6,15 +6,13 @@ groups: - name: "Configuration" description: "additional container configuration" - name: "Networking" - description: "Configure Network and Services for container" + description: "Configure / service for container" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Resources and Devices" description: "Specify resources/devices to be allocated to workload" - - name: "Ingress Configuration" - description: "Ingress Configuration" - - name: "Security" - description: "Configure security context" + - name: "Reverse Proxy Configuration" + description: "Reverse Proxy configuration" - name: "Advanced" description: "Advanced Configuration" - name: "WARNING" @@ -52,18 +50,103 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - - variable: env - group: "Configuration" - label: "Image Environment" + + - variable: ingress + label: "" + group: "Reverse Proxy Configuration" schema: type: dict attrs: - - variable: UMASK - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + - variable: main + label: "WebUI" schema: - type: string - default: "002" + type: dict + attrs: + - variable: enabled + label: "Enable Web Reverse Proxy" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP-IR" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "api@internal" + - variable: serviceKind + label: "Service Kind to proxy to" + schema: + hidden: true + editable: false + type: string + default: "TraefikService" + - variable: entrypoint + label: "Select Entrypoint" + schema: + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + type: list + default: [] + items: + - variable: host + label: "Host" + schema: + type: dict + attrs: + - variable: host + label: "Domain Name" + required: true + schema: + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certType + label: "Select Certificate Type" + schema: + type: string + default: "selfsigned" + enum: + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + type: string + default: "" - variable: traefik label: "(Advanced) Traefik Settings" group: "Advanced" @@ -659,9 +742,17 @@ questions: schema: type: string default: "" + + - variable: UMASK + group: "Advanced" + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" # Enable privileged - variable: securityContext - group: "Security" + group: "Advanced" label: "Security Context" schema: type: dict @@ -673,7 +764,7 @@ questions: default: false # Set Pod Security Policy - variable: podSecurityContext - group: "Security" + group: "Advanced" label: "Pod Security Context" schema: type: dict @@ -728,12 +819,12 @@ questions: description: "Please be sure to set the UI to a different port or adapter" group: "WARNING" schema: - type: dict - attrs: - - variable: confirm-warning - description: "Check this to confirm you have made precautions against conflicts on port 80 and 443, such as running the TrueNAS SCALE UI on a different port or adapter." - label: "I understand above warning and its consequences" - schema: - type: boolean - default: false - required: true + type: dict + attrs: + - variable: confirm-warning + description: "Check this to confirm you have made precautions against conflicts on port 80 and 443, such as running the TrueNAS SCALE UI on a different port or adapter." + label: "I understand above warning and its consequences" + schema: + type: boolean + default: false + required: true diff --git a/charts/stable/traefik/values.yaml b/charts/stable/traefik/values.yaml index 543a728674b..e0ce5d60467 100644 --- a/charts/stable/traefik/values.yaml +++ b/charts/stable/traefik/values.yaml @@ -260,7 +260,7 @@ ingress: # Ignored if not kubeVersion >= 1.14-0 pathType: Prefix -externalservice: +externalServices: - enabled: true name: "test" type: "HTTP" diff --git a/charts/stable/transmission/Chart.lock b/charts/stable/transmission/Chart.lock deleted file mode 100644 index ccb76cb28d6..00000000000 --- a/charts/stable/transmission/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: https://truecharts.org/ - version: 4.1.1 -digest: sha256:d13c8b723da27f049ec5a709db8128a96033773c1be13330a453daa4e4d0b7ff -generated: "2021-05-20T18:13:40.3933879+02:00" diff --git a/charts/stable/transmission/Chart.yaml b/charts/stable/transmission/Chart.yaml index b2584b3a546..cdb5e8bf7ac 100644 --- a/charts/stable/transmission/Chart.yaml +++ b/charts/stable/transmission/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/transmission/charts/common-4.1.1.tgz b/charts/stable/transmission/charts/common-4.1.1.tgz deleted file mode 100644 index 15aa650faacb6a73cb4f9fa7c5722dc13531149b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24520 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 diff --git a/charts/stable/truecommand/Chart.yaml b/charts/stable/truecommand/Chart.yaml index 58dab78c8ce..1092666fbd6 100644 --- a/charts/stable/truecommand/Chart.yaml +++ b/charts/stable/truecommand/Chart.yaml @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/zwavejs2mqtt/Chart.yaml b/charts/stable/zwavejs2mqtt/Chart.yaml index d50e1e87978..527a262be9a 100644 --- a/charts/stable/zwavejs2mqtt/Chart.yaml +++ b/charts/stable/zwavejs2mqtt/Chart.yaml @@ -22,7 +22,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.1 + version: 4.1.2 # condition: maintainers: - name: TrueCharts From 9d2c0318f7006dc247e81a0a04f4ff9333385a16 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 23 May 2021 00:09:56 +0200 Subject: [PATCH 04/11] Port features from #446 into #477 Co-authored-by: Luuk Nieuwdorp --- .github/CODEOWNERS | 2 +- charts/stable/syncthing/SCALE/questions.yaml | 141 +++++++++++++++++++ 2 files changed, 142 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e4202d89807..b43959b3477 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -19,7 +19,7 @@ zwavejs2mqtt/ @tprelog home-assistant/ @tprelog # Apps maintained by stavros-k -handbrake/* @stavros-k +handbrake/ @stavros-k collabora-online/ @stavros-k deepstack-cpu/ @stavros-k diff --git a/charts/stable/syncthing/SCALE/questions.yaml b/charts/stable/syncthing/SCALE/questions.yaml index bf343fda1cb..025f00526d9 100644 --- a/charts/stable/syncthing/SCALE/questions.yaml +++ b/charts/stable/syncthing/SCALE/questions.yaml @@ -183,6 +183,147 @@ questions: max: 65535 default: 36024 required: true + - variable: listeners + label: "Syncthing Listening Service" + description: "This service is used to process incoming connections directly to this Syncthing instance" + schema: + type: dict + attrs: + - variable: enabled + label: "Enable the service" + schema: + type: boolean + default: true + hidden: true + - variable: type + label: "Service Type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" + schema: + type: string + default: "NodePort" + enum: + - value: "NodePort" + description: "NodePort" + - value: "ClusterIP" + description: "ClusterIP" + - value: "LoadBalancer" + description: "LoadBalancer" + - variable: loadBalancerIP + label: "LoadBalancer IP" + description: "LoadBalancerIP" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: string + default: "" + required: true + - variable: exetrnalIPs + label: "External IP's" + description: "External IP's" + schema: + show_if: [["type", "=", "LoadBalancer"]] + type: list + default: [] + items: + - variable: externalIP + label: "External IP" + required: true + schema: + type: string + - variable: ports + label: "Service's Port(s) Configuration" + schema: + type: dict + attrs: + - variable: tcp + label: "TCP Service Port Configuration" + schema: + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "TCP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 22000 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 22000 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 22000 + required: true + - variable: udp + label: "UDP Service Port Configuration" + schema: + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "UDP" + hidden: false + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: port + label: "Container Port" + schema: + type: int + default: 22000 + editable: false + hidden: true + - variable: targetport + label: "Target Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 22000 + editable: true + hidden: false + required: true + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort" + schema: + type: int + min: 9000 + max: 65535 + default: 22000 + required: true ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" From d358b18179249ff8322c6d79a78a100044cce404 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 23 May 2021 00:18:56 +0200 Subject: [PATCH 05/11] Common 4.0 App Refactor Part 4 - Ornias --- .../bitwarden/.helmignore | 0 .../bitwarden/CONFIG.md | 0 charts/deprecated/bitwarden/Chart.yaml | 32 + .../bitwarden/README.md | 0 .../bitwarden/SCALE/item.yaml | 0 .../bitwarden/SCALE/ix_values.yaml | 0 .../deprecated/bitwarden/SCALE/questions.yaml | 907 ++++++++++++++++++ .../bitwarden/app-readme.md | 0 .../bitwarden/templates/_specialingress.tpl | 0 .../bitwarden/templates/_validate.tpl | 0 .../bitwarden/templates/common.yaml | 6 - .../bitwarden/templates/configmap.yaml} | 6 +- .../bitwarden/templates/secrets.yaml} | 7 +- charts/deprecated/bitwarden/values.yaml | 177 ++++ charts/deprecated/nzbhydra/Chart.yaml | 2 +- charts/incubator/appdaemon/Chart.yaml | 2 +- charts/incubator/appdaemon/values.yaml | 3 +- charts/incubator/bazarr/Chart.yaml | 2 +- charts/incubator/calibre-web/Chart.yaml | 2 +- charts/incubator/deluge/Chart.yaml | 2 +- charts/incubator/fireflyiii/Chart.yaml | 2 +- charts/incubator/freshrss/Chart.yaml | 2 +- charts/incubator/gaps/Chart.yaml | 2 +- charts/incubator/grocy/Chart.yaml | 2 +- charts/incubator/heimdall/Chart.yaml | 2 +- charts/incubator/lazylibrarian/Chart.yaml | 2 +- charts/incubator/lychee/Chart.yaml | 2 +- charts/incubator/navidrome/Chart.yaml | 2 +- charts/incubator/node-red/Chart.yaml | 2 +- charts/incubator/nzbget/Chart.yaml | 2 +- charts/incubator/organizr/Chart.yaml | 2 +- charts/incubator/podgrab/Chart.yaml | 2 +- charts/incubator/qbittorrent/Chart.yaml | 2 +- charts/incubator/readarr/Chart.yaml | 2 +- charts/incubator/sabnzbd/Chart.yaml | 2 +- charts/incubator/tvheadend/Chart.yaml | 2 +- charts/incubator/unifi/Chart.yaml | 2 +- charts/library/common/Chart.yaml | 2 +- charts/stable/collabora-online/Chart.yaml | 2 +- charts/stable/deepstack-cpu/Chart.yaml | 2 +- charts/stable/emby/Chart.yaml | 2 +- charts/stable/esphome/Chart.yaml | 2 +- charts/stable/handbrake/Chart.yaml | 2 +- charts/stable/home-assistant/Chart.yaml | 2 +- charts/stable/jackett/Chart.yaml | 2 +- charts/stable/jellyfin/Chart.yaml | 2 +- charts/stable/kms/Chart.yaml | 2 +- charts/stable/lidarr/Chart.yaml | 2 +- charts/stable/ombi/Chart.yaml | 2 +- charts/stable/plex/Chart.yaml | 2 +- charts/stable/radarr/Chart.yaml | 2 +- charts/stable/sonarr/Chart.yaml | 2 +- charts/stable/syncthing/Chart.yaml | 2 +- charts/stable/tautulli/Chart.yaml | 2 +- charts/stable/transmission/Chart.yaml | 2 +- charts/stable/truecommand/Chart.yaml | 2 +- charts/stable/vaultwarden/.helmignore | 24 + charts/stable/vaultwarden/CONFIG.md | 8 + .../{bitwarden => vaultwarden}/Chart.yaml | 13 +- charts/stable/vaultwarden/README.md | 56 ++ charts/stable/vaultwarden/SCALE/item.yaml | 3 + .../stable/vaultwarden/SCALE/ix_values.yaml | 54 ++ .../SCALE/questions.yaml | 0 charts/stable/vaultwarden/app-readme.md | 2 + .../vaultwarden/templates/_configmap.tpl | 116 +++ .../stable/vaultwarden/templates/_secrets.tpl | 59 ++ .../vaultwarden/templates/_validate.tpl | 17 + .../stable/vaultwarden/templates/common.yaml | 11 + .../{bitwarden => vaultwarden}/values.yaml | 12 +- charts/stable/zwavejs2mqtt/Chart.yaml | 2 +- 70 files changed, 1526 insertions(+), 71 deletions(-) rename charts/{stable => deprecated}/bitwarden/.helmignore (100%) rename charts/{stable => deprecated}/bitwarden/CONFIG.md (100%) create mode 100644 charts/deprecated/bitwarden/Chart.yaml rename charts/{stable => deprecated}/bitwarden/README.md (100%) rename charts/{stable => deprecated}/bitwarden/SCALE/item.yaml (100%) rename charts/{stable => deprecated}/bitwarden/SCALE/ix_values.yaml (100%) create mode 100644 charts/deprecated/bitwarden/SCALE/questions.yaml rename charts/{stable => deprecated}/bitwarden/app-readme.md (100%) rename charts/{stable => deprecated}/bitwarden/templates/_specialingress.tpl (100%) rename charts/{stable => deprecated}/bitwarden/templates/_validate.tpl (100%) rename charts/{stable => deprecated}/bitwarden/templates/common.yaml (59%) rename charts/{stable/bitwarden/templates/_configmap.tpl => deprecated/bitwarden/templates/configmap.yaml} (98%) rename charts/{stable/bitwarden/templates/_secrets.tpl => deprecated/bitwarden/templates/secrets.yaml} (96%) create mode 100644 charts/deprecated/bitwarden/values.yaml create mode 100644 charts/stable/vaultwarden/.helmignore create mode 100644 charts/stable/vaultwarden/CONFIG.md rename charts/stable/{bitwarden => vaultwarden}/Chart.yaml (81%) create mode 100644 charts/stable/vaultwarden/README.md create mode 100644 charts/stable/vaultwarden/SCALE/item.yaml create mode 100644 charts/stable/vaultwarden/SCALE/ix_values.yaml rename charts/stable/{bitwarden => vaultwarden}/SCALE/questions.yaml (100%) create mode 100644 charts/stable/vaultwarden/app-readme.md create mode 100644 charts/stable/vaultwarden/templates/_configmap.tpl create mode 100644 charts/stable/vaultwarden/templates/_secrets.tpl create mode 100644 charts/stable/vaultwarden/templates/_validate.tpl create mode 100644 charts/stable/vaultwarden/templates/common.yaml rename charts/stable/{bitwarden => vaultwarden}/values.yaml (97%) diff --git a/charts/stable/bitwarden/.helmignore b/charts/deprecated/bitwarden/.helmignore similarity index 100% rename from charts/stable/bitwarden/.helmignore rename to charts/deprecated/bitwarden/.helmignore diff --git a/charts/stable/bitwarden/CONFIG.md b/charts/deprecated/bitwarden/CONFIG.md similarity index 100% rename from charts/stable/bitwarden/CONFIG.md rename to charts/deprecated/bitwarden/CONFIG.md diff --git a/charts/deprecated/bitwarden/Chart.yaml b/charts/deprecated/bitwarden/Chart.yaml new file mode 100644 index 00000000000..6f0ea08195a --- /dev/null +++ b/charts/deprecated/bitwarden/Chart.yaml @@ -0,0 +1,32 @@ +apiVersion: v2 +kubeVersion: ">=1.16.0-0" +name: bitwarden +version: 1.2.7 +upstream_version: 2.1.5 +appVersion: "auto" +description: Unofficial Bitwarden compatible server written in Rust +type: application +deprecated: true +home: https://github.com/truecharts/apps/tree/master/incubator/bitwarden +icon: https://raw.githubusercontent.com/bitwarden/brand/master/icons/256x256.png +keywords: + - bitwarden + - bitwardenrs + - bitwarden_rs + - password + - rust +sources: + - https://github.com/truecharts/apps/tree/master/incubator/bitwarden + - https://github.com/k8s-at-home/charts/tree/master/charts/stable/bitwardenrs + - https://github.com/dani-garcia/bitwarden_rs +dependencies: + - name: common + repository: https://truecharts.org/ + version: 3.5.8 + # condition: + - name: postgresql + version: 10.4.3 + repository: https://charts.bitnami.com/bitnami + condition: postgresql.enabled +maintainers: [] +# annotations: diff --git a/charts/stable/bitwarden/README.md b/charts/deprecated/bitwarden/README.md similarity index 100% rename from charts/stable/bitwarden/README.md rename to charts/deprecated/bitwarden/README.md diff --git a/charts/stable/bitwarden/SCALE/item.yaml b/charts/deprecated/bitwarden/SCALE/item.yaml similarity index 100% rename from charts/stable/bitwarden/SCALE/item.yaml rename to charts/deprecated/bitwarden/SCALE/item.yaml diff --git a/charts/stable/bitwarden/SCALE/ix_values.yaml b/charts/deprecated/bitwarden/SCALE/ix_values.yaml similarity index 100% rename from charts/stable/bitwarden/SCALE/ix_values.yaml rename to charts/deprecated/bitwarden/SCALE/ix_values.yaml diff --git a/charts/deprecated/bitwarden/SCALE/questions.yaml b/charts/deprecated/bitwarden/SCALE/questions.yaml new file mode 100644 index 00000000000..8c1d61d48ea --- /dev/null +++ b/charts/deprecated/bitwarden/SCALE/questions.yaml @@ -0,0 +1,907 @@ +groups: + - name: "Container Image" + description: "Image to be used for container" + - name: "Workload Configuration" + description: "Configure workload deployment" + - name: "Configuration" + description: "additional container configuration" + - name: "Networking" + description: "Configure / service for container" + - name: "Storage" + description: "Persist and share data that is separate from the lifecycle of the container" + - name: "Resources and Devices" + description: "Specify resources/devices to be allocated to workload" + - name: "Reverse Proxy Configuration" + description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" + - name: "WARNING" + description: "WARNING" +portals: + web_portal: + protocols: + - "$kubernetes-resource_configmap_portal_protocol" + host: + - "$kubernetes-resource_configmap_portal_host" + ports: + - "$kubernetes-resource_configmap_portal_port" +questions: + - variable: portal + group: "Container Image" + label: "Configure Portal Button" + schema: + type: dict + hidden: true + attrs: + - variable: enabled + label: "Enable" + description: "enable the portal button" + schema: + hidden: true + editable: false + type: boolean + default: true + # Update Policy + - variable: strategyType + group: "Container Image" + label: "Update Strategy" + schema: + type: string + default: "Recreate" + enum: + - value: "RollingUpdate" + description: "Create new pods and then kill old ones" + - value: "Recreate" + description: "Kill existing pods before creating new ones" + # Configure Time Zone + - variable: timezone + group: "Container Image" + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" +# Configure Bitwarden: + - variable: bitwardenrs + label: "" + group: "Configuration" + schema: + type: dict + attrs: + - variable: yubico + label: "Yubico OPT authentication" + schema: + type: dict + attrs: + - variable: enabled + label: "Enable Yubico OPT authentication" + description: "Please refer to the manual at: https://github.com/dani-garcia/bitwarden_rs/wiki/Enabling-Yubikey-OTP-authentication" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: server + label: "Yubico server" + description: "Defaults to YubiCloud" + schema: + type: string + default: "" + - variable: clientId + label: "Yubico ID" + schema: + type: string + default: "" + - variable: secretKey + label: "Yubico Secret Key" + schema: + type: string + default: "" + - variable: admin + label: "Admin Portal" + schema: + type: dict + attrs: + - variable: enabled + label: "Enable Admin Portal" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: disableAdminToken + label: "Make Accessible Without Password/Token" + schema: + type: boolean + default: false + - variable: token + label: "Admin Portal Password/Token" + description: "Will be automatically generated if not defined" + schema: + type: string + default: "" + - variable: icons + label: "Icon Download Settings" + schema: + type: dict + attrs: + - variable: disableDownload + label: "Disable Icon Download" + description: "Disables download of external icons. Setting to true will still serve icons from cache (/data/icon_cache)" + schema: + type: boolean + default: false + - variable: cache + label: "Cache time-to-live" + description: "Cache time-to-live for icons fetched. 0 means no purging" + schema: + type: int + default: 2592000 + - variable: token + label: "Failed Downloads Cache time-to-live" + description: "Cache time-to-live for icons that were not available. 0 means no purging." + schema: + type: int + default: 2592000 + - variable: log + label: "Logging" + schema: + type: dict + attrs: + - variable: level + label: "Log level" + schema: + type: string + default: "info" + required: true + enum: + - value: "trace" + description: "trace" + - value: "debug" + description: "debug" + - value: "info" + description: "info" + - value: "warn" + description: "warn" + - value: "error" + description: "error" + - value: "off" + description: "off" + - variable: file + label: "Log-File Location" + schema: + type: string + default: "" + + - variable: smtp + label: "SMTP Settings (Email)" + schema: + type: dict + attrs: + - variable: enabled + label: "Enable SMTP Support" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: host + label: "SMTP hostname" + schema: + type: string + required: true + default: "" + - variable: from + label: "SMTP sender e-mail address" + schema: + type: string + required: true + default: "" + - variable: fromName + label: "SMTP sender name" + schema: + type: string + required: true + default: "" + - variable: user + label: "SMTP username" + schema: + type: string + required: true + default: "" + - variable: password + label: "SMTP password" + description: "Required is user is specified, ignored if no user provided" + schema: + type: string + default: "" + - variable: ssl + label: "Enable SSL connection" + schema: + type: boolean + default: true + - variable: port + label: "SMTP port" + description: "Usually: 25 without SSL, 587 with SSL" + schema: + type: int + default: 587 + - variable: authMechanism + label: "SMTP Authentication Mechanisms" + description: "Comma-separated options: Plain, Login and Xoauth2" + schema: + type: string + default: "Plain" + - variable: heloName + label: "SMTP HELO - Hostname" + description: "Hostname to be sent for SMTP HELO. Defaults to pod name" + schema: + type: string + default: "" + - variable: port + label: "SMTP timeout" + schema: + type: int + default: 15 + - variable: invalidHostname + label: "Accept Invalid Hostname" + description: "Accept SSL session if certificate is valid but hostname doesn't match. DANGEROUS, vulnerable to men-in-the-middle attacks!" + schema: + type: boolean + default: false + - variable: invalidCertificate + label: "Accept Invalid Certificate" + description: "Accept invalid certificates. DANGEROUS, vulnerable to men-in-the-middle attacks!" + schema: + type: boolean + default: false + + - variable: allowSignups + label: "Allow Signup" + description: "Allow any user to sign-up: https://github.com/dani-garcia/bitwarden_rs/wiki/Disable-registration-of-new-users" + schema: + type: boolean + default: true + - variable: allowInvitation + label: "Always allow Invitation" + description: "Allow invited users to sign-up even feature is disabled: https://github.com/dani-garcia/bitwarden_rs/wiki/Disable-invitations" + schema: + type: boolean + default: true + - variable: defaultInviteName + label: "Default Invite Organisation Name" + description: "Default organization name in invitation e-mails that are not coming from a specific organization." + schema: + type: string + default: "" + + - variable: showPasswordHint + label: "Show password hints" + description: "https://github.com/dani-garcia/bitwarden_rs/wiki/Password-hint-display" + schema: + type: boolean + default: true + + - variable: signupwhitelistenable + label: "Enable Signup Whitelist" + description: "allowSignups is ignored if set" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: signupDomains + label: "Signup Whitelist Domains" + schema: + type: list + default: [] + items: + - variable: domain + label: "Domain" + schema: + type: string + default: "" + - variable: verifySignup + label: "Verifiy Signup" + description: "Verify e-mail before login is enabled. SMTP must be enabled" + schema: + type: boolean + default: false + - variable: requireEmail + label: "Block Login if email fails" + description: "When a user logs in an email is required to be sent. If sending the email fails the login attempt will fail. SMTP must be enabled" + schema: + type: boolean + default: false + - variable: emailAttempts + label: "Email token reset attempts" + description: "Maximum attempts before an email token is reset and a new email will need to be sent" + schema: + type: int + default: 3 + - variable: emailTokenExpiration + label: "Email token validity in seconds" + schema: + type: int + default: 600 + - variable: enableWebsockets + label: "Enable Websocket Connections" + description: "Enable Websockets for notification. https://github.com/dani-garcia/bitwarden_rs/wiki/Enabling-WebSocket-notifications" + schema: + type: boolean + default: true + hidden: true + - variable: enableWebVault + label: "Enable Webvault" + description: "Enable Web Vault (static content). https://github.com/dani-garcia/bitwarden_rs/wiki/Disabling-or-overriding-the-Vault-interface-hosting" + schema: + type: boolean + default: true + - variable: orgCreationUsers + label: "Limit Organisation Creation to (users)" + description: "Restrict creation of orgs. Options are: 'all', 'none' or a comma-separated list of users." + schema: + type: string + default: "all" + - variable: attachmentLimitOrg + label: "Limit Attachment Disk Usage per Organisation" + schema: + type: string + default: "" + - variable: attachmentLimitUser + label: "Limit Attachment Disk Usage per User" + schema: + type: string + default: "" + - variable: hibpApiKey + label: "HaveIBeenPwned API Key" + description: "Can be purchased at https://haveibeenpwned.com/API/Key" + schema: + type: string + default: "" + # Configure Enviroment Variables + - variable: environmentVariables + label: "Image environment" + group: "Configuration" + schema: + type: list + default: [] + items: + - variable: environmentVariable + label: "Environment Variable" + schema: + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string + # Enable Host Networking + - variable: hostNetwork + group: "Networking" + label: "Enable Host Networking" + schema: + type: boolean + default: false + hidden: true + - variable: services + group: "Networking" + label: "Configure Service" + schema: + type: dict + hidden: true + attrs: + - variable: main + label: "Main service" + description: "The Primary service on which the healthcheck runs, often the webUI" + schema: + type: dict + hidden: true + attrs: + - variable: enabled + label: "Enable the service" + schema: + type: boolean + default: true + hidden: true + - variable: type + label: "Service type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + schema: + type: string + default: "ClusterIP" + hidden: true + enum: + - value: "ClusterIP" + description: "ClusterIP" + - variable: port + label: "Port configuration" + schema: + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: true + enum: + - value: HTTP + description: "HTTP" + - variable: port + label: "container port" + schema: + type: int + default: 8080 + editable: false + hidden: true + - variable: targetport + label: "Internal Service port" + description: "When connecting internally to this App, you'll need this port" + schema: + type: int + default: 8080 + editable: false + hidden: true + - variable: nodePort + label: "(optional) host nodePort to expose to" + description: "only get used when nodePort is selected" + schema: + type: int + min: 9000 + max: 65535 + default: 36000 + required: true + hidden: true + - variable: ws + label: "Websocket service" + description: "Websocket Service" + schema: + type: dict + hidden: true + attrs: + - variable: enabled + label: "Enable the service" + schema: + type: boolean + default: true + hidden: true + - variable: type + label: "Service type" + description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System" + schema: + type: string + default: "ClusterIP" + hidden: true + enum: + - value: "ClusterIP" + description: "ClusterIP" + - variable: port + label: "Port configuration" + schema: + type: dict + attrs: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + hidden: true + enum: + - value: HTTP + description: "HTTP" + - variable: port + label: "container port" + schema: + type: int + default: 3012 + editable: false + hidden: true + - variable: targetport + label: "Internal Service port" + description: "When connecting internally to this App, you'll need this port" + schema: + type: int + default: 3012 + editable: false + hidden: true + - variable: nodePort + label: "(optional) host nodePort to expose to" + description: "only get used when nodePort is selected" + schema: + type: int + min: 9000 + max: 65535 + default: 36001 + required: true + hidden: true + +## TrueCharts Specific + - variable: persistence + label: "Integrated Persistent Storage" + description: "Websocket Service" + group: "Storage" + schema: + type: dict + attrs: + - variable: data + label: "App Config Storage" + description: "Stores the Application Configuration." + schema: + type: dict + attrs: + - variable: enabled + label: "Enable the storage" + schema: + type: boolean + default: true + hidden: true + - variable: storageClass + label: "Type of Storage" + description: " Warning: Anything other than Internal will break rollback!" + schema: + type: string + default: "" + enum: + - value: "" + description: "Internal" + - variable: mountPath + label: "mountPath" + description: "Path inside the container the storage is mounted" + schema: + type: string + default: "/data" + hidden: true + - variable: emptyDir + label: "Mount a ramdisk instead of actual storage" + schema: + type: boolean + default: false + hidden: true + - variable: accessMode + label: "Access Mode (Advanced)" + description: "Allow or disallow multiple PVC's writhing to the same PVC" + schema: + type: string + default: "ReadWriteOnce" + enum: + - value: "ReadWriteOnce" + description: "ReadWriteOnce" + - value: "ReadOnlyMany" + description: "ReadOnlyMany" + - value: "ReadWriteMany" + description: "ReadWriteMany" + - variable: size + label: "Size quotum of storage" + schema: + type: string + default: "100Gi" + - variable: db + label: "Database Storage" + description: "Stores the Application database." + schema: + type: dict + attrs: + - variable: enabled + label: "Enable the storage" + schema: + type: boolean + default: true + hidden: true + - variable: nameOverride + label: "Override PVC Name (advanced)" + description: "Forces a certain name for the PVC" + schema: + type: string + default: "db" + hidden: true + - variable: storageClass + label: "Type of Storage" + description: " Warning: Anything other than Internal will break rollback!" + schema: + type: string + default: "" + enum: + - value: "" + description: "Internal" + - variable: mountPath + label: "mountPath" + description: "Path inside the container the storage is mounted" + schema: + type: string + default: "" + hidden: true + - variable: emptyDir + label: "Mount a ramdisk instead of actual storage" + schema: + type: boolean + default: false + hidden: true + - variable: accessMode + label: "Access Mode (Advanced)" + description: "Allow or disallow multiple PVC's writhing to the same PVC" + schema: + type: string + default: "ReadWriteOnce" + enum: + - value: "ReadWriteOnce" + description: "ReadWriteOnce" + - value: "ReadOnlyMany" + description: "ReadOnlyMany" + - value: "ReadWriteMany" + description: "ReadWriteMany" + - variable: size + label: "Size quotum of storage" + schema: + type: string + default: "100Gi" + - variable: dbbackup + label: "Database Backup Storage" + description: "Stores the Application database backups." + schema: + type: dict + attrs: + - variable: enabled + label: "Enable the storage" + schema: + type: boolean + default: true + hidden: true + - variable: storageClass + label: "Type of Storage" + description: " Warning: Anything other than Internal will break rollback!" + schema: + type: string + default: "" + enum: + - value: "" + description: "Internal" + - variable: mountPath + label: "mountPath" + description: "Path inside the container the storage is mounted" + schema: + type: string + default: "" + hidden: true + - variable: emptyDir + label: "Mount a ramdisk instead of actual storage" + schema: + type: boolean + default: false + hidden: true + - variable: accessMode + label: "Access Mode (Advanced)" + description: "Allow or disallow multiple PVC's writhing to the same PVC" + schema: + type: string + default: "ReadWriteOnce" + enum: + - value: "ReadWriteOnce" + description: "ReadWriteOnce" + - value: "ReadOnlyMany" + description: "ReadOnlyMany" + - value: "ReadWriteMany" + description: "ReadWriteMany" + - variable: size + label: "Size quotum of storage" + schema: + type: string + default: "100Gi" + - variable: customStorage + label: "Custom app storage" + group: "Storage" + schema: + type: list + default: [] + items: + - variable: volumeMount + label: "Custom Storage" + schema: + type: dict + attrs: + - variable: enabled + label: "Enabled" + schema: + type: boolean + default: true + required: true + hidden: true + editable: false + - variable: setPermissions + label: "Automatic Permissions" + description: "Automatically set permissions on install" + schema: + type: boolean + default: true + hidden: false + - variable: readOnly + label: "Mount as ReadOnly" + description: "prevent any write from being done to the mounted volume" + schema: + type: boolean + default: false + hidden: false + - variable: emptyDir + label: "emptyDir" + schema: + type: boolean + default: false + hidden: true + editable: false + - variable: mountPath + label: "Mount Path" + description: "Path to mount inside the pod" + schema: + type: path + required: true + default: "" + editable: true + - variable: hostPath + label: "Host Path" + schema: + type: hostpath + required: true + - variable: ingress + label: "" + group: "Reverse Proxy Configuration" + schema: + type: dict + attrs: + - variable: main + label: "WebUI" + schema: + type: dict + attrs: + - variable: certType + label: "Select Reverse-Proxy Type" + schema: + type: string + default: "disabled" + enum: + - value: "disabled" + description: "Disabled" + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + show_if: [["certType", "!=", "disabled"]] + type: list + default: [] + items: + - variable: host + label: "Host" + schema: + type: dict + attrs: + - variable: host + label: "Domain Name" + required: true + schema: + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + show_if: [["certType", "!=", "disabled"]] + type: string + default: "" + + - variable: UMASK + group: "Advanced" + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" + # Enable privileged + - variable: securityContext + group: "Advanced" + label: "Security Context" + schema: + type: dict + attrs: + - variable: privileged + label: "Enable privileged mode for Common-Chart based charts" + schema: + type: boolean + default: false + # Set Pod Security Policy + - variable: podSecurityContext + group: "Advanced" + label: "Pod Security Context" + schema: + type: dict + attrs: + - variable: runAsNonRoot + label: "runAsNonRoot" + schema: + type: boolean + default: true + - 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: supplementalGroups + label: "supplementalGroups" + description: "Additional groups this App needs access to" + schema: + type: list + default: [] + items: + - variable: Group + label: "Group" + schema: + type: int + default: 568 + - variable: fsGroup + label: "fsGroup" + description: "The group that should own ALL storage." + schema: + type: int + default: 568 + - variable: fsGroupChangePolicy + label: "When should we take ownership?" + schema: + type: string + default: "OnRootMismatch" + enum: + - value: "OnRootMismatch" + description: "OnRootMismatch" + - value: "Always" + description: "Always" diff --git a/charts/stable/bitwarden/app-readme.md b/charts/deprecated/bitwarden/app-readme.md similarity index 100% rename from charts/stable/bitwarden/app-readme.md rename to charts/deprecated/bitwarden/app-readme.md diff --git a/charts/stable/bitwarden/templates/_specialingress.tpl b/charts/deprecated/bitwarden/templates/_specialingress.tpl similarity index 100% rename from charts/stable/bitwarden/templates/_specialingress.tpl rename to charts/deprecated/bitwarden/templates/_specialingress.tpl diff --git a/charts/stable/bitwarden/templates/_validate.tpl b/charts/deprecated/bitwarden/templates/_validate.tpl similarity index 100% rename from charts/stable/bitwarden/templates/_validate.tpl rename to charts/deprecated/bitwarden/templates/_validate.tpl diff --git a/charts/stable/bitwarden/templates/common.yaml b/charts/deprecated/bitwarden/templates/common.yaml similarity index 59% rename from charts/stable/bitwarden/templates/common.yaml rename to charts/deprecated/bitwarden/templates/common.yaml index 9e84d7a7b58..c83beb6c7ae 100644 --- a/charts/stable/bitwarden/templates/common.yaml +++ b/charts/deprecated/bitwarden/templates/common.yaml @@ -4,11 +4,5 @@ {{/* Render the templates */}} {{ include "common.all" . }} -{{/* Render configmap for bitwarden */}} -{{- include "bitwarden.configmap" . }} - -{{/* Render secrets for bitwarden */}} -{{- include "bitwarden.secrets" . }} - {{/* Render special ingress for bitwarden */}} {{- include "bitwarden.ingress" . }} diff --git a/charts/stable/bitwarden/templates/_configmap.tpl b/charts/deprecated/bitwarden/templates/configmap.yaml similarity index 98% rename from charts/stable/bitwarden/templates/_configmap.tpl rename to charts/deprecated/bitwarden/templates/configmap.yaml index f41708c8a5b..074f8237e6a 100644 --- a/charts/stable/bitwarden/templates/_configmap.tpl +++ b/charts/deprecated/bitwarden/templates/configmap.yaml @@ -1,10 +1,9 @@ -{{/* Define the configmap */}} -{{- define "bitwarden.configmap" -}} ---- apiVersion: v1 kind: ConfigMap metadata: name: bitwardenconfig + labels: + {{- include "common.labels" . | nindent 4 }} data: ROCKET_PORT: "8080" SIGNUPS_ALLOWED: {{ .Values.bitwardenrs.allowSignups | quote }} @@ -113,4 +112,3 @@ data: {{- else }} ENABLE_DB_WAL: "false" {{- end }} -{{- end -}} diff --git a/charts/stable/bitwarden/templates/_secrets.tpl b/charts/deprecated/bitwarden/templates/secrets.yaml similarity index 96% rename from charts/stable/bitwarden/templates/_secrets.tpl rename to charts/deprecated/bitwarden/templates/secrets.yaml index 63c49240e83..e8e0dcc3e0b 100644 --- a/charts/stable/bitwarden/templates/_secrets.tpl +++ b/charts/deprecated/bitwarden/templates/secrets.yaml @@ -1,6 +1,3 @@ -{{/* Define the secrets */}} -{{- define "bitwarden.secrets" -}} - {{- $adminToken := "" }} {{- if eq .Values.bitwardenrs.admin.enabled true }} {{- $adminToken = .Values.bitwardenrs.admin.token | default (randAlphaNum 48) | b64enc | quote }} @@ -15,12 +12,13 @@ {{- if eq .Values.bitwardenrs.yubico.enabled true }} {{- $yubicoClientId = required "Yubico Client ID required" .Values.bitwardenrs.yubico.clientId | toString | b64enc | quote }} {{- end -}} ---- apiVersion: v1 kind: Secret metadata: name: bitwardensecret + labels: + {{- include "common.labels" . | nindent 4 }} data: {{- if ne $adminToken "" }} ADMIN_TOKEN: {{ $adminToken }} @@ -56,4 +54,3 @@ data: {{- end }} url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }} type: Opaque -{{- end -}} diff --git a/charts/deprecated/bitwarden/values.yaml b/charts/deprecated/bitwarden/values.yaml new file mode 100644 index 00000000000..eb0fa46b6c4 --- /dev/null +++ b/charts/deprecated/bitwarden/values.yaml @@ -0,0 +1,177 @@ +# Default values for Bitwarden. + +image: + repository: bitwardenrs/server + pullPolicy: IfNotPresent + tag: 1.21.0 + +strategy: + type: Recreate + +services: + main: + port: + port: 8080 + ws: + port: + port: 3012 + +env: {} + +envTpl: + DOMAIN: "https://{{ if .Values.ingress }}{{ if .Values.ingress.main.enabled }}{{ ( index .Values.ingress.main.hosts 0 ).host }}{{ else }}placeholder.com{{ end }}{{ else }}placeholder.com{{ end }}" + +envFrom: + - configMapRef: + name: bitwardenconfig + - secretRef: + name: bitwardensecret + +envValueFrom: + DATABASE_URL: + secretKeyRef: + name: dbcreds + key: url + +database: + # Database type, must be one of: 'sqlite', 'mysql' or 'postgresql'. + type: postgresql + # Enable DB Write-Ahead-Log for SQLite, disabled for other databases. https://github.com/dani-garcia/bitwarden_rs/wiki/Running-without-WAL-enabled + wal: true + ## URL for external databases (mysql://user:pass@host:port or postgresql://user:pass@host:port). + # url: "" + ## Set the size of the database connection pool. + # maxConnections: 10 + ## Connection retries during startup, 0 for infinite. 1 second between retries. + # retries: 15 + +# Set Bitwarden_rs application variables +bitwardenrs: + # Allow any user to sign-up: https://github.com/dani-garcia/bitwarden_rs/wiki/Disable-registration-of-new-users + allowSignups: true + ## Whitelist domains allowed to sign-up. 'allowSignups' is ignored if set. + # signupDomains: + # - domain.tld + # Verify e-mail before login is enabled. SMTP must be enabled. + verifySignup: false + # When a user logs in an email is required to be sent. If sending the email fails the login attempt will fail. SMTP must be enabled. + requireEmail: false + ## Maximum attempts before an email token is reset and a new email will need to be sent. + # emailAttempts: 3 + ## Email token validity in seconds. + # emailTokenExpiration: 600 + # Allow invited users to sign-up even feature is disabled: https://github.com/dani-garcia/bitwarden_rs/wiki/Disable-invitations + allowInvitation: true + # Show password hints: https://github.com/dani-garcia/bitwarden_rs/wiki/Password-hint-display + ## Default organization name in invitation e-mails that are not coming from a specific organization. + # defaultInviteName: "" + showPasswordHint: true + # Enable Websockets for notification. https://github.com/dani-garcia/bitwarden_rs/wiki/Enabling-WebSocket-notifications + # Redirect HTTP path "/notifications/hub" to port 3012. Ingress/IngressRoute controllers are automatically configured. + enableWebsockets: true + # Enable Web Vault (static content). https://github.com/dani-garcia/bitwarden_rs/wiki/Disabling-or-overriding-the-Vault-interface-hosting + enableWebVault: true + # Restrict creation of orgs. Options are: 'all', 'none' or a comma-separated list of users. + orgCreationUsers: all + ## Limit attachment disk usage per organization. + # attachmentLimitOrg: + ## Limit attachment disk usage per user. + # attachmentLimitUser: + ## HaveIBeenPwned API Key. Can be purchased at https://haveibeenpwned.com/API/Key. + # hibpApiKey: + + admin: + # Enable admin portal. + enabled: false + # Disabling the admin token will make the admin portal accessible to anyone, use carefully: https://github.com/dani-garcia/bitwarden_rs/wiki/Disable-admin-token + disableAdminToken: false + ## Token for admin login, will be generated if not defined. https://github.com/dani-garcia/bitwarden_rs/wiki/Enabling-admin-page + # token: + + # Enable SMTP. https://github.com/dani-garcia/bitwarden_rs/wiki/SMTP-configuration + smtp: + enabled: false + # SMTP hostname, required if SMTP is enabled. + host: "" + # SMTP sender e-mail address, required if SMTP is enabled. + from: "" + ## SMTP sender name, defaults to 'Bitwarden_RS'. + # fromName: "" + ## Enable SSL connection. + # ssl: true + ## SMTP port. Defaults to 25 without SSL, 587 with SSL. + # port: 587 + ## SMTP Authentication Mechanisms. Comma-separated options: 'Plain', 'Login' and 'Xoauth2'. Defaults to 'Plain'. + # authMechanism: Plain + ## Hostname to be sent for SMTP HELO. Defaults to pod name. + # heloName: "" + ## SMTP timeout. + # timeout: 15 + ## Accept SSL session if certificate is valid but hostname doesn't match. DANGEROUS, vulnerable to men-in-the-middle attacks! + # invalidHostname: false + ## Accept invalid certificates. DANGEROUS, vulnerable to men-in-the-middle attacks! + # invalidCertificate: false + ## SMTP username. + # user: "" + ## SMTP password. Required is user is specified, ignored if no user provided. + # password: "" + + ## Enable Yubico OPT authentication. https://github.com/dani-garcia/bitwarden_rs/wiki/Enabling-Yubikey-OTP-authentication + yubico: + enabled: false + ## Yubico server. Defaults to YubiCloud. + # server: + ## Yubico ID and Secret Key. + # clientId: + # secretKey: + + ## Logging options. https://github.com/dani-garcia/bitwarden_rs/wiki/Logging + log: + # Log to file. + file: "" + # Log level. Options are "trace", "debug", "info", "warn", "error" or "off". + level: "trace" + ## Log timestamp format. See https://docs.rs/chrono/0.4.15/chrono/format/strftime/index.html. Defaults to time in milliseconds. + # timeFormat: "" + + icons: + # Disables download of external icons. Setting to true will still serve icons from cache (/data/icon_cache). TTL will default to zero. + disableDownload: false + ## Cache time-to-live for icons fetched. 0 means no purging. + # cache: 2592000 + ## Cache time-to-live for icons that were not available. 0 means no purging. + # cacheFailed: 259200 + +persistence: + data: + enabled: true + mountPath: "/data" + emptyDir: true + accessMode: ReadWriteOnce + size: 1Gi + storageClass: "" + db: + nameOverride: "db" + enabled: true + emptyDir: true + accessMode: ReadWriteOnce + size: 1Gi + storageClass: "" + dbbackup: + enabled: true + emptyDir: true + accessMode: ReadWriteOnce + size: 1Gi + storageClass: "" + + +# Enabled postgres +# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql +postgresql: + enabled: true + postgresqlUsername: bitwarden + postgresqlDatabase: bitwarden + existingSecret: dbcreds + persistence: + enabled: false + existingClaim: db diff --git a/charts/deprecated/nzbhydra/Chart.yaml b/charts/deprecated/nzbhydra/Chart.yaml index 841e9fa964e..9fbf8342b9a 100644 --- a/charts/deprecated/nzbhydra/Chart.yaml +++ b/charts/deprecated/nzbhydra/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: [] # annotations: diff --git a/charts/incubator/appdaemon/Chart.yaml b/charts/incubator/appdaemon/Chart.yaml index 7254c1bf332..3d895b7c1d6 100644 --- a/charts/incubator/appdaemon/Chart.yaml +++ b/charts/incubator/appdaemon/Chart.yaml @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 maintainers: - name: TrueCharts email: info@truecharts.org diff --git a/charts/incubator/appdaemon/values.yaml b/charts/incubator/appdaemon/values.yaml index 5b7d9738b8e..a89ba905d2b 100644 --- a/charts/incubator/appdaemon/values.yaml +++ b/charts/incubator/appdaemon/values.yaml @@ -13,9 +13,8 @@ podSecurityContext: runAsGroup: 568 fsGroup: 568 -timezone: "America/Chicago" - env: + TZ: "America/Chicago" LATITUDE: 46 LONGITUDE: -94 ELEVATION: 1217 diff --git a/charts/incubator/bazarr/Chart.yaml b/charts/incubator/bazarr/Chart.yaml index bda4f6d83ca..bfc5a517267 100644 --- a/charts/incubator/bazarr/Chart.yaml +++ b/charts/incubator/bazarr/Chart.yaml @@ -24,7 +24,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/calibre-web/Chart.yaml b/charts/incubator/calibre-web/Chart.yaml index dec6cf53b21..26a5d2d86f0 100644 --- a/charts/incubator/calibre-web/Chart.yaml +++ b/charts/incubator/calibre-web/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/deluge/Chart.yaml b/charts/incubator/deluge/Chart.yaml index f7e89bdb546..9a8f96f61d3 100644 --- a/charts/incubator/deluge/Chart.yaml +++ b/charts/incubator/deluge/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/fireflyiii/Chart.yaml b/charts/incubator/fireflyiii/Chart.yaml index 443c8bdb9e5..bc4f4b52064 100644 --- a/charts/incubator/fireflyiii/Chart.yaml +++ b/charts/incubator/fireflyiii/Chart.yaml @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 - name: postgresql version: 10.4.3 repository: https://charts.bitnami.com/bitnami diff --git a/charts/incubator/freshrss/Chart.yaml b/charts/incubator/freshrss/Chart.yaml index 3b4afe40c2a..01007b2496c 100644 --- a/charts/incubator/freshrss/Chart.yaml +++ b/charts/incubator/freshrss/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/gaps/Chart.yaml b/charts/incubator/gaps/Chart.yaml index 873f2391296..27d13f4d75e 100644 --- a/charts/incubator/gaps/Chart.yaml +++ b/charts/incubator/gaps/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/grocy/Chart.yaml b/charts/incubator/grocy/Chart.yaml index f7095368175..ad35e5532bb 100644 --- a/charts/incubator/grocy/Chart.yaml +++ b/charts/incubator/grocy/Chart.yaml @@ -18,7 +18,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/heimdall/Chart.yaml b/charts/incubator/heimdall/Chart.yaml index 75be911696e..6a5ff6cca82 100644 --- a/charts/incubator/heimdall/Chart.yaml +++ b/charts/incubator/heimdall/Chart.yaml @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/lazylibrarian/Chart.yaml b/charts/incubator/lazylibrarian/Chart.yaml index 0d9e1d67c84..f3e8b8abab9 100644 --- a/charts/incubator/lazylibrarian/Chart.yaml +++ b/charts/incubator/lazylibrarian/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/lychee/Chart.yaml b/charts/incubator/lychee/Chart.yaml index 2074dbf88b7..45e88e54835 100644 --- a/charts/incubator/lychee/Chart.yaml +++ b/charts/incubator/lychee/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/navidrome/Chart.yaml b/charts/incubator/navidrome/Chart.yaml index 5ffc8ef0487..60671209765 100644 --- a/charts/incubator/navidrome/Chart.yaml +++ b/charts/incubator/navidrome/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/node-red/Chart.yaml b/charts/incubator/node-red/Chart.yaml index 13783327756..559dd6d65db 100644 --- a/charts/incubator/node-red/Chart.yaml +++ b/charts/incubator/node-red/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/nzbget/Chart.yaml b/charts/incubator/nzbget/Chart.yaml index d46b3f98f46..75a848570cd 100644 --- a/charts/incubator/nzbget/Chart.yaml +++ b/charts/incubator/nzbget/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/organizr/Chart.yaml b/charts/incubator/organizr/Chart.yaml index 2e3cc7b9e55..814e44c74f8 100644 --- a/charts/incubator/organizr/Chart.yaml +++ b/charts/incubator/organizr/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/podgrab/Chart.yaml b/charts/incubator/podgrab/Chart.yaml index ae2183a978d..0bcc74cba8c 100644 --- a/charts/incubator/podgrab/Chart.yaml +++ b/charts/incubator/podgrab/Chart.yaml @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 maintainers: - name: TrueCharts email: info@truecharts.org diff --git a/charts/incubator/qbittorrent/Chart.yaml b/charts/incubator/qbittorrent/Chart.yaml index b6be5d8468a..93e62d692b8 100644 --- a/charts/incubator/qbittorrent/Chart.yaml +++ b/charts/incubator/qbittorrent/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/readarr/Chart.yaml b/charts/incubator/readarr/Chart.yaml index ea50d4c127e..ee77201245e 100644 --- a/charts/incubator/readarr/Chart.yaml +++ b/charts/incubator/readarr/Chart.yaml @@ -23,7 +23,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/sabnzbd/Chart.yaml b/charts/incubator/sabnzbd/Chart.yaml index 0d766e7c00e..95502aad866 100644 --- a/charts/incubator/sabnzbd/Chart.yaml +++ b/charts/incubator/sabnzbd/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/tvheadend/Chart.yaml b/charts/incubator/tvheadend/Chart.yaml index b3eb53abae1..12c0c959a43 100644 --- a/charts/incubator/tvheadend/Chart.yaml +++ b/charts/incubator/tvheadend/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/incubator/unifi/Chart.yaml b/charts/incubator/unifi/Chart.yaml index b00f32187cc..6ffb172e5ae 100644 --- a/charts/incubator/unifi/Chart.yaml +++ b/charts/incubator/unifi/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml index 7191e8ad6f6..803d3d2284b 100644 --- a/charts/library/common/Chart.yaml +++ b/charts/library/common/Chart.yaml @@ -19,4 +19,4 @@ name: common sources: - https://github.com/truecharts/apps/tree/master/library/common type: library -version: 4.1.5 +version: 4.1.6 diff --git a/charts/stable/collabora-online/Chart.yaml b/charts/stable/collabora-online/Chart.yaml index 5a3d739f8c9..454a824bf5d 100644 --- a/charts/stable/collabora-online/Chart.yaml +++ b/charts/stable/collabora-online/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/deepstack-cpu/Chart.yaml b/charts/stable/deepstack-cpu/Chart.yaml index d0e37f6c530..d0cbd1fd1ae 100644 --- a/charts/stable/deepstack-cpu/Chart.yaml +++ b/charts/stable/deepstack-cpu/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/emby/Chart.yaml b/charts/stable/emby/Chart.yaml index 83eca634e8e..2b4d454e2cb 100644 --- a/charts/stable/emby/Chart.yaml +++ b/charts/stable/emby/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/esphome/Chart.yaml b/charts/stable/esphome/Chart.yaml index 411b108a109..da1548d274b 100644 --- a/charts/stable/esphome/Chart.yaml +++ b/charts/stable/esphome/Chart.yaml @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/handbrake/Chart.yaml b/charts/stable/handbrake/Chart.yaml index dd430287af1..cd7a895db5e 100644 --- a/charts/stable/handbrake/Chart.yaml +++ b/charts/stable/handbrake/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/home-assistant/Chart.yaml b/charts/stable/home-assistant/Chart.yaml index 8b4c6422262..ebf23a53a54 100644 --- a/charts/stable/home-assistant/Chart.yaml +++ b/charts/stable/home-assistant/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: # ## postgresql is currently not ported to SCALE yet. # - name: postgresql diff --git a/charts/stable/jackett/Chart.yaml b/charts/stable/jackett/Chart.yaml index c8edd69f09f..7bd4b93e724 100644 --- a/charts/stable/jackett/Chart.yaml +++ b/charts/stable/jackett/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/jellyfin/Chart.yaml b/charts/stable/jellyfin/Chart.yaml index 355c5317c26..d81f52347ef 100644 --- a/charts/stable/jellyfin/Chart.yaml +++ b/charts/stable/jellyfin/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/kms/Chart.yaml b/charts/stable/kms/Chart.yaml index 83c998b62ea..2adfbb6a94b 100644 --- a/charts/stable/kms/Chart.yaml +++ b/charts/stable/kms/Chart.yaml @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/lidarr/Chart.yaml b/charts/stable/lidarr/Chart.yaml index 3b70a19aa2a..0fc6daaab9c 100644 --- a/charts/stable/lidarr/Chart.yaml +++ b/charts/stable/lidarr/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/ombi/Chart.yaml b/charts/stable/ombi/Chart.yaml index a3acb5becbb..bfcfa055520 100644 --- a/charts/stable/ombi/Chart.yaml +++ b/charts/stable/ombi/Chart.yaml @@ -24,7 +24,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/plex/Chart.yaml b/charts/stable/plex/Chart.yaml index 76afd99e6d3..d0ed5861e49 100644 --- a/charts/stable/plex/Chart.yaml +++ b/charts/stable/plex/Chart.yaml @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/radarr/Chart.yaml b/charts/stable/radarr/Chart.yaml index c73b592f19d..f02b34ccee4 100644 --- a/charts/stable/radarr/Chart.yaml +++ b/charts/stable/radarr/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/sonarr/Chart.yaml b/charts/stable/sonarr/Chart.yaml index 7bc4269bac9..566a0a4fb59 100644 --- a/charts/stable/sonarr/Chart.yaml +++ b/charts/stable/sonarr/Chart.yaml @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/syncthing/Chart.yaml b/charts/stable/syncthing/Chart.yaml index fddaa071d07..109d6bb15f5 100644 --- a/charts/stable/syncthing/Chart.yaml +++ b/charts/stable/syncthing/Chart.yaml @@ -18,7 +18,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/tautulli/Chart.yaml b/charts/stable/tautulli/Chart.yaml index 04f89b081f1..841ead7dab6 100644 --- a/charts/stable/tautulli/Chart.yaml +++ b/charts/stable/tautulli/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/transmission/Chart.yaml b/charts/stable/transmission/Chart.yaml index cdb5e8bf7ac..b3d1e86eda7 100644 --- a/charts/stable/transmission/Chart.yaml +++ b/charts/stable/transmission/Chart.yaml @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/truecommand/Chart.yaml b/charts/stable/truecommand/Chart.yaml index 1092666fbd6..5859c88a4a3 100644 --- a/charts/stable/truecommand/Chart.yaml +++ b/charts/stable/truecommand/Chart.yaml @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts diff --git a/charts/stable/vaultwarden/.helmignore b/charts/stable/vaultwarden/.helmignore new file mode 100644 index 00000000000..e559de0a012 --- /dev/null +++ b/charts/stable/vaultwarden/.helmignore @@ -0,0 +1,24 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ +# OWNERS file for Kubernetes +OWNERS diff --git a/charts/stable/vaultwarden/CONFIG.md b/charts/stable/vaultwarden/CONFIG.md new file mode 100644 index 00000000000..6d760c18421 --- /dev/null +++ b/charts/stable/vaultwarden/CONFIG.md @@ -0,0 +1,8 @@ +# Configuration Options + +##### Connecting to other apps +If you need to connect this App to other Apps on TrueNAS SCALE, please refer to our "Linking Apps Together" guide: +https://truecharts.org/manual/linking/ + +##### Available config options +In the future this page is going to contain an automated list of options available in the installation/edit UI. diff --git a/charts/stable/bitwarden/Chart.yaml b/charts/stable/vaultwarden/Chart.yaml similarity index 81% rename from charts/stable/bitwarden/Chart.yaml rename to charts/stable/vaultwarden/Chart.yaml index 3351476b348..8c79097ad87 100644 --- a/charts/stable/bitwarden/Chart.yaml +++ b/charts/stable/vaultwarden/Chart.yaml @@ -1,28 +1,29 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" -name: bitwarden -version: 2.0.0 -upstream_version: 2.1.5 +name: vaultwarden +version: 1.0.0 +# upstream_version: appVersion: "auto" description: Unofficial Bitwarden compatible server written in Rust type: application deprecated: false -home: https://github.com/truecharts/apps/tree/master/incubator/bitwarden +home: https://github.com/truecharts/apps/tree/master/stable/vaultwarden icon: https://raw.githubusercontent.com/bitwarden/brand/master/icons/256x256.png keywords: - bitwarden - bitwardenrs - bitwarden_rs + - vaultwarden - password - rust sources: - https://github.com/truecharts/apps/tree/master/incubator/bitwarden - https://github.com/k8s-at-home/charts/tree/master/charts/stable/bitwardenrs - - https://github.com/dani-garcia/bitwarden_rs + - https://github.com/dani-garcia/vaultwarden dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: - name: postgresql version: 10.4.3 diff --git a/charts/stable/vaultwarden/README.md b/charts/stable/vaultwarden/README.md new file mode 100644 index 00000000000..f3497af5baf --- /dev/null +++ b/charts/stable/vaultwarden/README.md @@ -0,0 +1,56 @@ +# Introduction + +![Version: 1.2.5](https://img.shields.io/badge/Version-1.2.5-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) + +Unofficial Vaultwarden compatible server written in Rust + +TrueCharts are designed to be installed as TrueNAS SCALE app only. We can not guarantee this charts works as a stand-alone helm installation. +**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/truecharts/apps/issues/new/choose)** + +## Source Code + +* +* +* + +## Requirements + +Kubernetes: `>=1.16.0-0` + +## Dependencies + +| Repository | Name | Version | +|------------|------|---------| +| https://charts.bitnami.com/bitnami | postgresql | 10.4.2 | +| https://truecharts.org/ | common | 3.5.5 | + +## Installing the Chart + +To install the chart with the release name `Vaultwarden` + +- Open TrueNAS SCALE +- Go to Apps +- Click "Install" for this specific Apps +- Fill out the configuration form + +## Uninstalling the Chart + +To uninstall the `Vaultwarden` deployment + +- Open TrueNAS SCALE +- Go to Apps +- Go to "Installed Apps" +- Expand the menu in the top-right corner of this App +- Click "Remove" for this specific Apps + +The command removes all the Kubernetes components associated with the chart **including storage volumes** _(Except hostPath Storage)_ and deletes the release. + +## Support + +- See the [Wiki](https://truecharts.org) +- Open a [issue](https://github.com/truecharts/apps/issues/new/choose) +- Ask a [question](https://github.com/truecharts/apps/discussions) + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0) +All Rights Reserved - The TrueCharts Project diff --git a/charts/stable/vaultwarden/SCALE/item.yaml b/charts/stable/vaultwarden/SCALE/item.yaml new file mode 100644 index 00000000000..12bd3f41af9 --- /dev/null +++ b/charts/stable/vaultwarden/SCALE/item.yaml @@ -0,0 +1,3 @@ +categories: + - security +icon_url: https://raw.githubusercontent.com/bitwarden/brand/master/icons/256x256.png diff --git a/charts/stable/vaultwarden/SCALE/ix_values.yaml b/charts/stable/vaultwarden/SCALE/ix_values.yaml new file mode 100644 index 00000000000..5054d940525 --- /dev/null +++ b/charts/stable/vaultwarden/SCALE/ix_values.yaml @@ -0,0 +1,54 @@ +## +# 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: bitwardenrs/server + pullPolicy: IfNotPresent + tag: 1.21.0 + +envTpl: + DOMAIN: "https://{{ if .Values.ingress }}{{ if .Values.ingress.main.enabled }}{{ ( index .Values.ingress.main.hosts 0 ).host }}{{ else }}placeholder.com{{ end }}{{ else }}placeholder.com{{ end }}" + +envFrom: + - configMapRef: + name: bitwardenconfig + - secretRef: + name: bitwardensecret + + +envValueFrom: + DATABASE_URL: + secretKeyRef: + name: dbcreds + key: url + +database: + # Database type, must be one of: 'sqlite', 'mysql' or 'postgresql'. + type: postgresql + # Enable DB Write-Ahead-Log for SQLite, disabled for other databases. https://github.com/dani-garcia/bitwarden_rs/wiki/Running-without-WAL-enabled + wal: false + ## URL for external databases (mysql://user:pass@host:port or postgresql://user:pass@host:port). + # url: "" + ## Set the size of the database connection pool. + # maxConnections: 10 + ## Connection retries during startup, 0 for infinite. 1 second between retries. + retries: 30 + +# Enabled postgres +# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql +postgresql: + enabled: true + postgresqlUsername: homeassistant + postgresqlDatabase: homeassistant + existingSecret: dbcreds + persistence: + enabled: true + existingClaim: db + +## +# Most other defaults are set in questions.yaml +# For other options please refer to the wiki, default_values.yaml or the common library chart +## diff --git a/charts/stable/bitwarden/SCALE/questions.yaml b/charts/stable/vaultwarden/SCALE/questions.yaml similarity index 100% rename from charts/stable/bitwarden/SCALE/questions.yaml rename to charts/stable/vaultwarden/SCALE/questions.yaml diff --git a/charts/stable/vaultwarden/app-readme.md b/charts/stable/vaultwarden/app-readme.md new file mode 100644 index 00000000000..91d64cfa99e --- /dev/null +++ b/charts/stable/vaultwarden/app-readme.md @@ -0,0 +1,2 @@ +Unofficial Bitwarden compatible server written in Rust +This App is supplied by TrueCharts, for more information please visit https://truecharts.org diff --git a/charts/stable/vaultwarden/templates/_configmap.tpl b/charts/stable/vaultwarden/templates/_configmap.tpl new file mode 100644 index 00000000000..8809925abdf --- /dev/null +++ b/charts/stable/vaultwarden/templates/_configmap.tpl @@ -0,0 +1,116 @@ +{{/* Define the configmap */}} +{{- define "vaultwarden.configmap" -}} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: vaultwardenconfig +data: + ROCKET_PORT: "8080" + SIGNUPS_ALLOWED: {{ .Values.vaultwarden.allowSignups | quote }} + {{- if .Values.vaultwarden.signupDomains }} + SIGNUPS_DOMAINS_WHITELIST: {{ join "," .Values.vaultwarden.signupDomains | quote }} + {{- end }} + {{- if and (eq .Values.vaultwarden.verifySignup true) (eq .Values.vaultwarden.smtp.enabled false) }}{{ required "Signup verification requires SMTP to be enabled" nil}}{{end}} + SIGNUPS_VERIFY: {{ .Values.vaultwarden.verifySignup | quote }} + {{- if and (eq .Values.vaultwarden.requireEmail true) (eq .Values.vaultwarden.smtp.enabled false) }}{{ required "Requiring emails for login depends on SMTP" nil}}{{end}} + REQUIRE_DEVICE_EMAIL: {{ .Values.vaultwarden.requireEmail | quote }} + {{- if .Values.vaultwarden.emailAttempts }} + EMAIL_ATTEMPTS_LIMIT: {{ .Values.vaultwarden.emailAttempts | quote }} + {{- end }} + {{- if .Values.vaultwarden.emailTokenExpiration }} + EMAIL_EXPIRATION_TIME: {{ .Values.vaultwarden.emailTokenExpiration | quote }} + {{- end }} + INVITATIONS_ALLOWED: {{ .Values.vaultwarden.allowInvitation | quote }} + {{- if .Values.vaultwarden.defaultInviteName }} + INVITATION_ORG_NAME: {{ .Values.vaultwarden.defaultInviteName | quote }} + {{- end }} + SHOW_PASSWORD_HINT: {{ .Values.vaultwarden.showPasswordHint | quote }} + WEBSOCKET_ENABLED: {{ .Values.vaultwarden.enableWebsockets | quote }} + WEB_VAULT_ENABLED: {{ .Values.vaultwarden.enableWebVault | quote }} + ORG_CREATION_USERS: {{ .Values.vaultwarden.orgCreationUsers | quote }} + {{- if .Values.vaultwarden.attachmentLimitOrg }} + ORG_ATTACHMENT_LIMIT: {{ .Values.vaultwarden.attachmentLimitOrg | quote }} + {{- end }} + {{- if .Values.vaultwarden.attachmentLimitUser }} + USER_ATTACHMENT_LIMIT: {{ .Values.vaultwarden.attachmentLimitUser | quote }} + {{- end }} + {{- if .Values.vaultwarden.hibpApiKey }} + HIBP_API_KEY: {{ .Values.vaultwarden.hibpApiKey | quote }} + {{- end }} + {{- include "vaultwarden.dbTypeValid" . }} + {{- if .Values.database.retries }} + DB_CONNECTION_RETRIES: {{ .Values.database.retries | quote }} + {{- end }} + {{- if .Values.database.maxConnections }} + DATABASE_MAX_CONNS: {{ .Values.database.maxConnections | quote }} + {{- end }} + {{- if eq .Values.vaultwarden.smtp.enabled true }} + SMTP_HOST: {{ required "SMTP host is required to enable SMTP" .Values.vaultwarden.smtp.host | quote }} + SMTP_FROM: {{ required "SMTP sender address ('from') is required to enable SMTP" .Values.vaultwarden.smtp.from | quote }} + {{- if .Values.vaultwarden.smtp.fromName }} + SMTP_FROM_NAME: {{ .Values.vaultwarden.smtp.fromName | quote }} + {{- end }} + {{- if .Values.vaultwarden.smtp.ssl }} + SMTP_SSL: {{ .Values.vaultwarden.smtp.ssl | quote }} + {{- end }} + {{- if .Values.vaultwarden.smtp.port }} + SMTP_PORT: {{ .Values.vaultwarden.smtp.port | quote }} + {{- end }} + {{- if .Values.vaultwarden.smtp.authMechanism }} + SMTP_AUTH_MECHANISM: {{ .Values.vaultwarden.smtp.authMechanism | quote }} + {{- end }} + {{- if .Values.vaultwarden.smtp.heloName }} + HELO_NAME: {{ .Values.vaultwarden.smtp.heloName | quote }} + {{- end }} + {{- if .Values.vaultwarden.smtp.timeout }} + SMTP_TIMEOUT: {{ .Values.vaultwarden.smtp.timeout | quote }} + {{- end }} + {{- if .Values.vaultwarden.smtp.invalidHostname }} + SMTP_ACCEPT_INVALID_HOSTNAMES: {{ .Values.vaultwarden.smtp.invalidHostname | quote }} + {{- end }} + {{- if .Values.vaultwarden.smtp.invalidCertificate }} + SMTP_ACCEPT_INVALID_CERTS: {{ .Values.vaultwarden.smtp.invalidCertificate | quote }} + {{- end }} + {{- end }} + {{- if .Values.vaultwarden.log.file }} + LOG_FILE: {{ .Values.vaultwarden.log.file | quote }} + {{- end }} + {{- if or .Values.vaultwarden.log.level .Values.vaultwarden.log.timeFormat }} + EXTENDED_LOGGING: "true" + {{- end }} + {{- if .Values.vaultwarden.log.level }} + {{- include "vaultwarden.logLevelValid" . }} + LOG_LEVEL: {{ .Values.vaultwarden.log.level | quote }} + {{- end }} + {{- if .Values.vaultwarden.log.timeFormat }} + LOG_TIMESTAMP_FORMAT: {{ .Values.vaultwarden.log.timeFormat | quote }} + {{- end }} + {{- if .Values.vaultwarden.icons.disableDownload }} + DISABLE_ICON_DOWNLOAD: {{ .Values.vaultwarden.icons.disableDownload | quote }} + {{- if and (not .Values.vaultwarden.icons.cache) (eq .Values.vaultwarden.icons.disableDownload "true") }} + ICON_CACHE_TTL: "0" + {{- end }} + {{- end }} + {{- if .Values.vaultwarden.icons.cache }} + ICON_CACHE_TTL: {{ .Values.vaultwarden.icons.cache | quote }} + {{- end }} + {{- if .Values.vaultwarden.icons.cacheFailed }} + ICON_CACHE_NEGTTL: {{ .Values.vaultwarden.icons.cacheFailed | quote }} + {{- end }} + {{- if eq .Values.vaultwarden.admin.enabled true }} + {{- if eq .Values.vaultwarden.admin.disableAdminToken true }} + DISABLE_ADMIN_TOKEN: "true" + {{- end }} + {{- end }} + {{- if eq .Values.vaultwarden.yubico.enabled true }} + {{- if .Values.vaultwarden.yubico.server }} + YUBICO_SERVER: {{ .Values.vaultwarden.yubico.server | quote }} + {{- end }} + {{- end }} + {{- if eq .Values.database.type "sqlite" }} + ENABLE_DB_WAL: {{ .Values.database.wal | quote }} + {{- else }} + ENABLE_DB_WAL: "false" + {{- end }} +{{- end -}} diff --git a/charts/stable/vaultwarden/templates/_secrets.tpl b/charts/stable/vaultwarden/templates/_secrets.tpl new file mode 100644 index 00000000000..ac57e81471d --- /dev/null +++ b/charts/stable/vaultwarden/templates/_secrets.tpl @@ -0,0 +1,59 @@ +{{/* Define the secrets */}} +{{- define "vaultwarden.secrets" -}} + +{{- $adminToken := "" }} +{{- if eq .Values.vaultwarden.admin.enabled true }} +{{- $adminToken = .Values.vaultwarden.admin.token | default (randAlphaNum 48) | b64enc | quote }} +{{- end -}} + +{{- $smtpUser := "" }} +{{- if and (eq .Values.vaultwarden.smtp.enabled true ) (.Values.vaultwarden.smtp.user) }} +{{- $smtpUser = .Values.vaultwarden.smtp.user | b64enc | quote }} +{{- end -}} + +{{- $yubicoClientId := "" }} +{{- if eq .Values.vaultwarden.yubico.enabled true }} +{{- $yubicoClientId = required "Yubico Client ID required" .Values.vaultwarden.yubico.clientId | toString | b64enc | quote }} +{{- end -}} +--- + +apiVersion: v1 +kind: Secret +metadata: + name: vaultwardensecret +data: + {{- if ne $adminToken "" }} + ADMIN_TOKEN: {{ $adminToken }} + {{- end }} + {{- if ne $smtpUser "" }} + SMTP_USERNAME: {{ $smtpUser }} + SMTP_PASSWORD: {{ required "Must specify SMTP password" .Values.vaultwarden.smtp.password | b64enc | quote }} + {{- end }} + {{- if ne $yubicoClientId "" }} + YUBICO_CLIENT_ID: {{ $yubicoClientId }} + YUBICO_SECRET_KEY: {{ required "Yubico Secret Key required" .Values.vaultwarden.yubico.secretKey | b64enc | quote }} + {{- end }} + +--- + +apiVersion: v1 +kind: Secret +metadata: + labels: + {{- include "common.labels" . | nindent 4 }} + name: dbcreds +{{- $previous := lookup "v1" "Secret" .Release.Namespace "dbcreds" }} +{{- $dbPass := "" }} +data: +{{- if $previous }} + {{- $dbPass = ( index $previous.data "postgresql-password" ) | b64dec }} + postgresql-password: {{ ( index $previous.data "postgresql-password" ) }} + postgresql-postgres-password: {{ ( index $previous.data "postgresql-postgres-password" ) }} +{{- else }} + {{- $dbPass = randAlphaNum 50 }} + postgresql-password: {{ $dbPass | b64enc | quote }} + postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }} +{{- end }} + url: {{ ( printf "%v%v:%v@%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }} +type: Opaque +{{- end -}} diff --git a/charts/stable/vaultwarden/templates/_validate.tpl b/charts/stable/vaultwarden/templates/_validate.tpl new file mode 100644 index 00000000000..e4832c2f6e5 --- /dev/null +++ b/charts/stable/vaultwarden/templates/_validate.tpl @@ -0,0 +1,17 @@ +{{/* +Ensure valid DB type is select, defaults to SQLite +*/}} +{{- define "vaultwarden.dbTypeValid" -}} +{{- if not (or (eq .Values.database.type "postgresql") (eq .Values.database.type "mysql") (eq .Values.database.type "sqlite")) }} +{{- required "Invalid database type" nil }} +{{- end -}} +{{- end -}} + +{{/* +Ensure log type is valid +*/}} +{{- define "vaultwarden.logLevelValid" -}} +{{- if not (or (eq .Values.vaultwarden.log.level "trace") (eq .Values.vaultwarden.log.level "debug") (eq .Values.vaultwarden.log.level "info") (eq .Values.vaultwarden.log.level "warn") (eq .Values.vaultwarden.log.level "error") (eq .Values.vaultwarden.log.level "off")) }} +{{- required "Invalid log level" nil }} +{{- end }} +{{- end }} diff --git a/charts/stable/vaultwarden/templates/common.yaml b/charts/stable/vaultwarden/templates/common.yaml new file mode 100644 index 00000000000..74f04d2d8c2 --- /dev/null +++ b/charts/stable/vaultwarden/templates/common.yaml @@ -0,0 +1,11 @@ +{{/* Make sure all variables are set properly */}} +{{- include "common.values.setup" . }} + +{{/* Render the templates */}} +{{ include "common.all" . }} + +{{/* Render configmap for vaultwarden */}} +{{- include "vaultwarden.configmap" . }} + +{{/* Render secrets for vaultwarden */}} +{{- include "vaultwarden.secrets" . }} diff --git a/charts/stable/bitwarden/values.yaml b/charts/stable/vaultwarden/values.yaml similarity index 97% rename from charts/stable/bitwarden/values.yaml rename to charts/stable/vaultwarden/values.yaml index 9d937510ad9..5f43e6f7b69 100644 --- a/charts/stable/bitwarden/values.yaml +++ b/charts/stable/vaultwarden/values.yaml @@ -1,7 +1,7 @@ # Default values for Bitwarden. image: - repository: bitwardenrs/server + repository: vaultwarden/server pullPolicy: IfNotPresent tag: 1.21.0 @@ -26,9 +26,9 @@ envTpl: envFrom: - configMapRef: - name: bitwardenconfig + name: vaultwardenconfig - secretRef: - name: bitwardensecret + name: vaultwardensecret envValueFrom: DATABASE_URL: @@ -49,7 +49,7 @@ database: # retries: 15 # Set Bitwarden_rs application variables -bitwardenrs: +vaultwarden: # Allow any user to sign-up: https://github.com/dani-garcia/bitwarden_rs/wiki/Disable-registration-of-new-users allowSignups: true ## Whitelist domains allowed to sign-up. 'allowSignups' is ignored if set. @@ -175,8 +175,8 @@ persistence: # ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql postgresql: enabled: true - postgresqlUsername: homeassistant - postgresqlDatabase: homeassistant + postgresqlUsername: vaultwarden + postgresqlDatabase: vaultwarden existingSecret: dbcreds persistence: enabled: false diff --git a/charts/stable/zwavejs2mqtt/Chart.yaml b/charts/stable/zwavejs2mqtt/Chart.yaml index 527a262be9a..6f0927c0eef 100644 --- a/charts/stable/zwavejs2mqtt/Chart.yaml +++ b/charts/stable/zwavejs2mqtt/Chart.yaml @@ -22,7 +22,7 @@ sources: dependencies: - name: common repository: https://truecharts.org/ - version: 4.1.2 + version: 4.1.5 # condition: maintainers: - name: TrueCharts From 12b4b6382f04ffbdecce08cee434b5e5ecbd8fff Mon Sep 17 00:00:00 2001 From: Stavros Kois Date: Sun, 23 May 2021 02:15:39 +0300 Subject: [PATCH 06/11] Common 4.0 App Refactor Part 5 - Stavos --- .../deprecated/nzbhydra/SCALE/questions.yaml | 16 ++++++-------- .../incubator/appdaemon/SCALE/questions.yaml | 16 ++++++-------- charts/incubator/bazarr/SCALE/questions.yaml | 16 ++++++-------- .../calibre-web/SCALE/questions.yaml | 16 ++++++-------- charts/incubator/calibre-web/values.yaml | 7 ------ charts/incubator/deluge/SCALE/questions.yaml | 16 ++++++-------- charts/incubator/deluge/values.yaml | 8 ------- .../incubator/fireflyiii/SCALE/questions.yaml | 16 ++++++-------- .../incubator/freshrss/SCALE/questions.yaml | 16 ++++++-------- charts/incubator/freshrss/values.yaml | 7 ------ charts/incubator/gaps/SCALE/questions.yaml | 16 ++++++-------- charts/incubator/grocy/SCALE/questions.yaml | 16 ++++++-------- charts/incubator/grocy/values.yaml | 7 ------ .../incubator/heimdall/SCALE/questions.yaml | 16 ++++++-------- charts/incubator/heimdall/values.yaml | 7 ------ .../lazylibrarian/SCALE/questions.yaml | 16 ++++++-------- charts/incubator/lazylibrarian/values.yaml | 7 ------ charts/incubator/lychee/SCALE/questions.yaml | 16 ++++++-------- charts/incubator/lychee/values.yaml | 7 ------ .../incubator/navidrome/SCALE/questions.yaml | 16 ++++++-------- .../incubator/node-red/SCALE/questions.yaml | 16 ++++++-------- charts/incubator/nzbget/SCALE/questions.yaml | 16 ++++++-------- .../incubator/organizr/SCALE/questions.yaml | 16 ++++++-------- charts/incubator/organizr/values.yaml | 7 ------ charts/incubator/podgrab/SCALE/questions.yaml | 17 ++++++-------- .../qbittorrent/SCALE/questions.yaml | 16 ++++++-------- charts/incubator/readarr/SCALE/questions.yaml | 16 ++++++-------- charts/incubator/sabnzbd/SCALE/questions.yaml | 17 ++++++-------- .../incubator/tvheadend/SCALE/questions.yaml | 18 +++++++-------- charts/incubator/tvheadend/values.yaml | 7 ------ charts/incubator/unifi/SCALE/questions.yaml | 18 +++++++-------- charts/incubator/unifi/values.yaml | 17 ++++++-------- .../collabora-online/SCALE/ix_values.yaml | 8 ------- .../collabora-online/SCALE/questions.yaml | 20 +++++++---------- charts/stable/collabora-online/values.yaml | 7 ------ .../stable/deepstack-cpu/SCALE/ix_values.yaml | 10 +-------- .../stable/deepstack-cpu/SCALE/questions.yaml | 16 ++++++-------- charts/stable/deepstack-cpu/values.yaml | 14 +++--------- charts/stable/emby/SCALE/ix_values.yaml | 7 +++++- charts/stable/emby/SCALE/questions.yaml | 18 +++++++-------- charts/stable/emby/values.yaml | 6 +++-- charts/stable/esphome/SCALE/questions.yaml | 20 ++++++++++------- charts/stable/handbrake/SCALE/ix_values.yaml | 8 ------- charts/stable/handbrake/SCALE/questions.yaml | 18 +++++++-------- charts/stable/handbrake/values.yaml | 4 ---- .../home-assistant/SCALE/questions.yaml | 16 ++++++-------- charts/stable/home-assistant/values.yaml | 8 ------- charts/stable/jackett/SCALE/questions.yaml | 16 ++++++-------- charts/stable/jellyfin/SCALE/ix_values.yaml | 7 +++++- charts/stable/jellyfin/SCALE/questions.yaml | 18 +++++++-------- charts/stable/jellyfin/values.yaml | 5 ++++- charts/stable/kms/SCALE/questions.yaml | 16 ++++++-------- charts/stable/kms/values.yaml | 7 ------ charts/stable/lidarr/SCALE/questions.yaml | 16 ++++++-------- charts/stable/ombi/SCALE/questions.yaml | 16 ++++++-------- charts/stable/plex/SCALE/ix_values.yaml | 6 +++++ charts/stable/plex/SCALE/questions.yaml | 18 +++++++-------- charts/stable/plex/values.yaml | 5 ++++- charts/stable/radarr/SCALE/questions.yaml | 16 ++++++-------- charts/stable/sonarr/SCALE/questions.yaml | 16 ++++++-------- charts/stable/syncthing/SCALE/questions.yaml | 13 +++++++++++ charts/stable/tautulli/SCALE/questions.yaml | 16 ++++++-------- .../stable/transmission/SCALE/questions.yaml | 16 ++++++-------- .../stable/truecommand/SCALE/questions.yaml | 16 ++++++-------- charts/stable/truecommand/values.yaml | 7 ------ .../stable/vaultwarden/SCALE/questions.yaml | 16 ++++++-------- .../stable/zwavejs2mqtt/SCALE/ix_values.yaml | 8 ++++++- .../stable/zwavejs2mqtt/SCALE/questions.yaml | 22 +++++++++++-------- 68 files changed, 366 insertions(+), 529 deletions(-) diff --git a/charts/deprecated/nzbhydra/SCALE/questions.yaml b/charts/deprecated/nzbhydra/SCALE/questions.yaml index 88a886ed8d6..8bc67796aa3 100644 --- a/charts/deprecated/nzbhydra/SCALE/questions.yaml +++ b/charts/deprecated/nzbhydra/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/appdaemon/SCALE/questions.yaml b/charts/incubator/appdaemon/SCALE/questions.yaml index 2febfebff00..cfe1db7b299 100644 --- a/charts/incubator/appdaemon/SCALE/questions.yaml +++ b/charts/incubator/appdaemon/SCALE/questions.yaml @@ -55,15 +55,6 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" # Docker specific env - variable: env group: "Configuration" @@ -71,6 +62,13 @@ questions: schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: HA_URL label: "HA URL" description: "Your HomeAssistant URL" diff --git a/charts/incubator/bazarr/SCALE/questions.yaml b/charts/incubator/bazarr/SCALE/questions.yaml index da449a377b5..2e5e8c9fd6e 100644 --- a/charts/incubator/bazarr/SCALE/questions.yaml +++ b/charts/incubator/bazarr/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/calibre-web/SCALE/questions.yaml b/charts/incubator/calibre-web/SCALE/questions.yaml index 9b41c36c536..219d81a1aad 100644 --- a/charts/incubator/calibre-web/SCALE/questions.yaml +++ b/charts/incubator/calibre-web/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/calibre-web/values.yaml b/charts/incubator/calibre-web/values.yaml index 79415093c51..40a67da4e7d 100644 --- a/charts/incubator/calibre-web/values.yaml +++ b/charts/incubator/calibre-web/values.yaml @@ -8,13 +8,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - service: main: ports: diff --git a/charts/incubator/deluge/SCALE/questions.yaml b/charts/incubator/deluge/SCALE/questions.yaml index 5ae87743f08..2a581f47c67 100644 --- a/charts/incubator/deluge/SCALE/questions.yaml +++ b/charts/incubator/deluge/SCALE/questions.yaml @@ -56,21 +56,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - ## Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Australia/Hobart" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Australia/Hobart" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/deluge/values.yaml b/charts/incubator/deluge/values.yaml index b0ddfc33d5f..82af7c282cd 100644 --- a/charts/incubator/deluge/values.yaml +++ b/charts/incubator/deluge/values.yaml @@ -8,13 +8,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - service: main: ports: @@ -33,7 +26,6 @@ service: port: 51413 protocol: UDP - persistence: config: enabled: true diff --git a/charts/incubator/fireflyiii/SCALE/questions.yaml b/charts/incubator/fireflyiii/SCALE/questions.yaml index 9507691190c..932e356c980 100644 --- a/charts/incubator/fireflyiii/SCALE/questions.yaml +++ b/charts/incubator/fireflyiii/SCALE/questions.yaml @@ -55,15 +55,6 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" # Docker specific env - variable: env group: "Configuration" @@ -71,6 +62,13 @@ questions: schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: APP_KEY label: "App Key" description: "Your unique 32 application character key" diff --git a/charts/incubator/freshrss/SCALE/questions.yaml b/charts/incubator/freshrss/SCALE/questions.yaml index 7714f4b6faf..d1248a6395a 100644 --- a/charts/incubator/freshrss/SCALE/questions.yaml +++ b/charts/incubator/freshrss/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/freshrss/values.yaml b/charts/incubator/freshrss/values.yaml index f0a86a9284d..11d4c91b16f 100644 --- a/charts/incubator/freshrss/values.yaml +++ b/charts/incubator/freshrss/values.yaml @@ -8,13 +8,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - service: main: ports: diff --git a/charts/incubator/gaps/SCALE/questions.yaml b/charts/incubator/gaps/SCALE/questions.yaml index 8ef13745ffe..32b113415a5 100644 --- a/charts/incubator/gaps/SCALE/questions.yaml +++ b/charts/incubator/gaps/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/grocy/SCALE/questions.yaml b/charts/incubator/grocy/SCALE/questions.yaml index 439df3f618d..f1af3711d40 100644 --- a/charts/incubator/grocy/SCALE/questions.yaml +++ b/charts/incubator/grocy/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/grocy/values.yaml b/charts/incubator/grocy/values.yaml index 4c23b96081d..c8aa7386b77 100644 --- a/charts/incubator/grocy/values.yaml +++ b/charts/incubator/grocy/values.yaml @@ -8,13 +8,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - service: main: ports: diff --git a/charts/incubator/heimdall/SCALE/questions.yaml b/charts/incubator/heimdall/SCALE/questions.yaml index 2be6b567771..da7f7db6fbe 100644 --- a/charts/incubator/heimdall/SCALE/questions.yaml +++ b/charts/incubator/heimdall/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/heimdall/values.yaml b/charts/incubator/heimdall/values.yaml index 54a57efc7c9..a8331f4dd56 100644 --- a/charts/incubator/heimdall/values.yaml +++ b/charts/incubator/heimdall/values.yaml @@ -8,13 +8,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - service: main: ports: diff --git a/charts/incubator/lazylibrarian/SCALE/questions.yaml b/charts/incubator/lazylibrarian/SCALE/questions.yaml index 487a7ac7d53..3870b0ab27b 100644 --- a/charts/incubator/lazylibrarian/SCALE/questions.yaml +++ b/charts/incubator/lazylibrarian/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/lazylibrarian/values.yaml b/charts/incubator/lazylibrarian/values.yaml index 4c1b4d126c4..5aa4e24b14d 100644 --- a/charts/incubator/lazylibrarian/values.yaml +++ b/charts/incubator/lazylibrarian/values.yaml @@ -8,13 +8,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - service: main: ports: diff --git a/charts/incubator/lychee/SCALE/questions.yaml b/charts/incubator/lychee/SCALE/questions.yaml index 3200f1acc91..6c7157cbeae 100644 --- a/charts/incubator/lychee/SCALE/questions.yaml +++ b/charts/incubator/lychee/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/lychee/values.yaml b/charts/incubator/lychee/values.yaml index 2ef4320a969..20e922c74ef 100644 --- a/charts/incubator/lychee/values.yaml +++ b/charts/incubator/lychee/values.yaml @@ -8,13 +8,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - service: main: ports: diff --git a/charts/incubator/navidrome/SCALE/questions.yaml b/charts/incubator/navidrome/SCALE/questions.yaml index f65cb1436fb..da4cef7d82b 100644 --- a/charts/incubator/navidrome/SCALE/questions.yaml +++ b/charts/incubator/navidrome/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/node-red/SCALE/questions.yaml b/charts/incubator/node-red/SCALE/questions.yaml index 544eafb56cb..fb811ceaea9 100644 --- a/charts/incubator/node-red/SCALE/questions.yaml +++ b/charts/incubator/node-red/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/nzbget/SCALE/questions.yaml b/charts/incubator/nzbget/SCALE/questions.yaml index 22928683a7e..c8342ac91a1 100644 --- a/charts/incubator/nzbget/SCALE/questions.yaml +++ b/charts/incubator/nzbget/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/organizr/SCALE/questions.yaml b/charts/incubator/organizr/SCALE/questions.yaml index d732f75a518..beadea5524c 100644 --- a/charts/incubator/organizr/SCALE/questions.yaml +++ b/charts/incubator/organizr/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/organizr/values.yaml b/charts/incubator/organizr/values.yaml index 4ccff62bf14..d4a987c157e 100644 --- a/charts/incubator/organizr/values.yaml +++ b/charts/incubator/organizr/values.yaml @@ -8,13 +8,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - service: main: ports: diff --git a/charts/incubator/podgrab/SCALE/questions.yaml b/charts/incubator/podgrab/SCALE/questions.yaml index 0f3bd6aacdb..0df70df65b8 100644 --- a/charts/incubator/podgrab/SCALE/questions.yaml +++ b/charts/incubator/podgrab/SCALE/questions.yaml @@ -55,22 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - # App env variables - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PASSWORD label: "Password" description: "Desired Password" diff --git a/charts/incubator/qbittorrent/SCALE/questions.yaml b/charts/incubator/qbittorrent/SCALE/questions.yaml index 01d504645f0..c9cbb003a38 100644 --- a/charts/incubator/qbittorrent/SCALE/questions.yaml +++ b/charts/incubator/qbittorrent/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/readarr/SCALE/questions.yaml b/charts/incubator/readarr/SCALE/questions.yaml index f842de7a3a3..3163e06f0df 100644 --- a/charts/incubator/readarr/SCALE/questions.yaml +++ b/charts/incubator/readarr/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/sabnzbd/SCALE/questions.yaml b/charts/incubator/sabnzbd/SCALE/questions.yaml index 68c99166689..b14f7202b38 100644 --- a/charts/incubator/sabnzbd/SCALE/questions.yaml +++ b/charts/incubator/sabnzbd/SCALE/questions.yaml @@ -55,22 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - # Docker specific env - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: HOST_WHITELIST_ENTRIES label: "HostName Whitelist" description: "If you use a reverse proxy, you might need to enter your hostname's here (comma seperated)" diff --git a/charts/incubator/tvheadend/SCALE/questions.yaml b/charts/incubator/tvheadend/SCALE/questions.yaml index 5ad48392a21..0c9bccb9a2b 100644 --- a/charts/incubator/tvheadend/SCALE/questions.yaml +++ b/charts/incubator/tvheadend/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" @@ -264,7 +262,7 @@ questions: schema: type: dict attrs: - - variable: tcp + - variable: htsp label: "TCP Service Port Configuration" schema: type: dict diff --git a/charts/incubator/tvheadend/values.yaml b/charts/incubator/tvheadend/values.yaml index 2607534d9d8..5372e7b84d1 100644 --- a/charts/incubator/tvheadend/values.yaml +++ b/charts/incubator/tvheadend/values.yaml @@ -8,13 +8,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - # See https://github.com/linuxserver/docker-tvheadend#parameters env: {} # PUID: 1000 diff --git a/charts/incubator/unifi/SCALE/questions.yaml b/charts/incubator/unifi/SCALE/questions.yaml index 89d3472596d..6206aa1bb3b 100644 --- a/charts/incubator/unifi/SCALE/questions.yaml +++ b/charts/incubator/unifi/SCALE/questions.yaml @@ -54,21 +54,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" @@ -358,7 +356,7 @@ questions: schema: type: dict attrs: - - variable: tcp + - variable: udp label: "TCP Service Port Configuration" schema: type: dict diff --git a/charts/incubator/unifi/values.yaml b/charts/incubator/unifi/values.yaml index 28f58e8d137..69324c7fdc0 100644 --- a/charts/incubator/unifi/values.yaml +++ b/charts/incubator/unifi/values.yaml @@ -8,13 +8,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - envTpl: # Permissions Settings UNIFI_GID: "568" @@ -25,15 +18,19 @@ service: ports: main: port: 8443 - conn: + comm: enabled: true type: ClusterIP ports: - http: + tcp: enabled: true port: 8080 protocol: TCP - stun: + stun: + enabled: true + type: ClusterIP + ports: + udp: enabled: true port: 3478 protocol: UDP diff --git a/charts/stable/collabora-online/SCALE/ix_values.yaml b/charts/stable/collabora-online/SCALE/ix_values.yaml index cc7a037dea2..5647e9af45e 100644 --- a/charts/stable/collabora-online/SCALE/ix_values.yaml +++ b/charts/stable/collabora-online/SCALE/ix_values.yaml @@ -8,14 +8,6 @@ image: repository: collabora/code tag: 6.4.8.4 pullPolicy: IfNotPresent - -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: null - runAsGroup: null - fsGroup: null - ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/stable/collabora-online/SCALE/questions.yaml b/charts/stable/collabora-online/SCALE/questions.yaml index 186da46c71b..14778a52919 100644 --- a/charts/stable/collabora-online/SCALE/questions.yaml +++ b/charts/stable/collabora-online/SCALE/questions.yaml @@ -56,23 +56,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - # envList Configuraiton - variable: env group: "Configuration" - label: "Environment Variables Configuration" + label: "Image Environment" schema: type: dict - required: true attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: domain label: "Domains will be using collabora" description: 'Use backslash "\" before dots ".". Use pipe "|" to separate multiple domains' diff --git a/charts/stable/collabora-online/values.yaml b/charts/stable/collabora-online/values.yaml index 45fe358e8d8..62592430ad2 100644 --- a/charts/stable/collabora-online/values.yaml +++ b/charts/stable/collabora-online/values.yaml @@ -6,13 +6,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: null - runAsGroup: null - fsGroup: null - service: main: type: NodePort diff --git a/charts/stable/deepstack-cpu/SCALE/ix_values.yaml b/charts/stable/deepstack-cpu/SCALE/ix_values.yaml index aa8a0483d78..c684d8ec8bd 100644 --- a/charts/stable/deepstack-cpu/SCALE/ix_values.yaml +++ b/charts/stable/deepstack-cpu/SCALE/ix_values.yaml @@ -9,18 +9,10 @@ image: pullPolicy: IfNotPresent tag: cpu-2021.02.1 -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - supplementalGroups: [24, 44, 107] - envTpl: -# Permissions Settings + # Permissions Settings USER_ID: "568" GROUP_ID: "568" - ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/stable/deepstack-cpu/SCALE/questions.yaml b/charts/stable/deepstack-cpu/SCALE/questions.yaml index ec6504e10ec..dd2b17b3fd3 100644 --- a/charts/stable/deepstack-cpu/SCALE/questions.yaml +++ b/charts/stable/deepstack-cpu/SCALE/questions.yaml @@ -56,21 +56,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" diff --git a/charts/stable/deepstack-cpu/values.yaml b/charts/stable/deepstack-cpu/values.yaml index 74068a0c5f3..877d0bb4fe8 100644 --- a/charts/stable/deepstack-cpu/values.yaml +++ b/charts/stable/deepstack-cpu/values.yaml @@ -15,14 +15,8 @@ service: main: port: 5000 -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - envTpl: -# Permissions Settings + # Permissions Settings USER_ID: "568" GROUP_ID: "568" @@ -31,10 +25,8 @@ env: VISION-FACE: "True" VISION-DETECTION: "True" VISION-SCENE: "True" - MODELSTORE-DETECTION: "/modelstore/detection" # Path to custom models (needs to be on documentation) - MODE: "High" # High|Medium|Low - # ADMIN-KEY: "" # Deprecated since it got OpenSource? or optional? - # API-KEY: "" # Deprecated since it got OpenSource? or optional?podSecurityContext: + MODELSTORE-DETECTION: "/modelstore/detection" # Path to custom models (needs to be on documentation) + MODE: "High" # High|Medium|Low persistence: config: diff --git a/charts/stable/emby/SCALE/ix_values.yaml b/charts/stable/emby/SCALE/ix_values.yaml index 374eaf6ab77..d6026df4642 100644 --- a/charts/stable/emby/SCALE/ix_values.yaml +++ b/charts/stable/emby/SCALE/ix_values.yaml @@ -9,7 +9,12 @@ image: pullPolicy: IfNotPresent tag: v4.5.4.0 - +podSecurityContext: + runAsNonRoot: true + runAsUser: 568 + runAsGroup: 568 + fsGroup: 568 + supplementalGroups: [44, 107] ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/stable/emby/SCALE/questions.yaml b/charts/stable/emby/SCALE/questions.yaml index 7ab7940ecbb..b74e8f35c9f 100644 --- a/charts/stable/emby/SCALE/questions.yaml +++ b/charts/stable/emby/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" @@ -367,7 +365,7 @@ questions: description: "Additional groups this App needs access to" schema: type: list - default: [44, 107] + default: [] items: - variable: Group label: "Group" diff --git a/charts/stable/emby/values.yaml b/charts/stable/emby/values.yaml index 29590510e42..e4395bc2e31 100644 --- a/charts/stable/emby/values.yaml +++ b/charts/stable/emby/values.yaml @@ -8,9 +8,11 @@ image: strategy: type: Recreate -# 44=video 107=render -# Configure the Security Context for the Pod podSecurityContext: + runAsNonRoot: true + runAsUser: 568 + runAsGroup: 568 + fsGroup: 568 supplementalGroups: [44, 107] service: diff --git a/charts/stable/esphome/SCALE/questions.yaml b/charts/stable/esphome/SCALE/questions.yaml index 751ee59700c..da66562a758 100644 --- a/charts/stable/esphome/SCALE/questions.yaml +++ b/charts/stable/esphome/SCALE/questions.yaml @@ -55,15 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" + - variable: env + group: "Configuration" + label: "Image Environment" schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" + type: dict + attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" # Configure Enviroment Variables - variable: envList label: "Image environment" diff --git a/charts/stable/handbrake/SCALE/ix_values.yaml b/charts/stable/handbrake/SCALE/ix_values.yaml index a25da76d817..4eea1bb3dd9 100644 --- a/charts/stable/handbrake/SCALE/ix_values.yaml +++ b/charts/stable/handbrake/SCALE/ix_values.yaml @@ -9,14 +9,6 @@ image: tag: v1.23.2 pullPolicy: IfNotPresent -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - supplementalGroups: [24, 44, 107] - #All values here are set as the docker defaults. envTpl: # Permissions Settings diff --git a/charts/stable/handbrake/SCALE/questions.yaml b/charts/stable/handbrake/SCALE/questions.yaml index 9cdf9d820f8..6280a42ff97 100644 --- a/charts/stable/handbrake/SCALE/questions.yaml +++ b/charts/stable/handbrake/SCALE/questions.yaml @@ -56,21 +56,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" @@ -344,7 +342,7 @@ questions: schema: type: dict attrs: - - variable: tcp + - variable: vnc label: "TCP Service Port Configuration" schema: type: dict diff --git a/charts/stable/handbrake/values.yaml b/charts/stable/handbrake/values.yaml index 367e8559c67..f5528cbd2eb 100644 --- a/charts/stable/handbrake/values.yaml +++ b/charts/stable/handbrake/values.yaml @@ -6,10 +6,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - supplementalGroups: [24, 44, 107] - service: main: ports: diff --git a/charts/stable/home-assistant/SCALE/questions.yaml b/charts/stable/home-assistant/SCALE/questions.yaml index 4701eef3711..a38b66657c0 100644 --- a/charts/stable/home-assistant/SCALE/questions.yaml +++ b/charts/stable/home-assistant/SCALE/questions.yaml @@ -55,15 +55,6 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: git group: "Configuration" label: "Home-Assistant Git Settings" @@ -86,6 +77,13 @@ questions: schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" diff --git a/charts/stable/home-assistant/values.yaml b/charts/stable/home-assistant/values.yaml index 9388d0c895b..adfdd1a3a5c 100644 --- a/charts/stable/home-assistant/values.yaml +++ b/charts/stable/home-assistant/values.yaml @@ -8,14 +8,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - supplementalGroups: [5, 20, 24] - env: {} # TZ: diff --git a/charts/stable/jackett/SCALE/questions.yaml b/charts/stable/jackett/SCALE/questions.yaml index ad1c7e7dbd8..9a5867ac921 100644 --- a/charts/stable/jackett/SCALE/questions.yaml +++ b/charts/stable/jackett/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/stable/jellyfin/SCALE/ix_values.yaml b/charts/stable/jellyfin/SCALE/ix_values.yaml index 1c1ab428842..052571ff341 100644 --- a/charts/stable/jellyfin/SCALE/ix_values.yaml +++ b/charts/stable/jellyfin/SCALE/ix_values.yaml @@ -9,7 +9,12 @@ image: pullPolicy: IfNotPresent tag: 10.7.5 - +podSecurityContext: + runAsNonRoot: true + runAsUser: 568 + runAsGroup: 568 + fsGroup: 568 + supplementalGroups: [44, 107] ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/stable/jellyfin/SCALE/questions.yaml b/charts/stable/jellyfin/SCALE/questions.yaml index 73071952139..01a898256fa 100644 --- a/charts/stable/jellyfin/SCALE/questions.yaml +++ b/charts/stable/jellyfin/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" @@ -367,7 +365,7 @@ questions: description: "Additional groups this App needs access to" schema: type: list - default: [44, 107] + default: [] items: - variable: Group label: "Group" diff --git a/charts/stable/jellyfin/values.yaml b/charts/stable/jellyfin/values.yaml index 824009133ac..c539306b882 100644 --- a/charts/stable/jellyfin/values.yaml +++ b/charts/stable/jellyfin/values.yaml @@ -8,8 +8,11 @@ image: strategy: type: Recreate -# 44=video 107=render podSecurityContext: + runAsNonRoot: true + runAsUser: 568 + runAsGroup: 568 + fsGroup: 568 supplementalGroups: [44, 107] service: diff --git a/charts/stable/kms/SCALE/questions.yaml b/charts/stable/kms/SCALE/questions.yaml index ca8feb22d28..95a68c61654 100644 --- a/charts/stable/kms/SCALE/questions.yaml +++ b/charts/stable/kms/SCALE/questions.yaml @@ -47,21 +47,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" diff --git a/charts/stable/kms/values.yaml b/charts/stable/kms/values.yaml index f6dd0558b55..8e468550958 100644 --- a/charts/stable/kms/values.yaml +++ b/charts/stable/kms/values.yaml @@ -8,13 +8,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - service: main: ports: diff --git a/charts/stable/lidarr/SCALE/questions.yaml b/charts/stable/lidarr/SCALE/questions.yaml index 59fed53cdbd..d2a44b9e348 100644 --- a/charts/stable/lidarr/SCALE/questions.yaml +++ b/charts/stable/lidarr/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/stable/ombi/SCALE/questions.yaml b/charts/stable/ombi/SCALE/questions.yaml index 3fac0408d29..0d7de1e2e5a 100644 --- a/charts/stable/ombi/SCALE/questions.yaml +++ b/charts/stable/ombi/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/stable/plex/SCALE/ix_values.yaml b/charts/stable/plex/SCALE/ix_values.yaml index 4a162b70b2b..868b3d4ba0a 100644 --- a/charts/stable/plex/SCALE/ix_values.yaml +++ b/charts/stable/plex/SCALE/ix_values.yaml @@ -9,6 +9,12 @@ image: pullPolicy: IfNotPresent tag: v1.22.1.4228-724c56e62 +podSecurityContext: + runAsNonRoot: true + runAsUser: 568 + runAsGroup: 568 + fsGroup: 568 + supplementalGroups: [44, 107] ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/stable/plex/SCALE/questions.yaml b/charts/stable/plex/SCALE/questions.yaml index 28f0251e267..d53919ef3ea 100644 --- a/charts/stable/plex/SCALE/questions.yaml +++ b/charts/stable/plex/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: ADVERTISE_IP label: "Advertise IP" description: "IP to advertise to Plex" @@ -385,7 +383,7 @@ questions: description: "Additional groups this App needs access to" schema: type: list - default: [44, 107] + default: [] items: - variable: Group label: "Group" diff --git a/charts/stable/plex/values.yaml b/charts/stable/plex/values.yaml index 26db6e9719a..dcb98ac2023 100644 --- a/charts/stable/plex/values.yaml +++ b/charts/stable/plex/values.yaml @@ -8,8 +8,11 @@ image: strategy: type: Recreate -# 44=video 107=render podSecurityContext: + runAsNonRoot: true + runAsUser: 568 + runAsGroup: 568 + fsGroup: 568 supplementalGroups: [44, 107] service: diff --git a/charts/stable/radarr/SCALE/questions.yaml b/charts/stable/radarr/SCALE/questions.yaml index ea13281786c..686bd2f7f8b 100644 --- a/charts/stable/radarr/SCALE/questions.yaml +++ b/charts/stable/radarr/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/stable/sonarr/SCALE/questions.yaml b/charts/stable/sonarr/SCALE/questions.yaml index 752d2be3911..711bae8068e 100644 --- a/charts/stable/sonarr/SCALE/questions.yaml +++ b/charts/stable/sonarr/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/stable/syncthing/SCALE/questions.yaml b/charts/stable/syncthing/SCALE/questions.yaml index 025f00526d9..f359749c3a2 100644 --- a/charts/stable/syncthing/SCALE/questions.yaml +++ b/charts/stable/syncthing/SCALE/questions.yaml @@ -55,6 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" + - variable: env + group: "Configuration" + label: "Image Environment" + schema: + type: dict + attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" # Configure Enviroment Variables - variable: envList label: "Image environment" diff --git a/charts/stable/tautulli/SCALE/questions.yaml b/charts/stable/tautulli/SCALE/questions.yaml index e9b9d33bbf4..868e4c8ac7d 100644 --- a/charts/stable/tautulli/SCALE/questions.yaml +++ b/charts/stable/tautulli/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/stable/transmission/SCALE/questions.yaml b/charts/stable/transmission/SCALE/questions.yaml index 3b30aad8db8..05b4fa968ba 100644 --- a/charts/stable/transmission/SCALE/questions.yaml +++ b/charts/stable/transmission/SCALE/questions.yaml @@ -55,15 +55,6 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: transmissionConfig group: "Configuration" label: "Transmission Settings" @@ -251,6 +242,13 @@ questions: schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/stable/truecommand/SCALE/questions.yaml b/charts/stable/truecommand/SCALE/questions.yaml index 3039865a702..22322a8e707 100644 --- a/charts/stable/truecommand/SCALE/questions.yaml +++ b/charts/stable/truecommand/SCALE/questions.yaml @@ -55,21 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" diff --git a/charts/stable/truecommand/values.yaml b/charts/stable/truecommand/values.yaml index c2fbda7f606..ce50c30fda0 100644 --- a/charts/stable/truecommand/values.yaml +++ b/charts/stable/truecommand/values.yaml @@ -8,13 +8,6 @@ image: strategy: type: Recreate -# Configure the Security Context for the Pod -podSecurityContext: - runAsNonRoot: false - runAsUser: 0 - runAsGroup: 0 - fsGroup: 0 - service: main: ports: diff --git a/charts/stable/vaultwarden/SCALE/questions.yaml b/charts/stable/vaultwarden/SCALE/questions.yaml index d35ae274ff7..fea4ed005cc 100644 --- a/charts/stable/vaultwarden/SCALE/questions.yaml +++ b/charts/stable/vaultwarden/SCALE/questions.yaml @@ -55,15 +55,6 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" # Configure Bitwarden: - variable: bitwardenrs label: "" @@ -364,6 +355,13 @@ questions: schema: type: dict attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/stable/zwavejs2mqtt/SCALE/ix_values.yaml b/charts/stable/zwavejs2mqtt/SCALE/ix_values.yaml index a06b4d6ac90..a90bf487585 100644 --- a/charts/stable/zwavejs2mqtt/SCALE/ix_values.yaml +++ b/charts/stable/zwavejs2mqtt/SCALE/ix_values.yaml @@ -9,6 +9,13 @@ image: pullPolicy: IfNotPresent tag: 2.4.1 +podSecurityContext: + runAsNonRoot: true + runAsUser: 568 + runAsGroup: 568 + fsGroup: 568 + supplementalGroups: [5, 20, 24] + probes: liveness: enabled: true @@ -52,7 +59,6 @@ probes: # initialDelaySeconds: 30 # periodSeconds: 10 # timeoutSeconds: 10 - ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/stable/zwavejs2mqtt/SCALE/questions.yaml b/charts/stable/zwavejs2mqtt/SCALE/questions.yaml index cb2d11d4438..b7e65057058 100644 --- a/charts/stable/zwavejs2mqtt/SCALE/questions.yaml +++ b/charts/stable/zwavejs2mqtt/SCALE/questions.yaml @@ -55,15 +55,19 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" - # Configure Time Zone - - variable: timezone - group: "Container Image" - label: "Timezone" + - variable: env + group: "Configuration" + label: "Image Environment" schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" + type: dict + attrs: + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: envList label: "Image environment" group: "Configuration" @@ -474,7 +478,7 @@ questions: description: "Additional groups this App needs access to" schema: type: list - default: [5, 20, 24] + default: [] items: - variable: Group label: "Group" From ad4a2ae78513ea1fc67e0260a594fa3c67c2cb42 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 23 May 2021 13:14:54 +0200 Subject: [PATCH 07/11] Common 4.0 App Refactor Part 6 - Ornias --- .github/workflows/apps.yaml | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/apps.yaml b/.github/workflows/apps.yaml index a68f406640f..78300e5fbaa 100644 --- a/.github/workflows/apps.yaml +++ b/.github/workflows/apps.yaml @@ -146,17 +146,17 @@ jobs: if: ${{ steps.prep-lint.outputs.unittests == 'true' }} run: | go mod download - - name: Run tests + - name: Run unit tests if: ${{ steps.prep-lint.outputs.unittests == 'true' }} run: | go test ./charts/.../tests -json | tee test.json - - name: Annotate tests + - name: Annotate unit tests if: ${{ steps.prep-lint.outputs.unittests == 'true' }} uses: guyarb/golang-test-annotations@v0.3.0 with: test-results: test.json - - name: Run tests + - name: Parse Unit Tests if: ${{ steps.prep-lint.outputs.unittests == 'true' }} run: | if grep -q "FAIL" test.json @@ -234,18 +234,33 @@ jobs: with: version: v3.5.3 - name: Checkout + if: ${{ needs.pre-release.outputs.release == 'true' }} uses: actions/checkout@v2 with: fetch-depth: 0 token: ${{ secrets.BOT_TOKEN }} path: master - name: Checkout + if: ${{ needs.pre-release.outputs.release == 'true' }} uses: actions/checkout@v2 with: fetch-depth: 0 repository: truecharts/catalog token: ${{ secrets.BOT_TOKEN }} path: catalog + - name: Checkout + if: ${{ needs.pre-release.outputs.release == 'false' }} + uses: actions/checkout@v2 + with: + fetch-depth: 0 + path: master + - name: Checkout + if: ${{ needs.pre-release.outputs.release == 'false' }} + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: truecharts/catalog + path: catalog - name: Remove if release already exists run: | for train in stable incubator develop non-free deprecated @@ -312,7 +327,7 @@ jobs: cd catalog /bin/bash -c "PWD=${pwd}; /usr/local/bin/catalog_validate validate --path $PWD" - name: Commit and Push new App releases - if: ${{ steps.pre-release.outputs.release == 'true' }} + if: ${{ needs.pre-release.outputs.release == 'true' }} run: | cd catalog git config user.name "TrueCharts-Bot" From 69f3be4e6becdb19a11b592742dd88d504d36c03 Mon Sep 17 00:00:00 2001 From: Stavros Kois Date: Sun, 23 May 2021 16:37:33 +0300 Subject: [PATCH 08/11] Common 4.0 App Refactor Part 7 - Stavos --- charts/incubator/grocy/SCALE/questions.yaml | 1 - .../incubator/heimdall/SCALE/questions.yaml | 14 ++--- charts/incubator/unifi/SCALE/ix_values.yaml | 8 ++- charts/incubator/unifi/values.yaml | 12 ++--- .../stable/deepstack-cpu/SCALE/ix_values.yaml | 4 +- .../stable/deepstack-cpu/SCALE/questions.yaml | 48 ++++++++--------- charts/stable/deepstack-cpu/values.yaml | 12 +++-- charts/stable/emby/SCALE/ix_values.yaml | 1 + charts/stable/emby/SCALE/questions.yaml | 12 ----- charts/stable/emby/values.yaml | 1 + charts/stable/handbrake/SCALE/ix_values.yaml | 7 ++- charts/stable/handbrake/SCALE/questions.yaml | 51 ++++++++----------- charts/stable/handbrake/values.yaml | 15 +++--- charts/stable/jellyfin/SCALE/ix_values.yaml | 1 + charts/stable/jellyfin/SCALE/questions.yaml | 12 ----- charts/stable/jellyfin/values.yaml | 1 + charts/stable/plex/SCALE/ix_values.yaml | 1 + charts/stable/plex/SCALE/questions.yaml | 12 ----- charts/stable/plex/values.yaml | 1 + .../stable/zwavejs2mqtt/SCALE/ix_values.yaml | 1 + .../stable/zwavejs2mqtt/SCALE/questions.yaml | 12 ----- charts/stable/zwavejs2mqtt/values.yaml | 1 + 22 files changed, 89 insertions(+), 139 deletions(-) diff --git a/charts/incubator/grocy/SCALE/questions.yaml b/charts/incubator/grocy/SCALE/questions.yaml index f1af3711d40..a0fb452abc8 100644 --- a/charts/incubator/grocy/SCALE/questions.yaml +++ b/charts/incubator/grocy/SCALE/questions.yaml @@ -74,7 +74,6 @@ questions: schema: type: int default: 568 - - variable: PGID label: "PGID" description: "Sets the PGID env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/heimdall/SCALE/questions.yaml b/charts/incubator/heimdall/SCALE/questions.yaml index da7f7db6fbe..d92632debad 100644 --- a/charts/incubator/heimdall/SCALE/questions.yaml +++ b/charts/incubator/heimdall/SCALE/questions.yaml @@ -61,13 +61,13 @@ questions: schema: type: dict attrs: - - variable: timezone - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/unifi/SCALE/ix_values.yaml b/charts/incubator/unifi/SCALE/ix_values.yaml index 44a5d83c850..8fd80a5cc27 100644 --- a/charts/incubator/unifi/SCALE/ix_values.yaml +++ b/charts/incubator/unifi/SCALE/ix_values.yaml @@ -9,12 +9,10 @@ image: tag: 6.1.71 pullPolicy: IfNotPresent - envTpl: -# Permissions Settings - UNIFI_GID: "568" - UNIFI_UID: "568" - + # Permissions Settings + UNIFI_GID: "{ { .env.PUID } }" + UNIFI_UID: "{ { .env.PGID } }" ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/incubator/unifi/values.yaml b/charts/incubator/unifi/values.yaml index 69324c7fdc0..0e6d72e2011 100644 --- a/charts/incubator/unifi/values.yaml +++ b/charts/incubator/unifi/values.yaml @@ -9,9 +9,9 @@ strategy: type: Recreate envTpl: -# Permissions Settings - UNIFI_GID: "568" - UNIFI_UID: "568" + # Permissions Settings + UNIFI_GID: "{ { .env.PUID } }" + UNIFI_UID: "{ { .env.PGID } }" service: main: @@ -35,10 +35,10 @@ service: port: 3478 protocol: UDP -env: {} +env: # TZ: - # PUID: - # PGID: + PUID: "568" + PGID: "568" persistence: config: diff --git a/charts/stable/deepstack-cpu/SCALE/ix_values.yaml b/charts/stable/deepstack-cpu/SCALE/ix_values.yaml index c684d8ec8bd..4886ddc0a6d 100644 --- a/charts/stable/deepstack-cpu/SCALE/ix_values.yaml +++ b/charts/stable/deepstack-cpu/SCALE/ix_values.yaml @@ -11,8 +11,8 @@ image: envTpl: # Permissions Settings - USER_ID: "568" - GROUP_ID: "568" + USER_ID: "{ { .env.PUID } }" + GROUP_ID: "{ { .env.PGID } }" ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/stable/deepstack-cpu/SCALE/questions.yaml b/charts/stable/deepstack-cpu/SCALE/questions.yaml index dd2b17b3fd3..ff8394e77c7 100644 --- a/charts/stable/deepstack-cpu/SCALE/questions.yaml +++ b/charts/stable/deepstack-cpu/SCALE/questions.yaml @@ -56,6 +56,7 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" + # Configure Enviroment Variables - variable: env group: "Configuration" label: "Image Environment" @@ -87,33 +88,6 @@ questions: schema: type: string default: "002" - # Configure Enviroment Variables - - variable: envList - label: "Image environment" - group: "Configuration" - schema: - type: list - default: [] - items: - - variable: envItem - label: "Environment Variable" - schema: - type: dict - attrs: - - variable: name - label: "Name" - schema: - type: string - - variable: value - label: "Value" - schema: - type: string - - variable: env - group: "Configuration" - label: "Image Environment" - schema: - type: dict - attrs: - variable: VISION-FACE label: "VISION-FACE" description: "Enables Face Detection" @@ -167,6 +141,26 @@ questions: type: string default: "/modelstore/detection" required: true + - variable: envList + label: "Image environment" + group: "Configuration" + schema: + type: list + default: [] + items: + - variable: envItem + label: "Environment Variable" + schema: + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string # Enable Host Networking - variable: hostNetwork group: "Networking" diff --git a/charts/stable/deepstack-cpu/values.yaml b/charts/stable/deepstack-cpu/values.yaml index 877d0bb4fe8..2a7f3733d8a 100644 --- a/charts/stable/deepstack-cpu/values.yaml +++ b/charts/stable/deepstack-cpu/values.yaml @@ -17,16 +17,20 @@ service: envTpl: # Permissions Settings - USER_ID: "568" - GROUP_ID: "568" + USER_ID: "{ { .env.PUID } }" + GROUP_ID: "{ { .env.PGID } }" env: + PUID: "568" + PGID: "568" # TZ: UTC VISION-FACE: "True" VISION-DETECTION: "True" VISION-SCENE: "True" - MODELSTORE-DETECTION: "/modelstore/detection" # Path to custom models (needs to be on documentation) - MODE: "High" # High|Medium|Low + # Path to custom models (needs to be on documentation) + MODELSTORE-DETECTION: "/modelstore/detection" + # High|Medium|Low + MODE: "High" persistence: config: diff --git a/charts/stable/emby/SCALE/ix_values.yaml b/charts/stable/emby/SCALE/ix_values.yaml index d6026df4642..041b6616872 100644 --- a/charts/stable/emby/SCALE/ix_values.yaml +++ b/charts/stable/emby/SCALE/ix_values.yaml @@ -9,6 +9,7 @@ image: pullPolicy: IfNotPresent tag: v4.5.4.0 +# 44=video 107=render podSecurityContext: runAsNonRoot: true runAsUser: 568 diff --git a/charts/stable/emby/SCALE/questions.yaml b/charts/stable/emby/SCALE/questions.yaml index b74e8f35c9f..40c6e24a7ec 100644 --- a/charts/stable/emby/SCALE/questions.yaml +++ b/charts/stable/emby/SCALE/questions.yaml @@ -360,18 +360,6 @@ questions: schema: type: int default: 568 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." diff --git a/charts/stable/emby/values.yaml b/charts/stable/emby/values.yaml index e4395bc2e31..c50b2d79fa9 100644 --- a/charts/stable/emby/values.yaml +++ b/charts/stable/emby/values.yaml @@ -8,6 +8,7 @@ image: strategy: type: Recreate +# 44=video 107=render podSecurityContext: runAsNonRoot: true runAsUser: 568 diff --git a/charts/stable/handbrake/SCALE/ix_values.yaml b/charts/stable/handbrake/SCALE/ix_values.yaml index 4eea1bb3dd9..a47a4681e9c 100644 --- a/charts/stable/handbrake/SCALE/ix_values.yaml +++ b/charts/stable/handbrake/SCALE/ix_values.yaml @@ -11,10 +11,9 @@ image: #All values here are set as the docker defaults. envTpl: -# Permissions Settings - USER_ID: "568" - GROUP_ID: "568" - + # Permissions Settings + USER_ID: "{{ .Values.env.PUID }}" + GROUP_ID: "{{ .Values.env.PGID }}" ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/stable/handbrake/SCALE/questions.yaml b/charts/stable/handbrake/SCALE/questions.yaml index 6280a42ff97..6248c3b7596 100644 --- a/charts/stable/handbrake/SCALE/questions.yaml +++ b/charts/stable/handbrake/SCALE/questions.yaml @@ -74,46 +74,19 @@ questions: description: "Sets the PUID env var for LinuxServer.io (compatible) containers" schema: type: int - default: 568 + default: 0 - variable: PGID label: "PGID" description: "Sets the PGID env var for LinuxServer.io (compatible) containers" schema: type: int - default: 568 + default: 0 - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" schema: type: string default: "002" - # Configure Enviroment Variables - - variable: envList - label: "Image environment" - group: "Configuration" - schema: - type: list - default: [] - items: - - variable: envItem - label: "Environment Variable" - schema: - type: dict - attrs: - - variable: name - label: "Name" - schema: - type: string - - variable: value - label: "Value" - schema: - type: string - - variable: env - group: "Configuration" - label: "Image Environment" - schema: - type: dict - attrs: - variable: gui label: "GUI Settings" description: "Always read description before changing a value here. Also refer to README" @@ -186,6 +159,26 @@ questions: type: string default: "ignore" required: true + - variable: envList + label: "Image environment" + group: "Configuration" + schema: + type: list + default: [] + items: + - variable: envItem + label: "Environment Variable" + schema: + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string # Enable Host Networking - variable: hostNetwork group: "Networking" diff --git a/charts/stable/handbrake/values.yaml b/charts/stable/handbrake/values.yaml index f5528cbd2eb..6bb6626cf18 100644 --- a/charts/stable/handbrake/values.yaml +++ b/charts/stable/handbrake/values.yaml @@ -22,20 +22,23 @@ service: # All values here are set as the docker defaults. envTpl: -# Permissions Settings - USER_ID: "568" - GROUP_ID: "568" + # Permissions Settings + USER_ID: "{{ .Values.env.PUID }}" + GROUP_ID: "{{ .Values.env.PGID }}" env: -# General Settings + # Permissions Settings + PUID: "0" + PGID: "0" + # General Settings KEEP_APP_RUNNING: "0" CLEAN_TMP_DIR: "1" -# GUI Settings + # GUI Settings DISPLAY_WIDTH: "1280" DISPLAY_HEIGHT: "768" SECURE_CONNECTION: "0" VNC_PASSWORD: -# Automated Conversion Preset + # Automated Conversion Preset AUTOMATED_CONVERSION_PRESET: "General/Very Fast 1080p30" AUTOMATED_CONVERSION_FORMAT: "mp4" AUTOMATED_CONVERSION_KEEP_SOURCE: "1" diff --git a/charts/stable/jellyfin/SCALE/ix_values.yaml b/charts/stable/jellyfin/SCALE/ix_values.yaml index 052571ff341..13fabd7f7fe 100644 --- a/charts/stable/jellyfin/SCALE/ix_values.yaml +++ b/charts/stable/jellyfin/SCALE/ix_values.yaml @@ -9,6 +9,7 @@ image: pullPolicy: IfNotPresent tag: 10.7.5 +# 44=video 107=render podSecurityContext: runAsNonRoot: true runAsUser: 568 diff --git a/charts/stable/jellyfin/SCALE/questions.yaml b/charts/stable/jellyfin/SCALE/questions.yaml index 01a898256fa..1d9fbac05d9 100644 --- a/charts/stable/jellyfin/SCALE/questions.yaml +++ b/charts/stable/jellyfin/SCALE/questions.yaml @@ -360,18 +360,6 @@ questions: schema: type: int default: 568 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." diff --git a/charts/stable/jellyfin/values.yaml b/charts/stable/jellyfin/values.yaml index c539306b882..d12fe40141d 100644 --- a/charts/stable/jellyfin/values.yaml +++ b/charts/stable/jellyfin/values.yaml @@ -8,6 +8,7 @@ image: strategy: type: Recreate +# 44=video 107=render podSecurityContext: runAsNonRoot: true runAsUser: 568 diff --git a/charts/stable/plex/SCALE/ix_values.yaml b/charts/stable/plex/SCALE/ix_values.yaml index 868b3d4ba0a..407a82054aa 100644 --- a/charts/stable/plex/SCALE/ix_values.yaml +++ b/charts/stable/plex/SCALE/ix_values.yaml @@ -9,6 +9,7 @@ image: pullPolicy: IfNotPresent tag: v1.22.1.4228-724c56e62 +# 44=video 107=render podSecurityContext: runAsNonRoot: true runAsUser: 568 diff --git a/charts/stable/plex/SCALE/questions.yaml b/charts/stable/plex/SCALE/questions.yaml index d53919ef3ea..16be9feb20b 100644 --- a/charts/stable/plex/SCALE/questions.yaml +++ b/charts/stable/plex/SCALE/questions.yaml @@ -378,18 +378,6 @@ questions: schema: type: int default: 568 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." diff --git a/charts/stable/plex/values.yaml b/charts/stable/plex/values.yaml index dcb98ac2023..4407c045b4a 100644 --- a/charts/stable/plex/values.yaml +++ b/charts/stable/plex/values.yaml @@ -8,6 +8,7 @@ image: strategy: type: Recreate +# 44=video 107=render podSecurityContext: runAsNonRoot: true runAsUser: 568 diff --git a/charts/stable/zwavejs2mqtt/SCALE/ix_values.yaml b/charts/stable/zwavejs2mqtt/SCALE/ix_values.yaml index a90bf487585..c9a3b847f83 100644 --- a/charts/stable/zwavejs2mqtt/SCALE/ix_values.yaml +++ b/charts/stable/zwavejs2mqtt/SCALE/ix_values.yaml @@ -9,6 +9,7 @@ image: pullPolicy: IfNotPresent tag: 2.4.1 +# 5=tty 20=dialout 24=cdrom podSecurityContext: runAsNonRoot: true runAsUser: 568 diff --git a/charts/stable/zwavejs2mqtt/SCALE/questions.yaml b/charts/stable/zwavejs2mqtt/SCALE/questions.yaml index b7e65057058..595abc6f850 100644 --- a/charts/stable/zwavejs2mqtt/SCALE/questions.yaml +++ b/charts/stable/zwavejs2mqtt/SCALE/questions.yaml @@ -473,18 +473,6 @@ questions: schema: type: int default: 568 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." diff --git a/charts/stable/zwavejs2mqtt/values.yaml b/charts/stable/zwavejs2mqtt/values.yaml index 85f4a9324b4..505bf6f88f0 100644 --- a/charts/stable/zwavejs2mqtt/values.yaml +++ b/charts/stable/zwavejs2mqtt/values.yaml @@ -10,6 +10,7 @@ image: strategy: type: Recreate +# 5=tty 20=dialout 24=cdrom podSecurityContext: runAsNonRoot: true runAsUser: 568 From f8b79ac51a2f0761b94860b47b36db8a8c077ce8 Mon Sep 17 00:00:00 2001 From: Stavros Kois Date: Sun, 23 May 2021 18:04:55 +0300 Subject: [PATCH 09/11] Common 4.0 App Refactor Part 8 - Ornias --- .../deprecated/nzbhydra/SCALE/questions.yaml | 2 +- .../incubator/appdaemon/SCALE/questions.yaml | 2 +- charts/incubator/bazarr/SCALE/questions.yaml | 2 +- .../calibre-web/SCALE/questions.yaml | 2 +- charts/incubator/deluge/SCALE/questions.yaml | 2 +- .../incubator/fireflyiii/SCALE/questions.yaml | 2 +- .../incubator/freshrss/SCALE/questions.yaml | 2 +- charts/incubator/gaps/SCALE/questions.yaml | 2 +- charts/incubator/grocy/SCALE/questions.yaml | 2 +- .../incubator/heimdall/SCALE/questions.yaml | 2 +- .../lazylibrarian/SCALE/questions.yaml | 2 +- charts/incubator/lychee/SCALE/questions.yaml | 2 +- .../incubator/navidrome/SCALE/questions.yaml | 2 +- .../incubator/node-red/SCALE/questions.yaml | 2 +- charts/incubator/nzbget/SCALE/questions.yaml | 2 +- .../incubator/organizr/SCALE/questions.yaml | 2 +- charts/incubator/podgrab/SCALE/questions.yaml | 2 +- .../qbittorrent/SCALE/questions.yaml | 2 +- charts/incubator/readarr/SCALE/questions.yaml | 2 +- charts/incubator/sabnzbd/SCALE/questions.yaml | 2 +- .../incubator/tvheadend/SCALE/questions.yaml | 36 +++++++++---------- charts/incubator/unifi/SCALE/ix_values.yaml | 4 +-- charts/incubator/unifi/SCALE/questions.yaml | 4 ++- charts/incubator/unifi/values.yaml | 4 +-- .../collabora-online/SCALE/questions.yaml | 2 +- .../stable/deepstack-cpu/SCALE/ix_values.yaml | 4 +-- .../stable/deepstack-cpu/SCALE/questions.yaml | 2 +- charts/stable/deepstack-cpu/values.yaml | 4 +-- charts/stable/emby/SCALE/questions.yaml | 2 +- charts/stable/esphome/SCALE/questions.yaml | 2 +- charts/stable/handbrake/SCALE/questions.yaml | 6 ++-- charts/stable/handbrake/values.yaml | 4 +-- .../home-assistant/SCALE/questions.yaml | 2 +- charts/stable/jackett/SCALE/questions.yaml | 2 +- charts/stable/jellyfin/SCALE/questions.yaml | 2 +- charts/stable/kms/SCALE/questions.yaml | 2 +- charts/stable/lidarr/SCALE/questions.yaml | 2 +- charts/stable/ombi/SCALE/questions.yaml | 2 +- charts/stable/plex/SCALE/questions.yaml | 2 +- charts/stable/radarr/SCALE/questions.yaml | 2 +- charts/stable/sonarr/SCALE/questions.yaml | 2 +- charts/stable/syncthing/SCALE/questions.yaml | 2 +- charts/stable/tautulli/SCALE/questions.yaml | 2 +- .../stable/transmission/SCALE/questions.yaml | 2 +- .../stable/truecommand/SCALE/questions.yaml | 2 +- .../stable/vaultwarden/SCALE/questions.yaml | 2 +- .../stable/zwavejs2mqtt/SCALE/questions.yaml | 2 +- 47 files changed, 73 insertions(+), 71 deletions(-) diff --git a/charts/deprecated/nzbhydra/SCALE/questions.yaml b/charts/deprecated/nzbhydra/SCALE/questions.yaml index 8bc67796aa3..37c322d7c53 100644 --- a/charts/deprecated/nzbhydra/SCALE/questions.yaml +++ b/charts/deprecated/nzbhydra/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/appdaemon/SCALE/questions.yaml b/charts/incubator/appdaemon/SCALE/questions.yaml index cfe1db7b299..d1c7c70b817 100644 --- a/charts/incubator/appdaemon/SCALE/questions.yaml +++ b/charts/incubator/appdaemon/SCALE/questions.yaml @@ -62,7 +62,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/bazarr/SCALE/questions.yaml b/charts/incubator/bazarr/SCALE/questions.yaml index 2e5e8c9fd6e..fdd8dc21d7c 100644 --- a/charts/incubator/bazarr/SCALE/questions.yaml +++ b/charts/incubator/bazarr/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/calibre-web/SCALE/questions.yaml b/charts/incubator/calibre-web/SCALE/questions.yaml index 219d81a1aad..9649844828e 100644 --- a/charts/incubator/calibre-web/SCALE/questions.yaml +++ b/charts/incubator/calibre-web/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/deluge/SCALE/questions.yaml b/charts/incubator/deluge/SCALE/questions.yaml index 2a581f47c67..ab972386cd2 100644 --- a/charts/incubator/deluge/SCALE/questions.yaml +++ b/charts/incubator/deluge/SCALE/questions.yaml @@ -62,7 +62,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/fireflyiii/SCALE/questions.yaml b/charts/incubator/fireflyiii/SCALE/questions.yaml index 932e356c980..1888a4617f2 100644 --- a/charts/incubator/fireflyiii/SCALE/questions.yaml +++ b/charts/incubator/fireflyiii/SCALE/questions.yaml @@ -62,7 +62,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/freshrss/SCALE/questions.yaml b/charts/incubator/freshrss/SCALE/questions.yaml index d1248a6395a..b8ecca8f831 100644 --- a/charts/incubator/freshrss/SCALE/questions.yaml +++ b/charts/incubator/freshrss/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/gaps/SCALE/questions.yaml b/charts/incubator/gaps/SCALE/questions.yaml index 32b113415a5..d65ffd0fb9d 100644 --- a/charts/incubator/gaps/SCALE/questions.yaml +++ b/charts/incubator/gaps/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/grocy/SCALE/questions.yaml b/charts/incubator/grocy/SCALE/questions.yaml index a0fb452abc8..a14587bf8c6 100644 --- a/charts/incubator/grocy/SCALE/questions.yaml +++ b/charts/incubator/grocy/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/heimdall/SCALE/questions.yaml b/charts/incubator/heimdall/SCALE/questions.yaml index d92632debad..a187b81d021 100644 --- a/charts/incubator/heimdall/SCALE/questions.yaml +++ b/charts/incubator/heimdall/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/lazylibrarian/SCALE/questions.yaml b/charts/incubator/lazylibrarian/SCALE/questions.yaml index 3870b0ab27b..fc91bb4fcf8 100644 --- a/charts/incubator/lazylibrarian/SCALE/questions.yaml +++ b/charts/incubator/lazylibrarian/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/lychee/SCALE/questions.yaml b/charts/incubator/lychee/SCALE/questions.yaml index 6c7157cbeae..24062a2b2dc 100644 --- a/charts/incubator/lychee/SCALE/questions.yaml +++ b/charts/incubator/lychee/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/navidrome/SCALE/questions.yaml b/charts/incubator/navidrome/SCALE/questions.yaml index da4cef7d82b..8ddc90a52cb 100644 --- a/charts/incubator/navidrome/SCALE/questions.yaml +++ b/charts/incubator/navidrome/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/node-red/SCALE/questions.yaml b/charts/incubator/node-red/SCALE/questions.yaml index fb811ceaea9..a4609c32921 100644 --- a/charts/incubator/node-red/SCALE/questions.yaml +++ b/charts/incubator/node-red/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/nzbget/SCALE/questions.yaml b/charts/incubator/nzbget/SCALE/questions.yaml index c8342ac91a1..ac97540db69 100644 --- a/charts/incubator/nzbget/SCALE/questions.yaml +++ b/charts/incubator/nzbget/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/organizr/SCALE/questions.yaml b/charts/incubator/organizr/SCALE/questions.yaml index beadea5524c..a21d859ea95 100644 --- a/charts/incubator/organizr/SCALE/questions.yaml +++ b/charts/incubator/organizr/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/podgrab/SCALE/questions.yaml b/charts/incubator/podgrab/SCALE/questions.yaml index 0df70df65b8..d768f63a53b 100644 --- a/charts/incubator/podgrab/SCALE/questions.yaml +++ b/charts/incubator/podgrab/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/qbittorrent/SCALE/questions.yaml b/charts/incubator/qbittorrent/SCALE/questions.yaml index c9cbb003a38..52ebf8ea6fd 100644 --- a/charts/incubator/qbittorrent/SCALE/questions.yaml +++ b/charts/incubator/qbittorrent/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/readarr/SCALE/questions.yaml b/charts/incubator/readarr/SCALE/questions.yaml index 3163e06f0df..0a5bee97caf 100644 --- a/charts/incubator/readarr/SCALE/questions.yaml +++ b/charts/incubator/readarr/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/sabnzbd/SCALE/questions.yaml b/charts/incubator/sabnzbd/SCALE/questions.yaml index b14f7202b38..c93ec7370df 100644 --- a/charts/incubator/sabnzbd/SCALE/questions.yaml +++ b/charts/incubator/sabnzbd/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/tvheadend/SCALE/questions.yaml b/charts/incubator/tvheadend/SCALE/questions.yaml index 0c9bccb9a2b..4fee7d14456 100644 --- a/charts/incubator/tvheadend/SCALE/questions.yaml +++ b/charts/incubator/tvheadend/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string @@ -69,23 +69,23 @@ questions: $ref: - "definitions/timezone" - variable: PUID - label: "PUID" - description: "Sets the PUID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: PGID - label: "PGID" - description: "Sets the PGID env var for LinuxServer.io (compatible) containers" - schema: - type: int - default: 568 - - variable: UMASK - label: "UMASK" - description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" - schema: - type: string - default: "002" + label: "PUID" + description: "Sets the PUID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: PGID + label: "PGID" + description: "Sets the PGID env var for LinuxServer.io (compatible) containers" + schema: + type: int + default: 568 + - variable: UMASK + label: "UMASK" + description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" + schema: + type: string + default: "002" - variable: envList label: "Image environment" group: "Configuration" diff --git a/charts/incubator/unifi/SCALE/ix_values.yaml b/charts/incubator/unifi/SCALE/ix_values.yaml index 8fd80a5cc27..654c3f98687 100644 --- a/charts/incubator/unifi/SCALE/ix_values.yaml +++ b/charts/incubator/unifi/SCALE/ix_values.yaml @@ -11,8 +11,8 @@ image: envTpl: # Permissions Settings - UNIFI_GID: "{ { .env.PUID } }" - UNIFI_UID: "{ { .env.PGID } }" + UNIFI_GID: "{{ .Values.env.PUID }}" + UNIFI_UID: "{{ .Values.env.PGID }}" ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/incubator/unifi/SCALE/questions.yaml b/charts/incubator/unifi/SCALE/questions.yaml index 6206aa1bb3b..dd14c096341 100644 --- a/charts/incubator/unifi/SCALE/questions.yaml +++ b/charts/incubator/unifi/SCALE/questions.yaml @@ -19,6 +19,8 @@ groups: description: "Advanced Configuration" - name: "WARNING" description: "WARNING" + +portals: web_portal: protocols: - "$kubernetes-resource_configmap_portal_protocol" @@ -60,7 +62,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/incubator/unifi/values.yaml b/charts/incubator/unifi/values.yaml index 0e6d72e2011..3f3075db877 100644 --- a/charts/incubator/unifi/values.yaml +++ b/charts/incubator/unifi/values.yaml @@ -10,8 +10,8 @@ strategy: envTpl: # Permissions Settings - UNIFI_GID: "{ { .env.PUID } }" - UNIFI_UID: "{ { .env.PGID } }" + UNIFI_GID: "{{ .Values.env.PUID }}" + UNIFI_UID: "{{ .Values.env.PGID }}" service: main: diff --git a/charts/stable/collabora-online/SCALE/questions.yaml b/charts/stable/collabora-online/SCALE/questions.yaml index 14778a52919..4fc412d184a 100644 --- a/charts/stable/collabora-online/SCALE/questions.yaml +++ b/charts/stable/collabora-online/SCALE/questions.yaml @@ -62,7 +62,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/deepstack-cpu/SCALE/ix_values.yaml b/charts/stable/deepstack-cpu/SCALE/ix_values.yaml index 4886ddc0a6d..4bff0fb6e80 100644 --- a/charts/stable/deepstack-cpu/SCALE/ix_values.yaml +++ b/charts/stable/deepstack-cpu/SCALE/ix_values.yaml @@ -11,8 +11,8 @@ image: envTpl: # Permissions Settings - USER_ID: "{ { .env.PUID } }" - GROUP_ID: "{ { .env.PGID } }" + USER_ID: "{{ .Values.env.PUID }}" + GROUP_ID: "{{ .Values.env.PGID }}" ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/stable/deepstack-cpu/SCALE/questions.yaml b/charts/stable/deepstack-cpu/SCALE/questions.yaml index ff8394e77c7..e0c37dff614 100644 --- a/charts/stable/deepstack-cpu/SCALE/questions.yaml +++ b/charts/stable/deepstack-cpu/SCALE/questions.yaml @@ -63,7 +63,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/deepstack-cpu/values.yaml b/charts/stable/deepstack-cpu/values.yaml index 2a7f3733d8a..196439a072e 100644 --- a/charts/stable/deepstack-cpu/values.yaml +++ b/charts/stable/deepstack-cpu/values.yaml @@ -17,8 +17,8 @@ service: envTpl: # Permissions Settings - USER_ID: "{ { .env.PUID } }" - GROUP_ID: "{ { .env.PGID } }" + USER_ID: "{{ .Values.env.PUID }}" + GROUP_ID: "{{ .Values.env.PGID }}" env: PUID: "568" diff --git a/charts/stable/emby/SCALE/questions.yaml b/charts/stable/emby/SCALE/questions.yaml index 40c6e24a7ec..2c17850e583 100644 --- a/charts/stable/emby/SCALE/questions.yaml +++ b/charts/stable/emby/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/esphome/SCALE/questions.yaml b/charts/stable/esphome/SCALE/questions.yaml index da66562a758..83fb2e163be 100644 --- a/charts/stable/esphome/SCALE/questions.yaml +++ b/charts/stable/esphome/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/handbrake/SCALE/questions.yaml b/charts/stable/handbrake/SCALE/questions.yaml index 6248c3b7596..c8cfb300afd 100644 --- a/charts/stable/handbrake/SCALE/questions.yaml +++ b/charts/stable/handbrake/SCALE/questions.yaml @@ -62,7 +62,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string @@ -74,13 +74,13 @@ questions: description: "Sets the PUID env var for LinuxServer.io (compatible) containers" schema: type: int - default: 0 + default: 568 - variable: PGID label: "PGID" description: "Sets the PGID env var for LinuxServer.io (compatible) containers" schema: type: int - default: 0 + default: 568 - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" diff --git a/charts/stable/handbrake/values.yaml b/charts/stable/handbrake/values.yaml index 6bb6626cf18..8662a4bd6cc 100644 --- a/charts/stable/handbrake/values.yaml +++ b/charts/stable/handbrake/values.yaml @@ -28,8 +28,8 @@ envTpl: env: # Permissions Settings - PUID: "0" - PGID: "0" + PUID: "568" + PGID: "568" # General Settings KEEP_APP_RUNNING: "0" CLEAN_TMP_DIR: "1" diff --git a/charts/stable/home-assistant/SCALE/questions.yaml b/charts/stable/home-assistant/SCALE/questions.yaml index a38b66657c0..68102e48881 100644 --- a/charts/stable/home-assistant/SCALE/questions.yaml +++ b/charts/stable/home-assistant/SCALE/questions.yaml @@ -77,7 +77,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/jackett/SCALE/questions.yaml b/charts/stable/jackett/SCALE/questions.yaml index 9a5867ac921..92881ba598a 100644 --- a/charts/stable/jackett/SCALE/questions.yaml +++ b/charts/stable/jackett/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/jellyfin/SCALE/questions.yaml b/charts/stable/jellyfin/SCALE/questions.yaml index 1d9fbac05d9..0ad7194f9db 100644 --- a/charts/stable/jellyfin/SCALE/questions.yaml +++ b/charts/stable/jellyfin/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/kms/SCALE/questions.yaml b/charts/stable/kms/SCALE/questions.yaml index 95a68c61654..f3868dc77ca 100644 --- a/charts/stable/kms/SCALE/questions.yaml +++ b/charts/stable/kms/SCALE/questions.yaml @@ -53,7 +53,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/lidarr/SCALE/questions.yaml b/charts/stable/lidarr/SCALE/questions.yaml index d2a44b9e348..30763d6b1b0 100644 --- a/charts/stable/lidarr/SCALE/questions.yaml +++ b/charts/stable/lidarr/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/ombi/SCALE/questions.yaml b/charts/stable/ombi/SCALE/questions.yaml index 0d7de1e2e5a..a4cc2b38e72 100644 --- a/charts/stable/ombi/SCALE/questions.yaml +++ b/charts/stable/ombi/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/plex/SCALE/questions.yaml b/charts/stable/plex/SCALE/questions.yaml index 16be9feb20b..e612d507b8c 100644 --- a/charts/stable/plex/SCALE/questions.yaml +++ b/charts/stable/plex/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/radarr/SCALE/questions.yaml b/charts/stable/radarr/SCALE/questions.yaml index 686bd2f7f8b..b669fbc6283 100644 --- a/charts/stable/radarr/SCALE/questions.yaml +++ b/charts/stable/radarr/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/sonarr/SCALE/questions.yaml b/charts/stable/sonarr/SCALE/questions.yaml index 711bae8068e..d5294a4aead 100644 --- a/charts/stable/sonarr/SCALE/questions.yaml +++ b/charts/stable/sonarr/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/syncthing/SCALE/questions.yaml b/charts/stable/syncthing/SCALE/questions.yaml index f359749c3a2..1dde16e583d 100644 --- a/charts/stable/syncthing/SCALE/questions.yaml +++ b/charts/stable/syncthing/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/tautulli/SCALE/questions.yaml b/charts/stable/tautulli/SCALE/questions.yaml index 868e4c8ac7d..3b85a9d4e9b 100644 --- a/charts/stable/tautulli/SCALE/questions.yaml +++ b/charts/stable/tautulli/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/transmission/SCALE/questions.yaml b/charts/stable/transmission/SCALE/questions.yaml index 05b4fa968ba..66736033ffb 100644 --- a/charts/stable/transmission/SCALE/questions.yaml +++ b/charts/stable/transmission/SCALE/questions.yaml @@ -242,7 +242,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/truecommand/SCALE/questions.yaml b/charts/stable/truecommand/SCALE/questions.yaml index 22322a8e707..3f0ad371c59 100644 --- a/charts/stable/truecommand/SCALE/questions.yaml +++ b/charts/stable/truecommand/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/vaultwarden/SCALE/questions.yaml b/charts/stable/vaultwarden/SCALE/questions.yaml index fea4ed005cc..a667a42a026 100644 --- a/charts/stable/vaultwarden/SCALE/questions.yaml +++ b/charts/stable/vaultwarden/SCALE/questions.yaml @@ -355,7 +355,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string diff --git a/charts/stable/zwavejs2mqtt/SCALE/questions.yaml b/charts/stable/zwavejs2mqtt/SCALE/questions.yaml index 595abc6f850..c437d76810c 100644 --- a/charts/stable/zwavejs2mqtt/SCALE/questions.yaml +++ b/charts/stable/zwavejs2mqtt/SCALE/questions.yaml @@ -61,7 +61,7 @@ questions: schema: type: dict attrs: - - variable: timezone + - variable: TZ label: "Timezone" schema: type: string From a869e30188b0b28a67570b2da468e91adff52c12 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 23 May 2021 18:30:34 +0200 Subject: [PATCH 10/11] Doc patches --- .../app development/chart-structure.md | 16 +++++--- docs/development/app development/portal.md | 5 +++ .../app development/questions-yaml.md | 40 ++++++------------- docs/development/app development/storage.md | 23 +++++++---- .../app development/values-yaml.md | 13 +----- docs/manual/Migration Guides/index.md | 14 ++++++- docs/manual/general-configuration.md | 2 +- docs/manual/networking.md | 8 ++++ docs/manual/reverse-proxy.md | 4 ++ docs/manual/storage.md | 10 ++--- 10 files changed, 75 insertions(+), 60 deletions(-) diff --git a/docs/development/app development/chart-structure.md b/docs/development/app development/chart-structure.md index d088c3f48bd..03c6e816e83 100644 --- a/docs/development/app development/chart-structure.md +++ b/docs/development/app development/chart-structure.md @@ -7,22 +7,28 @@ A TrueNAS SCALE chart also has three additional files an `app-readme.md` file th There are 2 directories `charts` and `test`, each representing a train. Chart releases created from catalog items in a specific train cannot be moved to another train. Currently only the `charts` train can be used inside the UI. ``` -charts/ix-chart// - app-readme.md # TrueNAS SCALE Specific: Readme file for display in TrueNAS SCALE UI +charts/// charts/ # Directory containing dependency charts Chart.yaml # Required Helm chart information file - questions.yaml # TrueNAS SCALE Specific: File containing questions for TrueNAS SCALE UI README.md # Optional: Helm Readme file (will be rendered in TrueNAS SCALE UI as well) templates/ # A directory of templates that, when combined with values.yml will generate K8s YAML values.yaml # The default configuration values for this chart ``` + +``` +charts/// + app-readme.md # TrueNAS SCALE Specific: Readme file for display in TrueNAS SCALE UI + questions.yaml # TrueNAS SCALE Specific: File containing questions for TrueNAS SCALE UI + ix_values.yaml # Hidden configuration values when installing using TrueNAS SCALE +``` + *See the upstream Helm chart [developer reference](https://helm.sh/docs/chart_template_guide/) for a complete walk through of developing charts.* To convert an upstream chart to take advantage of TrueNAS SCALE enhanced UX, first create an `item.yaml` file. This file among other catalog item information provides a list of categories that this chart fits into. This helps users navigate and filtering when browsing the catalog UI. ``` -$ cat charts/ix-chart/item.yaml +$ cat charts///SCALE/item.yaml categories: - generic icon_url: "http://ix_url" @@ -31,7 +37,7 @@ icon_url: "http://ix_url" After that create `app-readme.md` file. ``` -$ cat charts/ix-chart//app-readme.md +$ cat charts///SCALE/app-readme.md iX-chart is a chart designed to let user deploy a docker image in a TrueNAS SCALE kubernetes cluster. It provides a mechanism to specify workload type, add external host interfaces in the pods, configure volumes and allocate host resources to the workload. diff --git a/docs/development/app development/portal.md b/docs/development/app development/portal.md index cf8d8b0e92f..5a92a1a7390 100644 --- a/docs/development/app development/portal.md +++ b/docs/development/app development/portal.md @@ -64,3 +64,8 @@ There are also some additional (advanced) options availale, these can be added b type: string default: "test.com" ``` + + +##### Known issues + +- Portal currently doesn't work (yet) when setting the servicetype to "Loadbalancer" diff --git a/docs/development/app development/questions-yaml.md b/docs/development/app development/questions-yaml.md index d759844cdcc..26264daf597 100644 --- a/docs/development/app development/questions-yaml.md +++ b/docs/development/app development/questions-yaml.md @@ -78,7 +78,7 @@ For (2), system will normalize values or perform some actions as discussed above To minimise the maintenance load of our App collection, we always aim to standardise as much as possible. The same goes for questions.yaml. Included here are some code standardised code-snippets that are expected to be included in every App. Be aware that sometimes specific functions might or might not completely function. Leaving them out would, however, everely increase the maintenance load and often said functionality will be added in the common-chart later on anyway. ##### Groups -To make sure all apps stay somewhat the same, we use a standardised `groups:` section. Please make sure to use this in your Apps: +To make sure all apps stay somewhat the same, we use a list of standardised groups for the groups section. Please make sure to use these groups in your Apps: ``` groups: - name: "Container Image" @@ -107,24 +107,22 @@ groups: These options are always* included because almost every chart (eventually) has a use for them and/or other parts of the common chart depend on them. They are called general options, because they affect the basic functionalities of a chart. For example: Custom User environment variables, permissions and timezones. -*`PUID`, `PGID`, `UMASK` are only included when they are needed. +*`PUID`, `PGID`, `UMASK` are only included when they are needed. ``` - - variable: timezone - group: "Configuration" - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - - variable: env group: "Configuration" label: "Image Environment" schema: type: dict attrs: + - variable: TZ + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" @@ -193,31 +191,19 @@ They are called general options, because they affect the basic functionalities o label: "runAsNonRoot" schema: type: boolean - default: false + default: true - variable: runAsUser label: "runAsUser" description: "The UserID of the user running the application" schema: type: int - default: 0 + default: 568 - variable: runAsGroup label: "runAsGroup" description: The groupID this App of the user running the application" schema: type: int - default: 0 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 + default: 568 - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." @@ -234,4 +220,4 @@ They are called general options, because they affect the basic functionalities o description: "OnRootMismatch" - value: "Always" description: "Always" -``` \ No newline at end of file +``` diff --git a/docs/development/app development/storage.md b/docs/development/app development/storage.md index da7aac9ec42..06a91886871 100644 --- a/docs/development/app development/storage.md +++ b/docs/development/app development/storage.md @@ -56,9 +56,14 @@ Preventing the user to disable them, ensures that users don't (by mistake) remov - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" @@ -87,7 +92,7 @@ It should always be included in any App, to give users the option to customise t ##### Example ``` - - variable: additionalAppVolumeMounts + - variable: hostPathMounts label: "Custom app storage" group: "Storage and Devices" schema: @@ -122,12 +127,16 @@ It should always be included in any App, to give users the option to customise t required: true editable: true - variable: emptyDir - label: "emptyDir" + label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false hidden: true - editable: false + attrs: + - variable: enabled + label: Enable emptyDir + schema: + type: boolean + default: false + hidden: true - variable: mountPath label: "Mount Path" description: "Path to mount inside the pod" diff --git a/docs/development/app development/values-yaml.md b/docs/development/app development/values-yaml.md index 3fe8b4c065c..cc8041ca425 100644 --- a/docs/development/app development/values-yaml.md +++ b/docs/development/app development/values-yaml.md @@ -7,7 +7,7 @@ However, we have multiple different values.yaml files, with different goals. Bec ##### values.yaml -The normal file with default setting in helm charts. However, for our non-library and non-dependency charts, this is not used for TrueCharts. As questions.yaml generates configs on demand (with addition of ix_values.yaml), this file might interfere with some Helm operations combined with the questions.yaml or test_values.yaml systems or cause unexpected behavior if used. +This file contains the default config when running the App using stock helm (not SCALE). It also gets used for the testingsuite. ##### ix_values.yaml @@ -39,14 +39,3 @@ image: ## ``` - - -##### test_values.yaml - -Our Apps often use special features of TrueNAS inside questions.yaml and our charts. However these features are not (always) compatible with stock Helm. Therefore we define a set of seperate "test" values.yaml setting that get used when we run the test CI. - -They should, however, be as close as possible to your "actual" default settings in questions.yaml - -##### default_values.yaml - -This on is the "odd one" of the bunch. We prefer not to use it for actual default, but to store default when porting charts from upstream. diff --git a/docs/manual/Migration Guides/index.md b/docs/manual/Migration Guides/index.md index efa6a87b2c8..c9a4cf5eb7c 100644 --- a/docs/manual/Migration Guides/index.md +++ b/docs/manual/Migration Guides/index.md @@ -3,7 +3,7 @@ Sometimes we can not guarantee automatic updating between new versions of our Apps. These pages include some common scenario's and give some guidance how to manually move between different versions and Trains. -##### Between Trains +### Between Trains An app will always be just in one train. If an App moves to a different train, you will not be able to update automatically Our basic guidence for these cases is: @@ -17,7 +17,17 @@ Our basic guidence for these cases is: - Put back all your old files. - Re start the new App -##### Between Versions +### Between Versions When new versions introduce breaking changes (which would often be major version changes) they might(!) require the user to reinstall. However: We often already provide migration scrips and dealth with these issues manually. + +##### Common 2.0 -> common 3.0 based Apps + +In cases you upgrade to a common 3.0 based app, reinstall is currently required. Please be aware: Installing will nuke your data! +Be also aware that we do not have common 2.0 based installs available in the version dropdown + +##### Common 3.0 -> common 4.0 based Apps + +In cases you upgrade to a common 4.0 based app, reinstall is currently required. Please be aware: Installing will nuke your data! +However: Common 3.0 based Apps are still available to be installed using the version dropdown diff --git a/docs/manual/general-configuration.md b/docs/manual/general-configuration.md index b6012ccdb76..aab6846884a 100644 --- a/docs/manual/general-configuration.md +++ b/docs/manual/general-configuration.md @@ -1,6 +1,6 @@ # General Configuration -There are some setting that are always present on every App from TrueCharts. +These are some common settings you might find on Apps and an explaination of their usecase. ##### Explaination sheet: diff --git a/docs/manual/networking.md b/docs/manual/networking.md index 2c6a142834b..b568847dbe2 100644 --- a/docs/manual/networking.md +++ b/docs/manual/networking.md @@ -28,3 +28,11 @@ There are, however, multiple downsides to using nodeports: - You can only pick ports above 9000 - You can not connect two Apps to the same port + +##### LoadBalancer + +Loadbalancer connects a service targetPort directly to the Host Network. However: it can do so in lower ranges than NodePort, making it a great solution for things like DNS servers. + +There are, however, downsides to using LoadBalancer: + +- You can not connect two Apps to the same port diff --git a/docs/manual/reverse-proxy.md b/docs/manual/reverse-proxy.md index 3652b6fbd63..3fda587a6c4 100644 --- a/docs/manual/reverse-proxy.md +++ b/docs/manual/reverse-proxy.md @@ -4,6 +4,10 @@ Within TrueCharts our aim is to make it as easy as possible to secure your Apps. To use Traefik as a Reverse Proxy, all you have to do is enable "Reverse Proxy" in the App of your choice and fill out a little form. +## Note + +Currently for charts using common 4.0, we do NOT support Reverse-Proxy/Ingress as it's being completely rewrithen from scratch at the moment. + ### Types of Reverse Proxys We currently offer the following types of pre-configured reverse proxies: diff --git a/docs/manual/storage.md b/docs/manual/storage.md index f4c14210ecb..6b6781d6076 100644 --- a/docs/manual/storage.md +++ b/docs/manual/storage.md @@ -8,7 +8,7 @@ TrueCharts uses multiple different storage systems: Storage is currently seperated into two types: 1. Integrated Persistent Storage -2. Custom Storage +2. Custom Storage aka "hostPathMounts" ### Integrated Persistent Storage @@ -26,15 +26,13 @@ We currently have the following Storage options for Integrated Persistent Storag This storage is integrated into TrueNAS SCALE and completely supports reverting upgrades. Thats why this is the default (and only actually supported!) way of storing App configuration files. -### Custom Storage +### Custom app storage aka "hostPathMounts" Besides the earlier mentioned Integrated Persistent Storage, we also provide the option to mount as many host folders as you want. -Custom storage currently actually quite simple: +hostPathMounts are actually quite simple: It mounts a directory from your TrueNAS SCALE system, directly to a directory inside the App you're installing. -However: We might port this to PVC's in the future, which is not fully decided on yet. - ### Permissions @@ -46,7 +44,7 @@ For both Integrated Persistent Storage and Custom storage, we offer special opti These get automatically set to be owned by root:__PGID__ There are no options available to configure this. -##### Custom storage +##### Custom app storage aka "hostPathMounts" We offer an optional automatic set the permissions according to App PGID and PUID. From 54c0f3ce32b17356eece3355098495815f43adc1 Mon Sep 17 00:00:00 2001 From: Stavros Kois Date: Sun, 23 May 2021 20:38:29 +0300 Subject: [PATCH 11/11] Adapt for persistence.emptyDir.enabled --- .../deprecated/bitwarden/SCALE/questions.yaml | 34 ++++++++++++++----- .../deprecated/nzbhydra/SCALE/questions.yaml | 10 ++++-- charts/incubator/bazarr/SCALE/questions.yaml | 10 ++++-- .../calibre-web/SCALE/questions.yaml | 10 ++++-- charts/incubator/deluge/SCALE/questions.yaml | 10 ++++-- .../incubator/fireflyiii/SCALE/questions.yaml | 30 ++++++++++++---- .../incubator/freshrss/SCALE/questions.yaml | 10 ++++-- charts/incubator/gaps/SCALE/questions.yaml | 10 ++++-- charts/incubator/grocy/SCALE/questions.yaml | 10 ++++-- .../incubator/heimdall/SCALE/questions.yaml | 10 ++++-- .../lazylibrarian/SCALE/questions.yaml | 10 ++++-- charts/incubator/lychee/SCALE/questions.yaml | 10 ++++-- .../incubator/navidrome/SCALE/questions.yaml | 10 ++++-- .../incubator/node-red/SCALE/questions.yaml | 10 ++++-- charts/incubator/nzbget/SCALE/questions.yaml | 10 ++++-- .../incubator/organizr/SCALE/questions.yaml | 20 ++++++++--- charts/incubator/podgrab/SCALE/questions.yaml | 10 ++++-- .../qbittorrent/SCALE/questions.yaml | 10 ++++-- charts/incubator/readarr/SCALE/questions.yaml | 10 ++++-- charts/incubator/sabnzbd/SCALE/questions.yaml | 10 ++++-- .../incubator/tvheadend/SCALE/questions.yaml | 10 ++++-- charts/incubator/unifi/SCALE/questions.yaml | 10 ++++-- .../stable/deepstack-cpu/SCALE/questions.yaml | 10 ++++-- charts/stable/emby/SCALE/questions.yaml | 10 ++++-- charts/stable/esphome/SCALE/questions.yaml | 20 ++++++++--- charts/stable/handbrake/SCALE/questions.yaml | 10 ++++-- .../home-assistant/SCALE/questions.yaml | 10 ++++-- charts/stable/jackett/SCALE/questions.yaml | 10 ++++-- charts/stable/jellyfin/SCALE/questions.yaml | 10 ++++-- charts/stable/lidarr/SCALE/questions.yaml | 10 ++++-- charts/stable/ombi/SCALE/questions.yaml | 10 ++++-- charts/stable/plex/SCALE/questions.yaml | 10 ++++-- charts/stable/radarr/SCALE/questions.yaml | 10 ++++-- charts/stable/sonarr/SCALE/questions.yaml | 10 ++++-- charts/stable/syncthing/SCALE/questions.yaml | 10 ++++-- charts/stable/tautulli/SCALE/questions.yaml | 10 ++++-- .../stable/transmission/SCALE/questions.yaml | 10 ++++-- .../stable/truecommand/SCALE/questions.yaml | 10 ++++-- .../stable/vaultwarden/SCALE/questions.yaml | 30 ++++++++++++---- .../stable/zwavejs2mqtt/SCALE/questions.yaml | 10 ++++-- docs/development/app development/storage.md | 2 +- 41 files changed, 387 insertions(+), 99 deletions(-) diff --git a/charts/deprecated/bitwarden/SCALE/questions.yaml b/charts/deprecated/bitwarden/SCALE/questions.yaml index 8c1d61d48ea..4b3e3546a81 100644 --- a/charts/deprecated/bitwarden/SCALE/questions.yaml +++ b/charts/deprecated/bitwarden/SCALE/questions.yaml @@ -62,7 +62,7 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" -# Configure Bitwarden: + # Configure Bitwarden: - variable: bitwardenrs label: "" group: "Configuration" @@ -521,7 +521,7 @@ questions: required: true hidden: true -## TrueCharts Specific + ## TrueCharts Specific - variable: persistence label: "Integrated Persistent Storage" description: "Websocket Service" @@ -560,9 +560,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" @@ -619,9 +625,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" @@ -671,9 +683,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/deprecated/nzbhydra/SCALE/questions.yaml b/charts/deprecated/nzbhydra/SCALE/questions.yaml index 37c322d7c53..15c09a80726 100644 --- a/charts/deprecated/nzbhydra/SCALE/questions.yaml +++ b/charts/deprecated/nzbhydra/SCALE/questions.yaml @@ -241,9 +241,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/bazarr/SCALE/questions.yaml b/charts/incubator/bazarr/SCALE/questions.yaml index fdd8dc21d7c..c0342dfb6bf 100644 --- a/charts/incubator/bazarr/SCALE/questions.yaml +++ b/charts/incubator/bazarr/SCALE/questions.yaml @@ -241,9 +241,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/calibre-web/SCALE/questions.yaml b/charts/incubator/calibre-web/SCALE/questions.yaml index 9649844828e..48e5e443ecc 100644 --- a/charts/incubator/calibre-web/SCALE/questions.yaml +++ b/charts/incubator/calibre-web/SCALE/questions.yaml @@ -253,9 +253,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/deluge/SCALE/questions.yaml b/charts/incubator/deluge/SCALE/questions.yaml index ab972386cd2..6a5cd5bb5c8 100644 --- a/charts/incubator/deluge/SCALE/questions.yaml +++ b/charts/incubator/deluge/SCALE/questions.yaml @@ -392,9 +392,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/fireflyiii/SCALE/questions.yaml b/charts/incubator/fireflyiii/SCALE/questions.yaml index 1888a4617f2..399c5683d11 100644 --- a/charts/incubator/fireflyiii/SCALE/questions.yaml +++ b/charts/incubator/fireflyiii/SCALE/questions.yaml @@ -248,9 +248,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" @@ -307,9 +313,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" @@ -359,9 +371,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/freshrss/SCALE/questions.yaml b/charts/incubator/freshrss/SCALE/questions.yaml index b8ecca8f831..6e5b1f647e9 100644 --- a/charts/incubator/freshrss/SCALE/questions.yaml +++ b/charts/incubator/freshrss/SCALE/questions.yaml @@ -253,9 +253,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/gaps/SCALE/questions.yaml b/charts/incubator/gaps/SCALE/questions.yaml index d65ffd0fb9d..c7304a3ef0c 100644 --- a/charts/incubator/gaps/SCALE/questions.yaml +++ b/charts/incubator/gaps/SCALE/questions.yaml @@ -240,9 +240,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/grocy/SCALE/questions.yaml b/charts/incubator/grocy/SCALE/questions.yaml index a14587bf8c6..7d674930f0a 100644 --- a/charts/incubator/grocy/SCALE/questions.yaml +++ b/charts/incubator/grocy/SCALE/questions.yaml @@ -252,9 +252,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/heimdall/SCALE/questions.yaml b/charts/incubator/heimdall/SCALE/questions.yaml index a187b81d021..19cae86885d 100644 --- a/charts/incubator/heimdall/SCALE/questions.yaml +++ b/charts/incubator/heimdall/SCALE/questions.yaml @@ -253,9 +253,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/lazylibrarian/SCALE/questions.yaml b/charts/incubator/lazylibrarian/SCALE/questions.yaml index fc91bb4fcf8..fca47a90cff 100644 --- a/charts/incubator/lazylibrarian/SCALE/questions.yaml +++ b/charts/incubator/lazylibrarian/SCALE/questions.yaml @@ -253,9 +253,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/lychee/SCALE/questions.yaml b/charts/incubator/lychee/SCALE/questions.yaml index 24062a2b2dc..6e4e0b13934 100644 --- a/charts/incubator/lychee/SCALE/questions.yaml +++ b/charts/incubator/lychee/SCALE/questions.yaml @@ -253,9 +253,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/navidrome/SCALE/questions.yaml b/charts/incubator/navidrome/SCALE/questions.yaml index 8ddc90a52cb..ff3d0a74fa1 100644 --- a/charts/incubator/navidrome/SCALE/questions.yaml +++ b/charts/incubator/navidrome/SCALE/questions.yaml @@ -241,9 +241,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/node-red/SCALE/questions.yaml b/charts/incubator/node-red/SCALE/questions.yaml index a4609c32921..56ea8f3945f 100644 --- a/charts/incubator/node-red/SCALE/questions.yaml +++ b/charts/incubator/node-red/SCALE/questions.yaml @@ -241,9 +241,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/nzbget/SCALE/questions.yaml b/charts/incubator/nzbget/SCALE/questions.yaml index ac97540db69..df96bc90637 100644 --- a/charts/incubator/nzbget/SCALE/questions.yaml +++ b/charts/incubator/nzbget/SCALE/questions.yaml @@ -241,9 +241,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/organizr/SCALE/questions.yaml b/charts/incubator/organizr/SCALE/questions.yaml index a21d859ea95..27652ce6ba5 100644 --- a/charts/incubator/organizr/SCALE/questions.yaml +++ b/charts/incubator/organizr/SCALE/questions.yaml @@ -253,9 +253,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" @@ -305,9 +311,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/podgrab/SCALE/questions.yaml b/charts/incubator/podgrab/SCALE/questions.yaml index d768f63a53b..984af4637e0 100644 --- a/charts/incubator/podgrab/SCALE/questions.yaml +++ b/charts/incubator/podgrab/SCALE/questions.yaml @@ -249,9 +249,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/qbittorrent/SCALE/questions.yaml b/charts/incubator/qbittorrent/SCALE/questions.yaml index 52ebf8ea6fd..239355512d4 100644 --- a/charts/incubator/qbittorrent/SCALE/questions.yaml +++ b/charts/incubator/qbittorrent/SCALE/questions.yaml @@ -380,9 +380,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/readarr/SCALE/questions.yaml b/charts/incubator/readarr/SCALE/questions.yaml index 0a5bee97caf..28cc504e54e 100644 --- a/charts/incubator/readarr/SCALE/questions.yaml +++ b/charts/incubator/readarr/SCALE/questions.yaml @@ -241,9 +241,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/sabnzbd/SCALE/questions.yaml b/charts/incubator/sabnzbd/SCALE/questions.yaml index c93ec7370df..5e559889175 100644 --- a/charts/incubator/sabnzbd/SCALE/questions.yaml +++ b/charts/incubator/sabnzbd/SCALE/questions.yaml @@ -248,9 +248,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/tvheadend/SCALE/questions.yaml b/charts/incubator/tvheadend/SCALE/questions.yaml index 4fee7d14456..ad48aae8f06 100644 --- a/charts/incubator/tvheadend/SCALE/questions.yaml +++ b/charts/incubator/tvheadend/SCALE/questions.yaml @@ -345,9 +345,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/incubator/unifi/SCALE/questions.yaml b/charts/incubator/unifi/SCALE/questions.yaml index dd14c096341..d89ae444cdd 100644 --- a/charts/incubator/unifi/SCALE/questions.yaml +++ b/charts/incubator/unifi/SCALE/questions.yaml @@ -441,9 +441,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/deepstack-cpu/SCALE/questions.yaml b/charts/stable/deepstack-cpu/SCALE/questions.yaml index e0c37dff614..c1ff6cba0f6 100644 --- a/charts/stable/deepstack-cpu/SCALE/questions.yaml +++ b/charts/stable/deepstack-cpu/SCALE/questions.yaml @@ -306,9 +306,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/emby/SCALE/questions.yaml b/charts/stable/emby/SCALE/questions.yaml index 2c17850e583..2d3e51ca934 100644 --- a/charts/stable/emby/SCALE/questions.yaml +++ b/charts/stable/emby/SCALE/questions.yaml @@ -240,9 +240,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/esphome/SCALE/questions.yaml b/charts/stable/esphome/SCALE/questions.yaml index 83fb2e163be..b66da73b322 100644 --- a/charts/stable/esphome/SCALE/questions.yaml +++ b/charts/stable/esphome/SCALE/questions.yaml @@ -234,9 +234,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" @@ -286,9 +292,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/handbrake/SCALE/questions.yaml b/charts/stable/handbrake/SCALE/questions.yaml index c8cfb300afd..a29b9a2a408 100644 --- a/charts/stable/handbrake/SCALE/questions.yaml +++ b/charts/stable/handbrake/SCALE/questions.yaml @@ -418,9 +418,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/home-assistant/SCALE/questions.yaml b/charts/stable/home-assistant/SCALE/questions.yaml index 68102e48881..42044155b2c 100644 --- a/charts/stable/home-assistant/SCALE/questions.yaml +++ b/charts/stable/home-assistant/SCALE/questions.yaml @@ -268,9 +268,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/jackett/SCALE/questions.yaml b/charts/stable/jackett/SCALE/questions.yaml index 92881ba598a..73a432f411b 100644 --- a/charts/stable/jackett/SCALE/questions.yaml +++ b/charts/stable/jackett/SCALE/questions.yaml @@ -240,9 +240,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/jellyfin/SCALE/questions.yaml b/charts/stable/jellyfin/SCALE/questions.yaml index 0ad7194f9db..c3713c7407b 100644 --- a/charts/stable/jellyfin/SCALE/questions.yaml +++ b/charts/stable/jellyfin/SCALE/questions.yaml @@ -240,9 +240,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/lidarr/SCALE/questions.yaml b/charts/stable/lidarr/SCALE/questions.yaml index 30763d6b1b0..8fb68c861e3 100644 --- a/charts/stable/lidarr/SCALE/questions.yaml +++ b/charts/stable/lidarr/SCALE/questions.yaml @@ -240,9 +240,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/ombi/SCALE/questions.yaml b/charts/stable/ombi/SCALE/questions.yaml index a4cc2b38e72..878f1542ebf 100644 --- a/charts/stable/ombi/SCALE/questions.yaml +++ b/charts/stable/ombi/SCALE/questions.yaml @@ -240,9 +240,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/plex/SCALE/questions.yaml b/charts/stable/plex/SCALE/questions.yaml index e612d507b8c..eac9dc00a39 100644 --- a/charts/stable/plex/SCALE/questions.yaml +++ b/charts/stable/plex/SCALE/questions.yaml @@ -258,9 +258,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/radarr/SCALE/questions.yaml b/charts/stable/radarr/SCALE/questions.yaml index b669fbc6283..4325fe36d41 100644 --- a/charts/stable/radarr/SCALE/questions.yaml +++ b/charts/stable/radarr/SCALE/questions.yaml @@ -240,9 +240,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/sonarr/SCALE/questions.yaml b/charts/stable/sonarr/SCALE/questions.yaml index d5294a4aead..eef18b96653 100644 --- a/charts/stable/sonarr/SCALE/questions.yaml +++ b/charts/stable/sonarr/SCALE/questions.yaml @@ -240,9 +240,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/syncthing/SCALE/questions.yaml b/charts/stable/syncthing/SCALE/questions.yaml index 1dde16e583d..41be9541f12 100644 --- a/charts/stable/syncthing/SCALE/questions.yaml +++ b/charts/stable/syncthing/SCALE/questions.yaml @@ -375,9 +375,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/tautulli/SCALE/questions.yaml b/charts/stable/tautulli/SCALE/questions.yaml index 3b85a9d4e9b..b33d2586f3b 100644 --- a/charts/stable/tautulli/SCALE/questions.yaml +++ b/charts/stable/tautulli/SCALE/questions.yaml @@ -240,9 +240,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/transmission/SCALE/questions.yaml b/charts/stable/transmission/SCALE/questions.yaml index 66736033ffb..703f30c0bcf 100644 --- a/charts/stable/transmission/SCALE/questions.yaml +++ b/charts/stable/transmission/SCALE/questions.yaml @@ -560,9 +560,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/truecommand/SCALE/questions.yaml b/charts/stable/truecommand/SCALE/questions.yaml index 3f0ad371c59..5495f70d44e 100644 --- a/charts/stable/truecommand/SCALE/questions.yaml +++ b/charts/stable/truecommand/SCALE/questions.yaml @@ -253,9 +253,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/vaultwarden/SCALE/questions.yaml b/charts/stable/vaultwarden/SCALE/questions.yaml index a667a42a026..ed21bc6dc9d 100644 --- a/charts/stable/vaultwarden/SCALE/questions.yaml +++ b/charts/stable/vaultwarden/SCALE/questions.yaml @@ -630,9 +630,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" @@ -689,9 +695,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" @@ -741,9 +753,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/charts/stable/zwavejs2mqtt/SCALE/questions.yaml b/charts/stable/zwavejs2mqtt/SCALE/questions.yaml index c437d76810c..5fde9eab85f 100644 --- a/charts/stable/zwavejs2mqtt/SCALE/questions.yaml +++ b/charts/stable/zwavejs2mqtt/SCALE/questions.yaml @@ -327,9 +327,15 @@ questions: - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: - type: boolean - default: false + type: dict hidden: true + attrs: + - variable: enabled + label: "Enable emptyDir" + schema: + type: boolean + default: false + hidden: true - variable: accessMode label: "Access Mode (Advanced)" description: "Allow or disallow multiple PVC's writhing to the same PVC" diff --git a/docs/development/app development/storage.md b/docs/development/app development/storage.md index 06a91886871..f188a1704f6 100644 --- a/docs/development/app development/storage.md +++ b/docs/development/app development/storage.md @@ -7,7 +7,6 @@ This article serves as a development extention to the storage article available For all these storage solutions we require the commonchart to be added to the App. The Common-Chart handles both the connection/addition of storage to the container and spinning up special k8s jobs to fix the permissions if requested for the Custom storage. - ### Integrated Persistent Storage When adding an App, there are almost always certain folders that are required for solid Apps performance. For example config files that should be persistent across restarts. @@ -56,6 +55,7 @@ Preventing the user to disable them, ensures that users don't (by mistake) remov - variable: emptyDir label: "Mount a ramdisk instead of actual storage" schema: + type: dict hidden: true attrs: - variable: enabled