Merge branch 'dev'

Signed-off-by: David Young <davidy@funkypenguin.co.nz>
elfhosted · Sep 16, 2024 · 8674ce1 · 8674ce1
2 parents 8a09e9b + 3f2b6b0
commit 8674ce1
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 10 deletions.
diff --git 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-07
+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

diff --git 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"

diff --git 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
 
diff --git a/...ates/pvcs-ssd/pvc-config-petio-block.yaml → ...plates/pvcs-ssd/pvc-config-petio-ssd.yaml b/...ates/pvcs-ssd/pvc-config-petio-block.yaml → ...plates/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 }}
diff --git a/...myprecious/templates/replicationdestinations/replicationdestination-config-petio-ssd.yaml b/...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 }}
diff --git a/charts/myprecious/templates/replicationsources/replicationsource-config-petio-ssd.yaml 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 }}
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
@@ -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 }}
diff --git 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
@@ -7788,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"
@@ -7886,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"
@@ -11108,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"