Switched to use existing PVC for emby config

This commit is contained in:
jenkins-x-bot 2020-09-25 11:25:35 +08:00
parent b0f63cc06f
commit b35a47aec2
6 changed files with 12 additions and 58 deletions

View File

@ -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.5
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.

View File

@ -76,6 +76,9 @@ spec:
- name: emby-media-pv
persistentVolumeClaim:
claimName: {{ .Values.mediaPvc }}
- name: emby-config
persistentVolumeClaim:
claimName: {{ .Values.config.configPvc }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
@ -88,12 +91,3 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
volumeClaimTemplates:
- metadata:
name: emby-config
spec:
accessModes: [ "ReadWriteOnce" ]
storageClassName: {{ .Values.config.storageClassName | quote }}
resources:
requests:
storage: {{ .Values.config.storageSize }}

View File

@ -67,8 +67,7 @@ tolerations: []
affinity: {}
config:
storageClassName: nfs-client-icarus
storageSize: 10Gi
configPvc: emby-icarus-config-pv
configmap:
uid: "1003"

View File

@ -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.2
version: 0.1.3
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.

View File

@ -23,31 +23,12 @@ spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
containers:
- name: {{ .Chart.Name }}-sidecar
image: harbor.ervine.dev/public/x86_64/alpine/sonarr-sidecar:v3.12.0
securityContext:
privileged: true
lifecycle:
preStop:
exec:
command:
- umount
- /mnt/app-local-config
volumeMounts:
- name: radarr-config
mountPath: /app-remote-config
- name: radarr-local-config
mountPath: /mnt/app-local-config
mountPropagation: Bidirectional
resources:
requests:
cpu: 20m
memory: 32Mi
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command:
ports:
- name: radarr
containerPort: 7878
@ -61,24 +42,15 @@ spec:
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
- name: radarr-local-config
- name: radarr-config
mountPath: /config
mountPropagation: HostToContainer
- name: radarr-config
mountPath: /config/Backups
subPath: Backups
- name: radarr-config
mountPath: /config/MediaCover
subPath: MediaCover
- name: radarr-config
mountPath: /config/logs
subPath: logs
- name: radarr-media
mountPath: /movies
subPath: movies
volumes:
- emptyDir: {}
name: radarr-local-config
- name: radarr-config
persistentVolumeClaim:
claimName: {{ .Values.config.configPvc }}
- name: radarr-media
persistentVolumeClaim:
claimName: {{ .Values.mediaPvc }}
@ -94,13 +66,3 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
volumeClaimTemplates:
- metadata:
name: {{ .Chart.Name }}-config
spec:
accessModes: ['ReadWriteOnce']
storageClassName: {{ .Values.config.storageClassName | quote }}
resources:
requests:
storage: {{ .Values.config.storageSize }}

View File

@ -67,7 +67,6 @@ tolerations: []
affinity: {}
config:
storageClassName: nfs-client-hermes
storageSize: 5Gi
configPvc: radarr-hermes-config-pvc
mediaPvc: radarr-media-pvc