diff --git a/community/deluge/1.0.7/charts/common-1.1.0.tgz b/community/deluge/1.0.7/charts/common-1.1.0.tgz deleted file mode 100644 index ddddd9ec8c..0000000000 Binary files a/community/deluge/1.0.7/charts/common-1.1.0.tgz and /dev/null differ diff --git a/community/deluge/1.0.7/templates/_deluge.tpl b/community/deluge/1.0.7/templates/_deluge.tpl deleted file mode 100644 index 1cda1063d3..0000000000 --- a/community/deluge/1.0.7/templates/_deluge.tpl +++ /dev/null @@ -1,126 +0,0 @@ -{{- define "deluge.workload" -}} -workload: - deluge: - enabled: true - primary: true - type: Deployment - podSpec: - securityContext: - fsGroup: {{ .Values.delugeID.group }} - hostNetwork: {{ .Values.delugeNetwork.hostNetwork }} - containers: - deluge: - enabled: true - primary: true - imageSelector: image - securityContext: - runAsUser: 0 - runAsGroup: 0 - runAsNonRoot: false - readOnlyRootFilesystem: false - capabilities: - add: - - CHOWN - - DAC_OVERRIDE - - FOWNER - - SETGID - - SETUID - {{ with .Values.delugeConfig.additionalEnvs }} - envList: - {{ range $env := . }} - - name: {{ $env.name }} - value: {{ $env.value }} - {{ end }} - {{ end }} - probes: - liveness: - enabled: true - type: http - port: 8112 - path: / - readiness: - enabled: true - type: http - port: 8112 - path: / - startup: - enabled: true - type: http - port: 8112 - path: / - -{{/* Service */}} -service: - deluge: - enabled: true - primary: true - type: NodePort - targetSelector: deluge - ports: - webui: - enabled: true - primary: true - port: {{ .Values.delugeNetwork.webPort }} - nodePort: {{ .Values.delugeNetwork.webPort }} - targetPort: 8112 - targetSelector: deluge - {{- if .Values.delugeNetwork.exposeDaemon }} - daemon: - enabled: true - port: {{ .Values.delugeNetwork.daemonPort }} - nodePort: {{ .Values.delugeNetwork.daemonPort }} - targetPort: 58846 - targetSelector: deluge - {{- end }} - torrent: - enabled: true - type: NodePort - targetSelector: deluge - ports: - tcp: - enabled: true - primary: true - port: {{ .Values.delugeNetwork.torrentPort }} - nodePort: {{ .Values.delugeNetwork.torrentPort }} - targetPort: 6881 - targetSelector: deluge - udp: - enabled: true - port: {{ .Values.delugeNetwork.torrentPort }} - nodePort: {{ .Values.delugeNetwork.torrentPort }} - targetPort: 6881 - protocol: udp - targetSelector: deluge - -{{/* Persistence */}} -persistence: - config: - enabled: true - type: {{ .Values.delugeStorage.config.type }} - datasetName: {{ .Values.delugeStorage.config.datasetName | default "" }} - hostPath: {{ .Values.delugeStorage.config.hostPath | default "" }} - targetSelector: - deluge: - deluge: - mountPath: /config - downloads: - enabled: true - type: {{ .Values.delugeStorage.downloads.type }} - datasetName: {{ .Values.delugeStorage.downloads.datasetName | default "" }} - hostPath: {{ .Values.delugeStorage.downloads.hostPath | default "" }} - targetSelector: - deluge: - deluge: - mountPath: /downloads - {{- range $idx, $storage := .Values.delugeStorage.additionalStorages }} - {{ printf "deluge-%v" (int $idx) }}: - enabled: true - type: {{ $storage.type }} - datasetName: {{ $storage.datasetName | default "" }} - hostPath: {{ $storage.hostPath | default "" }} - targetSelector: - deluge: - deluge: - mountPath: {{ $storage.mountPath }} - {{- end }} -{{- end -}} diff --git a/community/deluge/1.0.7/Chart.lock b/community/deluge/1.0.8/Chart.lock similarity index 100% rename from community/deluge/1.0.7/Chart.lock rename to community/deluge/1.0.8/Chart.lock diff --git a/community/deluge/1.0.7/Chart.yaml b/community/deluge/1.0.8/Chart.yaml similarity index 97% rename from community/deluge/1.0.7/Chart.yaml rename to community/deluge/1.0.8/Chart.yaml index 2f60ada5ea..f950f631ec 100644 --- a/community/deluge/1.0.7/Chart.yaml +++ b/community/deluge/1.0.8/Chart.yaml @@ -3,7 +3,7 @@ description: Deluge is a lightweight, Free Software, cross-platform BitTorrent c annotations: title: Deluge type: application -version: 1.0.7 +version: 1.0.8 apiVersion: v2 appVersion: '9.5.3' kubeVersion: '>=1.16.0-0' diff --git a/community/deluge/1.0.7/README.md b/community/deluge/1.0.8/README.md similarity index 100% rename from community/deluge/1.0.7/README.md rename to community/deluge/1.0.8/README.md diff --git a/community/deluge/1.0.7/app-readme.md b/community/deluge/1.0.8/app-readme.md similarity index 100% rename from community/deluge/1.0.7/app-readme.md rename to community/deluge/1.0.8/app-readme.md diff --git a/community/deluge/1.0.8/charts/common-1.1.0.tgz b/community/deluge/1.0.8/charts/common-1.1.0.tgz new file mode 100644 index 0000000000..96a0851688 Binary files /dev/null and b/community/deluge/1.0.8/charts/common-1.1.0.tgz differ diff --git a/community/deluge/1.0.7/ci/basic-values.yaml b/community/deluge/1.0.8/ci/basic-values.yaml similarity index 100% rename from community/deluge/1.0.7/ci/basic-values.yaml rename to community/deluge/1.0.8/ci/basic-values.yaml diff --git a/community/deluge/1.0.7/ci/hostnet-values.yaml b/community/deluge/1.0.8/ci/hostnet-values.yaml similarity index 100% rename from community/deluge/1.0.7/ci/hostnet-values.yaml rename to community/deluge/1.0.8/ci/hostnet-values.yaml diff --git a/community/deluge/1.0.7/ix_values.yaml b/community/deluge/1.0.8/ix_values.yaml similarity index 100% rename from community/deluge/1.0.7/ix_values.yaml rename to community/deluge/1.0.8/ix_values.yaml diff --git a/community/deluge/1.0.7/metadata.yaml b/community/deluge/1.0.8/metadata.yaml similarity index 100% rename from community/deluge/1.0.7/metadata.yaml rename to community/deluge/1.0.8/metadata.yaml diff --git a/community/deluge/1.0.7/questions.yaml b/community/deluge/1.0.8/questions.yaml similarity index 98% rename from community/deluge/1.0.7/questions.yaml rename to community/deluge/1.0.8/questions.yaml index b4eed994d1..c37e785534 100644 --- a/community/deluge/1.0.7/questions.yaml +++ b/community/deluge/1.0.8/questions.yaml @@ -98,7 +98,9 @@ questions: default: false - variable: webPort label: Web Port - description: The port for the Deluge Web UI. + description: | + The port for the Deluge Web UI.
+ (The internal port is always 8112) schema: type: int show_if: [["hostNetwork", "=", false]] @@ -130,10 +132,8 @@ questions: description: | The port for the Deluge Torrent.
Applies to both TCP and UDP. - (Internal port is always 6881) schema: type: int - show_if: [["hostNetwork", "=", false]] default: 30039 min: 9000 max: 65535 diff --git a/community/deluge/1.0.7/templates/NOTES.txt b/community/deluge/1.0.8/templates/NOTES.txt similarity index 100% rename from community/deluge/1.0.7/templates/NOTES.txt rename to community/deluge/1.0.8/templates/NOTES.txt diff --git a/community/deluge/1.0.8/templates/_deluge.tpl b/community/deluge/1.0.8/templates/_deluge.tpl new file mode 100644 index 0000000000..3484d75502 --- /dev/null +++ b/community/deluge/1.0.8/templates/_deluge.tpl @@ -0,0 +1,86 @@ +{{- define "deluge.workload" -}} +workload: + deluge: + enabled: true + primary: true + type: Deployment + podSpec: + securityContext: + fsGroup: {{ .Values.delugeID.group }} + hostNetwork: {{ .Values.delugeNetwork.hostNetwork }} + containers: + deluge: + enabled: true + primary: true + imageSelector: image + securityContext: + runAsUser: 0 + runAsGroup: 0 + runAsNonRoot: false + readOnlyRootFilesystem: false + capabilities: + add: + - CHOWN + - DAC_OVERRIDE + - FOWNER + - SETGID + - SETUID + {{ with .Values.delugeConfig.additionalEnvs }} + envList: + {{ range $env := . }} + - name: {{ $env.name }} + value: {{ $env.value }} + {{ end }} + {{ end }} + probes: + liveness: + enabled: true + type: http + port: 8112 + path: / + readiness: + enabled: true + type: http + port: 8112 + path: / + startup: + enabled: true + type: http + port: 8112 + path: / + initContainers: + config: + enabled: true + type: init + imageSelector: image + securityContext: + runAsUser: 0 + runAsGroup: 0 + runAsNonRoot: false + readOnlyRootFilesystem: false + capabilities: + add: + - CHOWN + - DAC_OVERRIDE + - FOWNER + - SETGID + - SETUID + command: + - python + args: + - -c + - | + from deluge.config import Config + import os + import shutil + if not os.path.exists('/config/core.conf'): + print('Copying default config') + shutil.copyfile('/defaults/core.conf', '/config/core.conf') + print('Loading config') + config = Config('/config/core.conf') + print('Setting listen ports to {{ .Values.delugeNetwork.torrentPort }}') + config['listen_ports'] = [{{ .Values.delugeNetwork.torrentPort }}, {{ .Values.delugeNetwork.torrentPort }}] + print('Saving config') + Config.save(config) + print('Done') +{{- end -}} diff --git a/community/deluge/1.0.8/templates/_persistence.tpl b/community/deluge/1.0.8/templates/_persistence.tpl new file mode 100644 index 0000000000..73fc82c97b --- /dev/null +++ b/community/deluge/1.0.8/templates/_persistence.tpl @@ -0,0 +1,34 @@ +{{- define "deluge.persistence" -}} +persistence: + config: + enabled: true + type: {{ .Values.delugeStorage.config.type }} + datasetName: {{ .Values.delugeStorage.config.datasetName | default "" }} + hostPath: {{ .Values.delugeStorage.config.hostPath | default "" }} + targetSelector: + deluge: + deluge: + mountPath: /config + config: + mountPath: /config + downloads: + enabled: true + type: {{ .Values.delugeStorage.downloads.type }} + datasetName: {{ .Values.delugeStorage.downloads.datasetName | default "" }} + hostPath: {{ .Values.delugeStorage.downloads.hostPath | default "" }} + targetSelector: + deluge: + deluge: + mountPath: /downloads + {{- range $idx, $storage := .Values.delugeStorage.additionalStorages }} + {{ printf "deluge-%v" (int $idx) }}: + enabled: true + type: {{ $storage.type }} + datasetName: {{ $storage.datasetName | default "" }} + hostPath: {{ $storage.hostPath | default "" }} + targetSelector: + deluge: + deluge: + mountPath: {{ $storage.mountPath }} + {{- end }} +{{- end -}} diff --git a/community/deluge/1.0.7/templates/_portal.tpl b/community/deluge/1.0.8/templates/_portal.tpl similarity index 100% rename from community/deluge/1.0.7/templates/_portal.tpl rename to community/deluge/1.0.8/templates/_portal.tpl diff --git a/community/deluge/1.0.8/templates/_service.tpl b/community/deluge/1.0.8/templates/_service.tpl new file mode 100644 index 0000000000..106383ea1b --- /dev/null +++ b/community/deluge/1.0.8/templates/_service.tpl @@ -0,0 +1,41 @@ +{{- define "deluge.service" -}} +service: + deluge: + enabled: true + primary: true + type: NodePort + targetSelector: deluge + ports: + webui: + enabled: true + primary: true + port: {{ .Values.delugeNetwork.webPort }} + nodePort: {{ .Values.delugeNetwork.webPort }} + targetPort: 8112 + targetSelector: deluge + {{- if .Values.delugeNetwork.exposeDaemon }} + daemon: + enabled: true + port: {{ .Values.delugeNetwork.daemonPort }} + nodePort: {{ .Values.delugeNetwork.daemonPort }} + targetPort: 58846 + targetSelector: deluge + {{- end }} + torrent: + enabled: true + type: NodePort + targetSelector: deluge + ports: + tcp: + enabled: true + primary: true + port: {{ .Values.delugeNetwork.torrentPort }} + nodePort: {{ .Values.delugeNetwork.torrentPort }} + targetSelector: deluge + udp: + enabled: true + port: {{ .Values.delugeNetwork.torrentPort }} + nodePort: {{ .Values.delugeNetwork.torrentPort }} + protocol: udp + targetSelector: deluge +{{- end -}} diff --git a/community/deluge/1.0.7/templates/common.yaml b/community/deluge/1.0.8/templates/common.yaml similarity index 64% rename from community/deluge/1.0.7/templates/common.yaml rename to community/deluge/1.0.8/templates/common.yaml index 0596641f18..c1a4700237 100644 --- a/community/deluge/1.0.7/templates/common.yaml +++ b/community/deluge/1.0.8/templates/common.yaml @@ -1,6 +1,8 @@ {{- include "ix.v1.common.loader.init" . -}} {{/* Merge the templates with Values */}} +{{- $_ := mustMergeOverwrite .Values (include "deluge.service" $ | fromYaml) -}} +{{- $_ := mustMergeOverwrite .Values (include "deluge.persistence" $ | fromYaml) -}} {{- $_ := mustMergeOverwrite .Values (include "deluge.workload" $ | fromYaml) -}} {{/* Create the configmap for portal manually*/}}