diff --git a/kubernetes/apps/default/resilio-sync/claude/helmrelease.yaml b/kubernetes/apps/default/resilio-sync/claude/helmrelease.yaml index daea23411..dbb58cb98 100644 --- a/kubernetes/apps/default/resilio-sync/claude/helmrelease.yaml +++ b/kubernetes/apps/default/resilio-sync/claude/helmrelease.yaml @@ -10,7 +10,7 @@ spec: chart: spec: chart: app-template - version: 1.5.1 + version: 2.0.3 sourceRef: kind: HelmRepository name: bjw-s @@ -27,15 +27,36 @@ spec: uninstall: keepHistory: false values: - controller: - annotations: - reloader.stakater.com/auto: "true" - image: - repository: ghcr.io/auricom/resilio-sync - tag: 2.7.3.1381-1@sha256:82c861bccac8f159e5b92723dda922d4aec71a461c233760a63bfc51d7a1bb1a - env: - - name: TZ - value: "${TIMEZONE}" + defaultPodOptions: + securityContext: + runAsUser: 0 + controllers: + main: + type: statefulset + annotations: + reloader.stakater.com/auto: "true" + containers: + main: + image: + repository: ghcr.io/auricom/resilio-sync + tag: 2.7.3.1381-1@sha256:82c861bccac8f159e5b92723dda922d4aec71a461c233760a63bfc51d7a1bb1a + env: + - name: TZ + value: "${TIMEZONE}" + resources: + requests: + cpu: 250m + memory: 512Mi + limits: + memory: 2Gi + statefulset: + volumeClaimTemplates: + - name: config + accessMode: ReadWriteOnce + size: 1Gi + storageClass: rook-ceph-block + globalMounts: + - path: /config service: main: ports: @@ -46,69 +67,60 @@ spec: ingress: main: enabled: true - ingressClassName: "nginx" + className: "nginx" annotations: hajimari.io/icon: mdi:file-arrow-up-down hosts: - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}" paths: - path: / - pathType: Prefix + service: + name: main + port: http tls: - hosts: - *host persistence: - config: - enabled: true - existingClaim: resilio-claude-config sync-conf: - enabled: true type: configMap - configMap: name: resilio-claude-configmap - mountPath: /config/sync.conf - subPath: sync.conf + globalMounts: + - path: /config/sync.conf + subPath: sync.conf backups: - enabled: true type: nfs server: "${LOCAL_LAN_TRUENAS}" path: /mnt/storage/backups - mountPath: /sync/backup + globalMounts: + - path: /sync/backup home-claude: - enabled: true type: nfs server: "${LOCAL_LAN_TRUENAS}" path: /mnt/storage/home/claude - mountPath: /sync/home/claude + globalMounts: + - path: /sync/home/claude music-transcoded: - enabled: true type: nfs server: "${LOCAL_LAN_TRUENAS}" path: /mnt/storage/music_transcoded - mountPath: /sync/music_transcoded + globalMounts: + - path: /sync/music_transcoded photo: - enabled: true type: nfs server: "${LOCAL_LAN_TRUENAS}" path: /mnt/storage/photo - mountPath: /sync/photo + globalMounts: + - path: /sync/photo shared-documents: - enabled: true type: nfs server: "${LOCAL_LAN_TRUENAS}" path: /mnt/storage/shared-documents - mountPath: /sync/shared-documents + globalMounts: + - path: /sync/shared-documents video: - enabled: true type: nfs server: "${LOCAL_LAN_TRUENAS}" path: /mnt/storage/video - mountPath: /sync/video - podSecurityContext: - runAsUser: 0 - resources: - requests: - cpu: 250m - memory: 512Mi - limits: - memory: 2Gi + globalMounts: + - path: /sync/video + diff --git a/kubernetes/apps/default/resilio-sync/claude/kustomization.yaml b/kubernetes/apps/default/resilio-sync/claude/kustomization.yaml index d5b28352e..800c99580 100644 --- a/kubernetes/apps/default/resilio-sync/claude/kustomization.yaml +++ b/kubernetes/apps/default/resilio-sync/claude/kustomization.yaml @@ -7,7 +7,6 @@ resources: - ./gatus.yaml - ./helmrelease.yaml - ./volsync.yaml - - ./volume.yaml configMapGenerator: - name: resilio-claude-configmap files: diff --git a/kubernetes/apps/default/resilio-sync/claude/volsync.yaml b/kubernetes/apps/default/resilio-sync/claude/volsync.yaml index 23e52366f..768f7fc1f 100644 --- a/kubernetes/apps/default/resilio-sync/claude/volsync.yaml +++ b/kubernetes/apps/default/resilio-sync/claude/volsync.yaml @@ -30,7 +30,7 @@ metadata: name: resilio-claude namespace: default spec: - sourcePVC: resilio-claude-config + sourcePVC: config-resilio-claude-0 trigger: schedule: "0 7 * * *" restic: diff --git a/kubernetes/apps/default/resilio-sync/claude/volume.yaml b/kubernetes/apps/default/resilio-sync/claude/volume.yaml deleted file mode 100644 index 2c0ebe1fb..000000000 --- a/kubernetes/apps/default/resilio-sync/claude/volume.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: resilio-claude-config - namespace: default - labels: - app.kubernetes.io/name: &name resilio-claude - app.kubernetes.io/instance: *name - snapshot.home.arpa/enabled: "true" -spec: - accessModes: - - ReadWriteOnce - storageClassName: rook-ceph-block - resources: - requests: - storage: 1Gi diff --git a/kubernetes/apps/default/resilio-sync/helene/helmrelease.yaml b/kubernetes/apps/default/resilio-sync/helene/helmrelease.yaml index af212d3ce..d4dd82db7 100644 --- a/kubernetes/apps/default/resilio-sync/helene/helmrelease.yaml +++ b/kubernetes/apps/default/resilio-sync/helene/helmrelease.yaml @@ -10,7 +10,7 @@ spec: chart: spec: chart: app-template - version: 1.5.1 + version: 2.0.3 sourceRef: kind: HelmRepository name: bjw-s @@ -27,15 +27,36 @@ spec: uninstall: keepHistory: false values: - controller: - annotations: - reloader.stakater.com/auto: "true" - image: - repository: ghcr.io/auricom/resilio-sync - tag: 2.7.3.1381-1@sha256:82c861bccac8f159e5b92723dda922d4aec71a461c233760a63bfc51d7a1bb1a - env: - - name: TZ - value: "${TIMEZONE}" + defaultPodOptions: + securityContext: + runAsUser: 0 + controllers: + main: + type: statefulset + annotations: + reloader.stakater.com/auto: "true" + containers: + main: + image: + repository: ghcr.io/auricom/resilio-sync + tag: 2.7.3.1381-1@sha256:82c861bccac8f159e5b92723dda922d4aec71a461c233760a63bfc51d7a1bb1a + env: + - name: TZ + value: "${TIMEZONE}" + resources: + requests: + cpu: 250m + memory: 512Mi + limits: + memory: 2Gi + statefulset: + volumeClaimTemplates: + - name: config + accessMode: ReadWriteOnce + size: 1Gi + storageClass: rook-ceph-block + globalMounts: + - path: /config service: main: ports: @@ -46,45 +67,36 @@ spec: ingress: main: enabled: true - ingressClassName: "nginx" + className: "nginx" annotations: hajimari.io/icon: mdi:file-arrow-up-down hosts: - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}" paths: - path: / - pathType: Prefix + service: + name: main + port: http tls: - hosts: - *host persistence: - config: - enabled: true - existingClaim: resilio-helene-config sync-conf: - enabled: true type: configMap configMap: name: resilio-helene-configmap - mountPath: /config/sync.conf - subPath: sync.conf + globalMounts: + - path: /config/sync.conf + subPath: sync.conf backups: - enabled: true type: nfs server: "${LOCAL_LAN_TRUENAS}" path: /mnt/storage/backups - mountPath: /sync/backup + globalMounts: + - path: /sync/backup home-helene: - enabled: true type: nfs server: "${LOCAL_LAN_TRUENAS}" path: /mnt/storage/home/helene - mountPath: /sync/home - podSecurityContext: - runAsUser: 0 - resources: - requests: - cpu: 250m - memory: 512Mi - limits: - memory: 2Gi + globalMounts: + - path: /sync/home diff --git a/kubernetes/apps/default/resilio-sync/helene/kustomization.yaml b/kubernetes/apps/default/resilio-sync/helene/kustomization.yaml index c5b800a34..0b6048f6c 100644 --- a/kubernetes/apps/default/resilio-sync/helene/kustomization.yaml +++ b/kubernetes/apps/default/resilio-sync/helene/kustomization.yaml @@ -7,7 +7,6 @@ resources: - ./gatus.yaml - ./helmrelease.yaml - ./volsync.yaml - - ./volume.yaml configMapGenerator: - name: resilio-helene-configmap files: diff --git a/kubernetes/apps/default/resilio-sync/helene/volsync.yaml b/kubernetes/apps/default/resilio-sync/helene/volsync.yaml index 114197e46..e537d2088 100644 --- a/kubernetes/apps/default/resilio-sync/helene/volsync.yaml +++ b/kubernetes/apps/default/resilio-sync/helene/volsync.yaml @@ -30,7 +30,7 @@ metadata: name: resilio-helene namespace: default spec: - sourcePVC: resilio-helene-config + sourcePVC: config-resilio-helene-0 trigger: schedule: "0 7 * * *" restic: diff --git a/kubernetes/apps/default/resilio-sync/helene/volume.yaml b/kubernetes/apps/default/resilio-sync/helene/volume.yaml deleted file mode 100644 index bd04a3b15..000000000 --- a/kubernetes/apps/default/resilio-sync/helene/volume.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: resilio-helene-config - namespace: default - labels: - app.kubernetes.io/name: &name resilio-helene - app.kubernetes.io/instance: *name - snapshot.home.arpa/enabled: "true" -spec: - accessModes: - - ReadWriteOnce - storageClassName: rook-ceph-block - resources: - requests: - storage: 1Gi