From afce3aa8920c391f2538e91e4808679ea85fdfb4 Mon Sep 17 00:00:00 2001 From: jenkins-x-bot Date: Sun, 27 Sep 2020 14:50:37 +0800 Subject: [PATCH] Fixed volumes --- nzbget/values.yaml | 2 +- sonarr/Chart.yaml | 2 +- sonarr/templates/statefulset.yaml | 44 +++------------------------- sonarr/values.yaml | 3 +- sonarr/~? | Bin 3372 -> 0 bytes tautulli/Chart.yaml | 2 +- tautulli/templates/statefulset.yaml | 13 +++----- tautulli/values.yaml | 3 +- 8 files changed, 13 insertions(+), 56 deletions(-) delete mode 100644 sonarr/~? diff --git a/nzbget/values.yaml b/nzbget/values.yaml index 52df689..7ea95bf 100644 --- a/nzbget/values.yaml +++ b/nzbget/values.yaml @@ -71,4 +71,4 @@ config: storageClassName: nfs-client-hermes storageSize: 5Gi -mediaPvc: nzbget-media-pvc +mediaPvc: nzbget-hermes-media-pvc diff --git a/sonarr/Chart.yaml b/sonarr/Chart.yaml index 35bfe57..a4fd81c 100644 --- a/sonarr/Chart.yaml +++ b/sonarr/Chart.yaml @@ -14,7 +14,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.1.4 +version: 0.1.5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. diff --git a/sonarr/templates/statefulset.yaml b/sonarr/templates/statefulset.yaml index cf1f9ac..dd3248c 100644 --- a/sonarr/templates/statefulset.yaml +++ b/sonarr/templates/statefulset.yaml @@ -23,26 +23,6 @@ spec: securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - - name: sonarr-sidecar - image: harbor.ervine.dev/public/x86_64/alpine/sonarr-sidecar:v3.12.0 - securityContext: - privileged: true - lifecycle: - preStop: - exec: - command: - - umount - - /mnt/sonarr-local-config - volumeMounts: - - name: sonarr-config - mountPath: /app-remote-config - - name: sonarr-local-config - mountPath: /mnt/app-local-config - mountPropagation: Bidirectional - resources: - requests: - cpu: 20m - memory: 32Mi - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} @@ -63,18 +43,8 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - - name: sonarr-local-config + - name: sonarr-config mountPath: /config - mountPropagation: HostToContainer - - name: sonarr-config - mountPath: /config/Backups - subPath: Backups - - name: sonarr-config - mountPath: /config/MediaCover - subPath: MediaCover - - name: sonarr-config - mountPath: /config/logs - subPath: logs - name: sonarr-media mountPath: /tv subPath: tv @@ -87,6 +57,9 @@ spec: - name: sonarr-media persistentVolumeClaim: claimName: {{ .Values.mediaPvc }} + - name: sonarr-config + persistentVolumeClaim: + claimName: {{ .Values.config.configPvc }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -99,12 +72,3 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - volumeClaimTemplates: - - metadata: - name: sonarr-config - spec: - accessModes: ['ReadWriteOnce'] - storageClassName: {{ .Values.config.storageClassName | quote }} - resources: - requests: - storage: {{ .Values.config.storageSize }} diff --git a/sonarr/values.yaml b/sonarr/values.yaml index 57b250d..189b7ca 100644 --- a/sonarr/values.yaml +++ b/sonarr/values.yaml @@ -68,7 +68,6 @@ tolerations: [] affinity: {} config: - storageClassName: nfs-client-hermes - storageSize: 5Gi + configPvc: sonarr-hermes-config-pvc mediaPvc: sonarr-media-pvc diff --git a/sonarr/~? b/sonarr/~? deleted file mode 100644 index cd7a27d6392e63c7fe055c5765f3e4042a160bf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3372 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 CWXX^K diff --git a/tautulli/Chart.yaml b/tautulli/Chart.yaml index 0367a73..240ed93 100644 --- a/tautulli/Chart.yaml +++ b/tautulli/Chart.yaml @@ -14,7 +14,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.1.3 +version: 0.1.6 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. diff --git a/tautulli/templates/statefulset.yaml b/tautulli/templates/statefulset.yaml index 11fb294..4682d1e 100644 --- a/tautulli/templates/statefulset.yaml +++ b/tautulli/templates/statefulset.yaml @@ -45,6 +45,10 @@ spec: volumeMounts: - name: tautulli-config mountPath: /config + volumes: + - name: tautulli-config + persistentVolumeClaim: + claimName: {{ .Values.config.configPvc }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -57,12 +61,3 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - volumeClaimTemplates: - - metadata: - name: tautulli-config - spec: - accessModes: [ "ReadWriteOnce" ] - storageClassName: {{ .Values.config.storageClassName | quote }} - resources: - requests: - storage: {{ .Values.config.storageSize }} diff --git a/tautulli/values.yaml b/tautulli/values.yaml index 36d5c2a..5f92e8a 100644 --- a/tautulli/values.yaml +++ b/tautulli/values.yaml @@ -67,5 +67,4 @@ tolerations: [] affinity: {} config: - storageClassName: nfs-client-icarus - storageSize: 5Gi + configPvc: tautulli-icarus-config-pvc