From dd686320ac275b3e2e9669a602a9cd79859e154f Mon Sep 17 00:00:00 2001
From: Jeff Billimek <jeff@billimek.com>
Date: Sun, 29 Sep 2019 07:55:44 -0500
Subject: [PATCH] updates to rtorrent-flood chart (#67)

* updates to rtorrent-flood chart

* trying to fix linting errors

* resources should be set in values

* add necessary resources stanza

* revert livenessProbe for rtorrent container
---
 rtorrent-flood/Chart.yaml                |  3 +--
 rtorrent-flood/templates/deployment.yaml | 15 ++++++++-----
 rtorrent-flood/values.yaml               | 28 +++++++++++++-----------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/rtorrent-flood/Chart.yaml b/rtorrent-flood/Chart.yaml
index d0f5bdae..2c4d0a4b 100644
--- a/rtorrent-flood/Chart.yaml
+++ b/rtorrent-flood/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.0.0
 description: rtorrent and flood co-located in the same deployment
 name: rtorrent-flood
-version: 3.0.1
+version: 3.1.1
 keywords:
   - rtorrent
   - flood
@@ -13,7 +13,6 @@ sources:
   - https://hub.docker.com/r/looselyrigorous/rtorrent
   - https://github.com/looselyrigorous/docker-rtorrent
   - https://github.com/Flood-UI/flood
-  - https://cloud.docker.com/repository/docker/billimek/flood
 maintainers:
   - name: billimek
     email: jeff@billimek.com
diff --git a/rtorrent-flood/templates/deployment.yaml b/rtorrent-flood/templates/deployment.yaml
index e832f0ef..3db8c9ae 100644
--- a/rtorrent-flood/templates/deployment.yaml
+++ b/rtorrent-flood/templates/deployment.yaml
@@ -29,12 +29,16 @@ spec:
             - name: bt
               containerPort: 49161
               protocol: TCP
+          tty: true
+          livenessProbe:
+            tcpSocket:	
+              port: bt
           readinessProbe:
             tcpSocket:
               port: bt
-          livenessProbe:
-            tcpSocket:
-              port: bt
+            periodSeconds: 10
+            successThreshold: 1
+            failureThreshold: 3
           env:
             - name: TZ
               value: "{{ .Values.timezone }}"
@@ -56,6 +60,7 @@ spec:
             - mountPath: /socket
               name: socket
           resources:
+{{ toYaml .Values.rtorrent.resources | indent 12 }}
         - name: {{ .Chart.Name }}-flood
           image: "{{ .Values.flood.image.repository }}:{{ .Values.flood.image.tag }}"
           imagePullPolicy: {{ .Values.flood.image.pullPolicy }}
@@ -75,7 +80,7 @@ spec:
             initialDelaySeconds: 60
             failureThreshold: 5
             timeoutSeconds: 20
-          tty: true
+          # tty: true
           env:
             - name: TZ
               value: "{{ .Values.timezone }}"
@@ -92,7 +97,7 @@ spec:
             - mountPath: /tmp
               name: socket
           resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml .Values.flood.resources | indent 12 }}
       volumes:
       - name: config
       {{- if .Values.persistence.config.enabled }}
diff --git a/rtorrent-flood/values.yaml b/rtorrent-flood/values.yaml
index 403c0253..a3572ad5 100644
--- a/rtorrent-flood/values.yaml
+++ b/rtorrent-flood/values.yaml
@@ -19,13 +19,27 @@ rtorrent:
     repository: looselyrigorous/rtorrent
     tag: latest
     pullPolicy: Always
+  resources:
+    requests:
+      cpu: "50m"
+      memory: "50Mi"
+    limits:
+      cpu: "1000m"
+      memory: "1Gi"
 
 flood:
   enabled: true
   image:
-    repository: billimek/flood
+    repository: jfurrow/flood-ui
     tag: latest
     pullPolicy: Always
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "10m"
+    limits:
+      memory: "250Mi"
+      cpu: "50m"
 
 guiService:
   type: ClusterIP
@@ -118,18 +132,6 @@ persistence:
     accessMode: ReadWriteOnce
     size: 10Gi
 
-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
-
 nodeSelector: {}
 
 tolerations: []