From ea3119de945e2612c5381158f99b98c6d204bacb Mon Sep 17 00:00:00 2001 From: David Young Date: Mon, 16 Sep 2024 15:01:54 +1200 Subject: [PATCH 1/5] Add petio Signed-off-by: David Young --- charts/myprecious/Chart.yaml | 2 +- ...o-block.yaml => pvc-config-petio-ssd.yaml} | 10 +++--- ...plicationdestination-config-petio-ssd.yaml | 35 +++++++++++++++++++ .../replicationsource-config-petio-ssd.yaml | 23 ++++++++++++ .../secret-volsync-config-petio-ssd.yaml | 14 ++++++++ charts/myprecious/values.yaml | 15 +++++++- 6 files changed, 92 insertions(+), 7 deletions(-) rename charts/myprecious/templates/pvcs-ssd/{pvc-config-petio-block.yaml => pvc-config-petio-ssd.yaml} (68%) create mode 100644 charts/myprecious/templates/replicationdestinations/replicationdestination-config-petio-ssd.yaml create mode 100644 charts/myprecious/templates/replicationsources/replicationsource-config-petio-ssd.yaml create mode 100644 charts/myprecious/templates/secrets/volsync/secret-volsync-config-petio-ssd.yaml diff --git a/charts/myprecious/Chart.yaml b/charts/myprecious/Chart.yaml index 66fb5b3dd..c24538018 100644 --- a/charts/myprecious/Chart.yaml +++ b/charts/myprecious/Chart.yaml @@ -15,7 +15,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. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.118.5-pre-05 +version: 1.118.5-pre-08 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/myprecious/templates/pvcs-ssd/pvc-config-petio-block.yaml b/charts/myprecious/templates/pvcs-ssd/pvc-config-petio-ssd.yaml similarity index 68% rename from charts/myprecious/templates/pvcs-ssd/pvc-config-petio-block.yaml rename to charts/myprecious/templates/pvcs-ssd/pvc-config-petio-ssd.yaml index 13b0bbec4..0dd49d9c8 100644 --- a/charts/myprecious/templates/pvcs-ssd/pvc-config-petio-block.yaml +++ b/charts/myprecious/templates/pvcs-ssd/pvc-config-petio-ssd.yaml @@ -2,21 +2,21 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: config-petio-block + name: config-petio-ssd annotations: helm.sh/resource-policy: keep spec: -{{- $pvc := (lookup "v1" "PersistentVolumeClaim" .Release.Namespace "config-petio-block" ) }} +{{- $pvc := (lookup "v1" "PersistentVolumeClaim" .Release.Namespace "config-petio-ssd" ) }} {{- if and (not $pvc) (.Values.location.enabled) }} dataSourceRef: kind: ReplicationDestination apiGroup: volsync.backube - name: rd-config-petio-block + name: rd-config-petio-ssd {{- end }} accessModes: - - {{ .Values.storageclass.rwo.accessMode }} + - {{ .Values.storageclass.rwx.accessMode }} resources: requests: storage: 1Gi - storageClassName: {{ .Values.storageclass.rwo.name }} + storageClassName: {{ .Values.storageclass.rwx.name }} {{ end }} \ No newline at end of file diff --git a/charts/myprecious/templates/replicationdestinations/replicationdestination-config-petio-ssd.yaml b/charts/myprecious/templates/replicationdestinations/replicationdestination-config-petio-ssd.yaml new file mode 100644 index 000000000..f0c7279a9 --- /dev/null +++ b/charts/myprecious/templates/replicationdestinations/replicationdestination-config-petio-ssd.yaml @@ -0,0 +1,35 @@ +{{ if or .Values.petio.enabled .Values.petiogluetun.enabled .Values.petioplus.enabled .Values.petiohobbit.enabled }} +{{- if .Values.volsync.enabled }} +{{- if .Values.location.enabled }} +apiVersion: volsync.backube/v1alpha1 +kind: ReplicationDestination +metadata: + name: rd-config-petio-ssd +spec: + trigger: + manual: runonce + restic: + repository: config-petio-ssd-volsync-restic-config + copyMethod: Snapshot + moverAffinity: + podAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app.elfhosted.com/name + operator: In + values: + - nodefinder + topologyKey: "kubernetes.io/hostname" + cacheCapacity: 1Gi + capacity: 1Gi + cacheStorageClassName: topolvm-provisioner-thin + accessModes: + - {{ .Values.storageclass.rwx.accessMode }} + storageClassName: {{ .Values.storageclass.rwx.name }} + cacheAccessModes: + - ReadWriteOnce + volumeSnapshotClassName: {{ .Values.storageclass.rwx.volumeSnapshotClassName }} +{{- end }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/myprecious/templates/replicationsources/replicationsource-config-petio-ssd.yaml b/charts/myprecious/templates/replicationsources/replicationsource-config-petio-ssd.yaml new file mode 100644 index 000000000..a7af94cee --- /dev/null +++ b/charts/myprecious/templates/replicationsources/replicationsource-config-petio-ssd.yaml @@ -0,0 +1,23 @@ +{{ if or .Values.petio.enabled .Values.petioplus.enabled .Values.petiohobbit.enabled }} +{{ if .Values.volsync.enabled }} +apiVersion: volsync.backube/v1alpha1 +kind: ReplicationSource +metadata: + name: rs-config-petio-ssd +spec: + sourcePVC: config-petio-ssd + trigger: + schedule: "0 {{ mod .Values.userId 24 }} * * *" + restic: + pruneIntervalDays: 7 + repository: config-petio-ssd-volsync-restic-config + retain: + daily: 2 + copyMethod: Snapshot + cacheCapacity: 1Gi + cacheStorageClassName: topolvm-provisioner-thin + cacheAccessModes: + - ReadWriteOnce + volumeSnapshotClassName: {{ .Values.storageclass.rwx.volumeSnapshotClassName }} +{{ end }} +{{ end }} \ No newline at end of file diff --git a/charts/myprecious/templates/secrets/volsync/secret-volsync-config-petio-ssd.yaml b/charts/myprecious/templates/secrets/volsync/secret-volsync-config-petio-ssd.yaml new file mode 100644 index 000000000..dc6b88313 --- /dev/null +++ b/charts/myprecious/templates/secrets/volsync/secret-volsync-config-petio-ssd.yaml @@ -0,0 +1,14 @@ +{{ if or .Values.petio.enabled .Values.petioplus.enabled .Values.petiohobbit.enabled }} +{{ if .Values.volsync.enabled }} +apiVersion: v1 +kind: Secret +metadata: + name: config-petio-ssd-volsync-restic-config +type: Opaque +stringData: + RESTIC_REPOSITORY: s3:{{ .Values.volsync.restic_repository }}/volsync/{{ .Release.Namespace }}/config-petio-ssd + RESTIC_PASSWORD: {{ .Values.volsync.restic_password }} + AWS_ACCESS_KEY_ID: {{ .Values.volsync.aws_access_key_id }} + AWS_SECRET_ACCESS_KEY: {{ .Values.volsync.aws_secret_access_key }} +{{ end }} +{{ end }} \ No newline at end of file diff --git a/charts/myprecious/values.yaml b/charts/myprecious/values.yaml index 60e3ef7c3..8765a29f9 100644 --- a/charts/myprecious/values.yaml +++ b/charts/myprecious/values.yaml @@ -907,7 +907,13 @@ configmounts: &config_mounts volumeSpec: persistentVolumeClaim: claimName: config-overseerr-ssd - + petio: + enabled: false + type: custom + mountPath: /config/petio/ + volumeSpec: + persistentVolumeClaim: + claimName: config-petio-ssd privatebin: enabled: false type: custom @@ -1506,6 +1512,13 @@ storageconfigmounts: &storageconfigmounts volumeSpec: persistentVolumeClaim: claimName: config-overseerr-ssd + petio: + enabled: false + mountPath: /storage/config/petio + type: "custom" + volumeSpec: + persistentVolumeClaim: + claimName: config-petio-ssd plexdebrid: enabled: false type: custom From a55c8da7d6ee138150a1e094706ec5db9d3e0a3d Mon Sep 17 00:00:00 2001 From: David Young Date: Mon, 16 Sep 2024 15:03:08 +1200 Subject: [PATCH 2/5] fix tunarr icon Signed-off-by: David Young --- .../myprecious/templates/configmaps/configmap-homer-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/myprecious/templates/configmaps/configmap-homer-config.yaml b/charts/myprecious/templates/configmaps/configmap-homer-config.yaml index 681665053..ae8b904b7 100644 --- a/charts/myprecious/templates/configmaps/configmap-homer-config.yaml +++ b/charts/myprecious/templates/configmaps/configmap-homer-config.yaml @@ -789,7 +789,7 @@ data: {{ if .Values.tunarr.enabled }} - name: "tunarr" - icon: "fab fa-tv" + icon: "fas fa-tv" subtitle: "Live TV Proxy for Plex/Emby" {{ if .Values.tunarrexposed.enabled }} tag: "public" From 2106bf611265a787a64f0516872ff16096df01ed Mon Sep 17 00:00:00 2001 From: David Young Date: Mon, 16 Sep 2024 15:17:04 +1200 Subject: [PATCH 3/5] fix missing app labels for overseerr, jellyseerr, pairdrop Signed-off-by: David Young --- charts/myprecious/values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/charts/myprecious/values.yaml b/charts/myprecious/values.yaml index 8765a29f9..86f01dd7f 100644 --- a/charts/myprecious/values.yaml +++ b/charts/myprecious/values.yaml @@ -7801,6 +7801,8 @@ overseerr: seccompProfile: type: RuntimeDefault readOnlyRootFilesystem: true + podLabels: + app.elfhosted.com/name: overseerr controller: annotations: configmap.reloader.stakater.com/reload: "elfbot-all,storage-changed,elfbot-overseerr" @@ -7899,6 +7901,8 @@ jellyseerr: seccompProfile: type: RuntimeDefault readOnlyRootFilesystem: true + podLabels: + app.elfhosted.com/name: jellyseerr controller: annotations: configmap.reloader.stakater.com/reload: "elfbot-all,storage-changed,elfbot-jellyseerr" @@ -11121,6 +11125,8 @@ pairdrop: repository: ghcr.io/elfhosted/pairdrop tag: v1.10.10@sha256:c0188414adebb07c69a170c81256825f7ea83784f2f7ff491679fa0165b4425f priorityClassName: tenant-normal + podLabels: + app.elfhosted.com/name: pairdrop controller: annotations: configmap.reloader.stakater.com/reload: "elfbot-all,elfbot-pairdrop" From edaac7cf053ec9aa4bf8cc5b8840887d71d9ed0d Mon Sep 17 00:00:00 2001 From: David Young Date: Mon, 16 Sep 2024 15:41:18 +1200 Subject: [PATCH 4/5] fix node-deleter Signed-off-by: David Young --- charts/myprecious/templates/job-nodefinder-deleter.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/myprecious/templates/job-nodefinder-deleter.yaml b/charts/myprecious/templates/job-nodefinder-deleter.yaml index 193210079..2cc7da45a 100644 --- a/charts/myprecious/templates/job-nodefinder-deleter.yaml +++ b/charts/myprecious/templates/job-nodefinder-deleter.yaml @@ -2,7 +2,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ .Release.Name }}-nodefinder-deleter-v2 + name: {{ .Release.Name }}-nodefinder-deleter-v3 labels: app.elfhosted.com/name: nodefinder-deleter spec: @@ -25,5 +25,5 @@ spec: then sleep 4m kubectl delete deployment {{ .Release.Name }}-nodefinder || echo "nodefinder not running" - done + fi From 3f2b6b0e0e1130f29a7fbcf313cecb8db2f825b3 Mon Sep 17 00:00:00 2001 From: David Young Date: Mon, 16 Sep 2024 15:41:34 +1200 Subject: [PATCH 5/5] update Signed-off-by: David Young --- charts/myprecious/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/myprecious/Chart.yaml b/charts/myprecious/Chart.yaml index c24538018..52964ce92 100644 --- a/charts/myprecious/Chart.yaml +++ b/charts/myprecious/Chart.yaml @@ -15,7 +15,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. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.118.5-pre-08 +version: 1.118.5-pre-09 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to