From 9e284da7a67932e74150cd94100725ee7fb45a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernd=20Sch=C3=B6rgers?= Date: Mon, 21 Sep 2020 15:36:29 +0200 Subject: [PATCH] [jackett] Migrate to media-common (#50) * [jackett] Migrate to media-common * [jackett] Rename alias * [jackett] Process review comments --- charts/jackett/Chart.yaml | 7 +- charts/jackett/README.md | 87 ++------- charts/jackett/ci/ct-values.yaml | 10 + charts/jackett/templates/NOTES.txt | 29 +-- charts/jackett/templates/_helpers.tpl | 32 ---- charts/jackett/templates/config-pvc.yaml | 29 --- charts/jackett/templates/deployment.yaml | 122 ------------ charts/jackett/templates/ingress.yaml | 41 ---- charts/jackett/templates/pvc.yaml | 22 +++ charts/jackett/templates/service.yaml | 53 ------ .../templates/torrent-blackhole-pvc.yaml | 29 --- charts/jackett/values.yaml | 178 ++++-------------- 12 files changed, 109 insertions(+), 530 deletions(-) create mode 100644 charts/jackett/ci/ct-values.yaml delete mode 100644 charts/jackett/templates/_helpers.tpl delete mode 100644 charts/jackett/templates/config-pvc.yaml delete mode 100644 charts/jackett/templates/deployment.yaml delete mode 100644 charts/jackett/templates/ingress.yaml create mode 100644 charts/jackett/templates/pvc.yaml delete mode 100644 charts/jackett/templates/service.yaml delete mode 100644 charts/jackett/templates/torrent-blackhole-pvc.yaml diff --git a/charts/jackett/Chart.yaml b/charts/jackett/Chart.yaml index ec698313..685b4120 100644 --- a/charts/jackett/Chart.yaml +++ b/charts/jackett/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v0.16.1045 description: API Support for your favorite torrent trackers name: jackett -version: 3.1.0 +version: 4.0.0 keywords: - jackett - torrent @@ -14,3 +14,8 @@ sources: maintainers: - name: billimek email: jeff@billimek.com +dependencies: + - name: media-common + repository: https://k8s-at-home.com/charts/ + version: ^1.0.0 + alias: jackett diff --git a/charts/jackett/README.md b/charts/jackett/README.md index de8a1a29..23ab298b 100644 --- a/charts/jackett/README.md +++ b/charts/jackett/README.md @@ -28,82 +28,35 @@ helm delete my-release --purge The command removes all the Kubernetes components associated with the chart and deletes the release. ## Configuration - -The following tables lists the configurable parameters of the Sentry chart and their default values. - -| Parameter | Description | Default | -| -------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- | -| `image.repository` | Image repository | `linuxserver/jackett` | -| `image.tag` | Image tag. Possible values listed [here](https://hub.docker.com/r/linuxserver/jackett/tags/). | `v0.12.1132-ls37` | -| `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `strategyType` | Specifies the strategy used to replace old Pods by new ones | `Recreate` | -| `timezone` | Timezone the Jackett instance should run as, e.g. 'America/New_York' | `UTC` | -| `puid` | process userID the Jackett instance should run as | `1001` | -| `pgid` | process groupID the Jackett instance should run as | `1001` | -| `probes.liveness.failureThreshold` | Specify liveness `failureThreshold` parameter for the deployment | `5` | -| `probes.liveness.periodSeconds` | Specify liveness `periodSeconds` parameter for the deployment | `10` | -| `probes.readiness.failureThreshold` | Specify readiness `failureThreshold` parameter for the deployment | `5` | -| `probes.readiness.periodSeconds` | Specify readiness `periodSeconds` parameter for the deployment | `10` | -| `probes.startup.initialDelaySeconds` | Specify startup `initialDelaySeconds` parameter for the deployment | `5` | -| `probes.startup.failureThreshold` | Specify startup `failureThreshold` parameter for the deployment | `30` | -| `probes.startup.periodSeconds` | Specify startup `periodSeconds` parameter for the deployment | `10` | -| `Service.type` | Kubernetes service type for the Jackett GUI | `ClusterIP` | -| `Service.port` | Kubernetes port where the Jackett GUI is exposed | `9117` | -| `Service.annotations` | Service annotations for the Jackett GUI | `{}` | -| `Service.labels` | Custom labels | `{}` | -| `Service.loadBalancerIP` | Loadbalance IP for the Jackett GUI | `{}` | -| `Service.loadBalancerSourceRanges` | List of IP CIDRs allowed access to load balancer (if supported) | None | -| `ingress.enabled` | Enables Ingress | `false` | -| `ingress.annotations` | Ingress annotations | `{}` | -| `ingress.labels` | Custom labels | `{}` | -| `ingress.path` | Ingress path | `/` | -| `ingress.hosts` | Ingress accepted hostnames | `chart-example.local` | -| `ingress.tls` | Ingress TLS configuration | `[]` | -| `persistence.config.enabled` | Use persistent volume to store configuration data | `true` | -| `persistence.config.size` | Size of persistent volume claim | `1Gi` | -| `persistence.config.existingClaim` | Use an existing PVC to persist data | `nil` | -| `persistence.config.subPath` | Mount a sub directory of the persistent volume if set | `""` | -| `persistence.config.storageClass` | Type of persistent volume claim | `-` | -| `persistence.config.accessMode` | Persistence access mode | `ReadWriteOnce` | -| `persistence.config.skipuninstall` | Do not delete the pvc upon helm uninstall | `false` | -| `persistence.torrentblackhole.enabled` | Use persistent volume to store torrent files | `false` | -| `persistence.torrentblackhole.size` | Size of persistent volume claim | `1Gi` | -| `persistence.torrentblackhole.existingClaim` | Use an existing PVC to persist data | `nil` | -| `persistence.torrentblackhole.subPath` | Mount a sub directory of the persistent volume if set | `""` | -| `persistence.torrentblackhole.storageClass` | Type of persistent volume claim | `-` | -| `persistence.torrentblackhole.accessMode` | Persistence access mode | `ReadWriteOnce` | -| `persistence.torrentblackhole.skipuninstall` | Do not delete the pvc upon helm uninstall | `false` | -| `persistence.extraExistingClaimMounts` | Optionally add multiple existing claims | `[]` | -| `resources` | CPU/Memory resource requests/limits | `{}` | -| `nodeSelector` | Node labels for pod assignment | `{}` | -| `tolerations` | Toleration labels for pod assignment | `[]` | -| `affinity` | Affinity settings for pod assignment | `{}` | -| `podAnnotations` | Key-value pairs to add as pod annotations | `{}` | -| `deploymentAnnotations` | Key-value pairs to add as deployment annotations | `{}` | -| `hostNetwork` | Specify whether pods should use host networking | `false` | -| `dnsPolicy` | Set the DNS policy for pods, ex: ClusterFirst, ClusterFirstWithHostNet. See info [here](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy) | `ClusterFirst` | -| `dnsConfig` | Specify DNS options for pods, see values.yaml for details, or see [here](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config) | `{}` | +Read through the media-common [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/media-common/values.yaml) +file. It has several commented out suggested values. Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - ```console -helm install --name my-release \ - --set timezone="America/New York" \ +helm install jackett \ + --set jackett.env.TZ="America/New York" \ k8s-at-home/jackett ``` - -Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, - +Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the +chart. For example, ```console -helm install --name my-release -f values.yaml k8s-at-home/jackett +helm install jackett k8s-at-home/jackett --values values.yaml +``` + +These values will be nested as it is a dependency, for example +```yaml +jackett: + image: + tag: ... ``` --- - **NOTE** -If you get `Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...` it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`. +If you get +```console +Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...` +``` +it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`. ---- - -Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/jackett/values.yaml) file. It has several commented out suggested values. +--- \ No newline at end of file diff --git a/charts/jackett/ci/ct-values.yaml b/charts/jackett/ci/ct-values.yaml new file mode 100644 index 00000000..786a5a90 --- /dev/null +++ b/charts/jackett/ci/ct-values.yaml @@ -0,0 +1,10 @@ +jackett: + image: + organization: linuxserver + repository: jackett + tag: v0.16.1045-ls14 + service: + type: ClusterIP + port: 9117 + ingress: + enabled: false diff --git a/charts/jackett/templates/NOTES.txt b/charts/jackett/templates/NOTES.txt index 7c13744e..f0db26f8 100644 --- a/charts/jackett/templates/NOTES.txt +++ b/charts/jackett/templates/NOTES.txt @@ -1,19 +1,20 @@ +{{- $svcPort := .Values.jackett.service.port -}} 1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range .Values.ingress.hosts }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }} +{{- if .Values.jackett.ingress.enabled }} +{{- range .Values.jackett.ingress.hosts }} + http{{ if $.Values.jackett.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.jackett.ingress.path }} {{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "jackett.fullname" . }}) +{{- else if contains "NodePort" .Values.jackett.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "media-common.fullname" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} +{{- else if contains "LoadBalancer" .Values.jackett.service.type }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get svc -w {{ include "jackett.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "jackett.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "jackett.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - echo "Visit http://127.0.0.1:9117 to use your application" - kubectl port-forward $POD_NAME 9117:80 -{{- end }} \ No newline at end of file + You can watch the status of by running 'kubectl get svc -w {{ include "media-common.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "media-common.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + echo http://$SERVICE_IP:{{ $svcPort }} +{{- else if contains "ClusterIP" .Values.jackett.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "media-common.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl port-forward $POD_NAME 8080:{{ $svcPort }} +{{- end }} diff --git a/charts/jackett/templates/_helpers.tpl b/charts/jackett/templates/_helpers.tpl deleted file mode 100644 index cb42f179..00000000 --- a/charts/jackett/templates/_helpers.tpl +++ /dev/null @@ -1,32 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "jackett.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "jackett.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "jackett.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/charts/jackett/templates/config-pvc.yaml b/charts/jackett/templates/config-pvc.yaml deleted file mode 100644 index 9ed05137..00000000 --- a/charts/jackett/templates/config-pvc.yaml +++ /dev/null @@ -1,29 +0,0 @@ - -{{- if and .Values.persistence.config.enabled (not .Values.persistence.config.existingClaim) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "jackett.fullname" . }}-config - {{- if .Values.persistence.config.skipuninstall }} - annotations: - "helm.sh/resource-policy": keep - {{- end }} - labels: - app.kubernetes.io/name: {{ include "jackett.name" . }} - helm.sh/chart: {{ include "jackett.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} -spec: - accessModes: - - {{ .Values.persistence.config.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.config.size | quote }} -{{- if .Values.persistence.config.storageClass }} -{{- if (eq "-" .Values.persistence.config.storageClass) }} - storageClassName: "" -{{- else }} - storageClassName: "{{ .Values.persistence.config.storageClass }}" -{{- end }} -{{- end }} -{{- end -}} \ No newline at end of file diff --git a/charts/jackett/templates/deployment.yaml b/charts/jackett/templates/deployment.yaml deleted file mode 100644 index a1f8442f..00000000 --- a/charts/jackett/templates/deployment.yaml +++ /dev/null @@ -1,122 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "jackett.fullname" . }} - {{- if .Values.deploymentAnnotations }} - annotations: - {{- range $key, $value := .Values.deploymentAnnotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- end }} - labels: - app.kubernetes.io/name: {{ include "jackett.name" . }} - helm.sh/chart: {{ include "jackett.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} -spec: - replicas: 1 - revisionHistoryLimit: 3 - strategy: - type: {{ .Values.strategyType }} - selector: - matchLabels: - app.kubernetes.io/name: {{ include "jackett.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - template: - metadata: - labels: - app.kubernetes.io/name: {{ include "jackett.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - {{- if .Values.podAnnotations }} - annotations: - {{- range $key, $value := .Values.podAnnotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- end }} - spec: - hostNetwork: {{ .Values.hostNetwork }} - dnsPolicy: {{ .Values.dnsPolicy }} - {{- if .Values.dnsConfig }} - dnsConfig: {{ toYaml .Values.dnsConfig | nindent 8}} - {{- end }} - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: 9117 - protocol: TCP - livenessProbe: - tcpSocket: - port: http - failureThreshold: {{ .Values.probes.liveness.failureThreshold }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} - readinessProbe: - tcpSocket: - port: http - failureThreshold: {{ .Values.probes.readiness.failureThreshold }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} - startupProbe: - tcpSocket: - port: http - initialDelaySeconds: {{ .Values.probes.startup.initialDelaySeconds }} - failureThreshold: {{ .Values.probes.startup.failureThreshold }} - periodSeconds: {{ .Values.probes.startup.periodSeconds }} - env: - - name: TZ - value: "{{ .Values.timezone }}" - - name: PUID - value: "{{ .Values.puid }}" - - name: PGID - value: "{{ .Values.pgid }}" - volumeMounts: - - mountPath: /config - name: config - {{- if .Values.persistence.config.subPath }} - subPath: "{{ .Values.persistence.config.subPath }}" - {{- end }} - - mountPath: /downloads - name: torrentblackhole - {{- if .Values.persistence.torrentblackhole.subPath }} - subPath: "{{ .Values.persistence.torrentblackhole.subPath }}" - {{- end }} - {{- range .Values.persistence.extraExistingClaimMounts }} - - name: {{ .name }} - mountPath: {{ .mountPath }} - readOnly: {{ .readOnly }} - {{- end }} - resources: -{{ toYaml .Values.resources | indent 12 }} - volumes: - - name: config - {{- if .Values.persistence.config.enabled }} - persistentVolumeClaim: - claimName: {{ if .Values.persistence.config.existingClaim }}{{ .Values.persistence.config.existingClaim }}{{- else }}{{ template "jackett.fullname" . }}-config{{- end }} - {{- else }} - emptyDir: {} - {{ end }} - - name: torrentblackhole - {{- if .Values.persistence.torrentblackhole.enabled }} - persistentVolumeClaim: - claimName: {{ if .Values.persistence.torrentblackhole.existingClaim }}{{ .Values.persistence.torrentblackhole.existingClaim }}{{- else }}{{ template "jackett.fullname" . }}-torrentblackhole{{- end }} - {{- else }} - emptyDir: {} - {{- end }} - {{- range .Values.persistence.extraExistingClaimMounts }} - - name: {{ .name }} - persistentVolumeClaim: - claimName: {{ .existingClaim }} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} diff --git a/charts/jackett/templates/ingress.yaml b/charts/jackett/templates/ingress.yaml deleted file mode 100644 index ab46f6d6..00000000 --- a/charts/jackett/templates/ingress.yaml +++ /dev/null @@ -1,41 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "jackett.fullname" . -}} -{{- $ingressPath := .Values.ingress.path -}} -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - app.kubernetes.io/name: {{ include "jackett.name" . }} - helm.sh/chart: {{ include "jackett.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - {{- with .Values.ingress.labels -}} - {{ toYaml . | nindent 4 }} - {{- end -}} -{{- with .Values.ingress.annotations }} - annotations: -{{ toYaml . | indent 4 }} -{{- end }} -spec: -{{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} -{{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ . | quote }} - http: - paths: - - path: {{ $ingressPath }} - backend: - serviceName: {{ $fullName }} - servicePort: http - {{- end }} -{{- end }} diff --git a/charts/jackett/templates/pvc.yaml b/charts/jackett/templates/pvc.yaml new file mode 100644 index 00000000..32626439 --- /dev/null +++ b/charts/jackett/templates/pvc.yaml @@ -0,0 +1,22 @@ +{{- if and .Values.jackett.persistence.torrentblackhole.enabled (not .Values.jackett.persistence.torrentblackhole.existingClaim) }} +--- +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ template "media-common.fullname" . }}-downloads + {{- if .Values.jackett.persistence.torrentblackhole.skipuninstall }} + annotations: + "helm.sh/resource-policy": keep + {{- end }} + labels: + {{- include "media-common.labels" . | nindent 4 }} +spec: + accessModes: + - {{ .Values.jackett.persistence.torrentblackhole.accessMode | quote }} + resources: + requests: + storage: {{ .Values.jackett.persistence.torrentblackhole.size | quote }} + {{- if .Values.jackett.persistence.torrentblackhole.storageClass }} + storageClassName: {{ if (eq "-" .Values.jackett.persistence.torrentblackhole.storageClass) }}""{{- else }}{{ .Values.jackett.persistence.torrentblackhole.storageClass | quote}}{{- end }} + {{- end }} +{{- end -}} diff --git a/charts/jackett/templates/service.yaml b/charts/jackett/templates/service.yaml deleted file mode 100644 index 486a3cb4..00000000 --- a/charts/jackett/templates/service.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "jackett.fullname" . }} - labels: - app.kubernetes.io/name: {{ include "jackett.name" . }} - helm.sh/chart: {{ include "jackett.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- if .Values.service.labels }} -{{ toYaml .Values.service.labels | indent 4 }} -{{- end }} -{{- with .Values.service.annotations }} - annotations: -{{ toYaml . | indent 4 }} -{{- end }} -spec: -{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }} - type: ClusterIP - {{- if .Values.service.clusterIP }} - clusterIP: {{ .Values.service.clusterIP }} - {{end}} -{{- else if eq .Values.service.type "LoadBalancer" }} - type: {{ .Values.service.type }} - {{- if .Values.service.loadBalancerIP }} - loadBalancerIP: {{ .Values.service.loadBalancerIP }} - {{- end }} - {{- if .Values.service.loadBalancerSourceRanges }} - loadBalancerSourceRanges: -{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }} - {{- end -}} -{{- else }} - type: {{ .Values.service.type }} -{{- end }} -{{- if .Values.service.externalIPs }} - externalIPs: -{{ toYaml .Values.service.externalIPs | indent 4 }} -{{- end }} - {{- if .Values.service.externalTrafficPolicy }} - externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }} - {{- end }} - ports: - - name: http - port: {{ .Values.service.port }} - protocol: TCP - targetPort: http -{{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }} - nodePort: {{.Values.service.nodePort}} -{{ end }} - selector: - app.kubernetes.io/name: {{ include "jackett.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - \ No newline at end of file diff --git a/charts/jackett/templates/torrent-blackhole-pvc.yaml b/charts/jackett/templates/torrent-blackhole-pvc.yaml deleted file mode 100644 index c00b675c..00000000 --- a/charts/jackett/templates/torrent-blackhole-pvc.yaml +++ /dev/null @@ -1,29 +0,0 @@ - -{{- if and .Values.persistence.torrentblackhole.enabled (not .Values.persistence.torrentblackhole.existingClaim) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "jackett.fullname" . }}-torrentblackhole - {{- if .Values.persistence.torrentblackhole.skipuninstall }} - annotations: - "helm.sh/resource-policy": keep - {{- end }} - labels: - app.kubernetes.io/name: {{ include "jackett.name" . }} - helm.sh/chart: {{ include "jackett.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} -spec: - accessModes: - - {{ .Values.persistence.torrentblackhole.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.torrentblackhole.size | quote }} -{{- if .Values.persistence.torrentblackhole.storageClass }} -{{- if (eq "-" .Values.persistence.torrentblackhole.storageClass) }} - storageClassName: "" -{{- else }} - storageClassName: "{{ .Values.persistence.torrentblackhole.storageClass }}" -{{- end }} -{{- end }} -{{- end -}} diff --git a/charts/jackett/values.yaml b/charts/jackett/values.yaml index 541d589b..e7ce07d2 100644 --- a/charts/jackett/values.yaml +++ b/charts/jackett/values.yaml @@ -1,149 +1,43 @@ # Default values for Jackett. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. -image: - repository: linuxserver/jackett - tag: v0.16.1045-ls14 - pullPolicy: IfNotPresent +jackett: + image: + organization: linuxserver + repository: jackett + pullPolicy: IfNotPresent + tag: v0.16.1045-ls14 -# upgrade strategy type (e.g. Recreate or RollingUpdate) -strategyType: Recreate + service: + port: 9117 -# Probes configuration -probes: - liveness: - failureThreshold: 5 - periodSeconds: 10 - readiness: - failureThreshold: 5 - periodSeconds: 10 - startup: - initialDelaySeconds: 5 - failureThreshold: 30 - periodSeconds: 10 + env: {} + # TZ: UTC + # PUID: 1001 + # PGID: 1001 -nameOverride: "" -fullnameOverride: "" + persistence: + torrentblackhole: + enabled: false + ## Jackett torrent torrentblackhole Persistent Volume Storage Class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is + ## set, choosing the default provisioner. (gp2 on AWS, standard on + ## GKE, AWS & OpenStack) + # storageClass: "-" + # accessMode: ReadWriteOnce + # size: 1Gi + ## Do not delete the pvc upon helm uninstall + # skipuninstall: false + # existingClaim: "" -timezone: UTC -puid: 1001 -pgid: 1001 + additionalVolumes: + - name: torrentblackhole + emptyDir: {} + ## When using persistence.torrentblackhole.enabled: true, adjust this to: + # persistentVolumeClaim: + # claimName: jackett-torrentblackhole -service: - type: ClusterIP - port: 9117 - ## Specify the nodePort value for the LoadBalancer and NodePort service types. - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport - ## - # nodePort: - ## Provide any additional annotations which may be required. This can be used to - ## set the LoadBalancer service type to internal only. - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer - ## - annotations: {} - labels: {} - ## Use loadBalancerIP to request a specific static IP, - ## otherwise leave blank - ## - loadBalancerIP: - # loadBalancerSourceRanges: [] - ## Set the externalTrafficPolicy in the Service to either Cluster or Local - # externalTrafficPolicy: Cluster - -ingress: - enabled: false - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - labels: {} - path: / - hosts: - - chart-example.local - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -persistence: - config: - enabled: true - ## Jackett configuration data Persistent Volume Storage Class - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - # storageClass: "-" - ## - ## If you want to reuse an existing claim, you can pass the name of the PVC using - ## the existingClaim variable - # existingClaim: your-claim - accessMode: ReadWriteOnce - size: 1Gi - - ## If subPath is set mount a sub folder of a volume instead of the root of the volume. - ## This is especially handy for volume plugins that don't natively support sub mounting (like glusterfs). - ## - subPath: "" - ## Do not delete the pvc upon helm uninstall - skipuninstall: false - torrentblackhole: - enabled: false - ## Jackett torrentblackhole directory volume configuration - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - # storageClass: "-" - ## - ## If you want to reuse an existing claim, you can pass the name of the PVC using - ## the existingClaim variable - # existingClaim: your-claim - # subPath: some-subpath - accessMode: ReadWriteOnce - size: 1Gi - ## Do not delete the pvc upon helm uninstall - skipuninstall: false - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -dnsPolicy: ClusterFirst - -dnsConfig: {} - # dnsConfig may be used with any dnsPolicy, but is required when dnsPolicy: "None" - # To use, remove the braces above, and uncomment/modify the following lines. - # See https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config - # for additional information - # nameservers: - # - 1.1.1.1 - # searches: - # - ns1.mysearch.domain - # options: - # - name: ndots - # value: "1" - -hostNetwork: false - -nodeSelector: {} - -tolerations: [] - -affinity: {} - -podAnnotations: {} - -deploymentAnnotations: {} + additionalVolumeMounts: + - name: torrentblackhole + mountPath: /downloads