diff --git a/rtorrent-flood/Chart.yaml b/rtorrent-flood/Chart.yaml index 4679308c..4d6cdc8f 100644 --- a/rtorrent-flood/Chart.yaml +++ b/rtorrent-flood/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 0.9.7-0.13.7 description: flood-rtorrent name: rtorrent-flood -version: 1.1.1 +version: 2.0.7 keywords: - rtorrent - flood diff --git a/rtorrent-flood/templates/config-pvc.yaml b/rtorrent-flood/templates/config-pvc.yaml new file mode 100644 index 00000000..65512556 --- /dev/null +++ b/rtorrent-flood/templates/config-pvc.yaml @@ -0,0 +1,24 @@ +{{- if and .Values.persistence.config.enabled (not .Values.persistence.config.existingClaim) }} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ template "rtorrent-flood.fullname" . }}-config + labels: + app.kubernetes.io/name: {{ include "rtorrent-flood.name" . }} + helm.sh/chart: {{ include "rtorrent-flood.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/rtorrent-flood/templates/statefulset.yaml b/rtorrent-flood/templates/deployment.yaml similarity index 67% rename from rtorrent-flood/templates/statefulset.yaml rename to rtorrent-flood/templates/deployment.yaml index ebae5cf5..c9104197 100644 --- a/rtorrent-flood/templates/statefulset.yaml +++ b/rtorrent-flood/templates/deployment.yaml @@ -1,5 +1,5 @@ apiVersion: apps/v1 -kind: StatefulSet +kind: Deployment metadata: name: {{ template "rtorrent-flood.fullname" . }} labels: @@ -8,8 +8,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} spec: - podManagementPolicy: "Parallel" - replicas: {{ .Values.replicaCount }} + replicas: 1 + strategy: + type: {{ .Values.strategyType }} selector: matchLabels: app.kubernetes.io/name: {{ include "rtorrent-flood.name" . }} @@ -34,13 +35,15 @@ spec: livenessProbe: httpGet: port: http - scheme: HTTP - initialDelaySeconds: 30 + initialDelaySeconds: 30 + failureThreshold: 5 + timeoutSeconds: 10 readinessProbe: httpGet: port: http - scheme: HTTP - initialDelaySeconds: 15 + initialDelaySeconds: 30 + failureThreshold: 5 + timeoutSeconds: 10 tty: true env: - name: TZ @@ -62,6 +65,13 @@ spec: resources: {{ toYaml .Values.resources | indent 12 }} volumes: + - name: flood-db + {{- if .Values.persistence.config.enabled }} + persistentVolumeClaim: + claimName: {{ if .Values.persistence.config.existingClaim }}{{ .Values.persistence.config.existingClaim }}{{- else }}{{ template "rtorrent-flood.fullname" . }}-config{{- end }} + {{- else }} + emptyDir: {} + {{ end }} - name: data {{- if .Values.persistence.data.enabled }} persistentVolumeClaim: @@ -69,38 +79,6 @@ spec: {{- else }} emptyDir: {} {{ end }} -{{- if and .Values.persistence.config.enabled .Values.persistence.config.existingClaim }} - - name: flood-db - {{- if .Values.persistence.config.enabled }} - persistentVolumeClaim: - claimName: {{ .Values.persistence.config.existingClaim }} - {{- else }} - emptyDir: {} - {{- end }} -{{- else if not .Values.persistence.config.enabled }} - - name: flood-db - emptyDir: {} -{{- else if and .Values.persistence.config.enabled (not .Values.persistence.config.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: flood-db - labels: - app.kubernetes.io/name: {{ include "rtorrent-flood.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - 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 }} {{- with .Values.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} diff --git a/rtorrent-flood/values.yaml b/rtorrent-flood/values.yaml index 290c6034..c206a41c 100644 --- a/rtorrent-flood/values.yaml +++ b/rtorrent-flood/values.yaml @@ -2,13 +2,14 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -replicaCount: 1 - image: repository: wonderfall/rtorrent-flood tag: 0.9.7-0.13.7 pullPolicy: IfNotPresent +# upgrade strategy type (e.g. Recreate or RollingUpdate) +strategyType: Recreate + nameOverride: "" fullnameOverride: ""