From 2fda3a9e3e1100066be1b9eaa714f5853bd0bc3c Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Wed, 19 May 2021 15:12:45 +0200 Subject: [PATCH] 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: ""