diff --git a/kubernetes/apps/default/freshrss/app/helmrelease.yaml b/kubernetes/apps/default/freshrss/app/helmrelease.yaml index 06b79039e..4c3c5be33 100644 --- a/kubernetes/apps/default/freshrss/app/helmrelease.yaml +++ b/kubernetes/apps/default/freshrss/app/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,48 +27,59 @@ spec: uninstall: keepHistory: false values: - controller: - annotations: - reloader.stakater.com/auto: "true" - initContainers: - 01-init-db: - image: ghcr.io/auricom/postgres-init:15.4 - imagePullPolicy: IfNotPresent - envFrom: - - secretRef: - name: freshrss-secret - image: - repository: freshrss/freshrss - tag: 1.22.1 + controllers: + main: + type: statefulset + annotations: + reloader.stakater.com/auto: "true" + initContainers: + init-db: + image: + repository: ghcr.io/auricom/postgres-init + tag: 15.4@sha256:83e1abf06be5741bdfb8cb53fc03a1ade6e6b5ec7b92a8aac0c69ba5dc7e51f0 + pullPolicy: IfNotPresent + envFrom: &envFrom + - secretRef: + name: freshrss-secret + containers: + main: + image: + repository: freshrss/freshrss + tag: 1.22.1 + env: + TZ: ${TIMEZONE} + CRON_MIN: "18,48" + DOMAIN: "https://freshrss.${SECRET_CLUSTER_DOMAIN}/" + resources: + requests: + cpu: 50m + memory: 256Mi + statefulset: + volumeClaimTemplates: + - name: config + accessMode: ReadWriteOnce + size: 1Gi + storageClass: rook-ceph-block + globalMounts: + - path: /var/www/FreshRSS/data service: main: ports: http: port: 80 - env: - TZ: ${TIMEZONE} - CRON_MIN: "18,48" - DOMAIN: "https://freshrss.${SECRET_CLUSTER_DOMAIN}/" - persistence: - config: - enabled: true - existingClaim: freshrss-config - mountPath: /var/www/FreshRSS/data ingress: main: enabled: true - ingressClassName: "nginx" + className: "nginx" annotations: hajimari.io/icon: mdi:rss hosts: - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}" paths: - path: / - pathType: Prefix + service: + name: main + port: http tls: - hosts: - *host - resources: - requests: - cpu: 50m - memory: 256Mi diff --git a/kubernetes/apps/default/freshrss/app/kustomization.yaml b/kubernetes/apps/default/freshrss/app/kustomization.yaml index 1ac8f8607..c254171ab 100644 --- a/kubernetes/apps/default/freshrss/app/kustomization.yaml +++ b/kubernetes/apps/default/freshrss/app/kustomization.yaml @@ -8,4 +8,3 @@ resources: - ./gatus.yaml - ./helmrelease.yaml - ./volsync.yaml - - ./volume.yaml diff --git a/kubernetes/apps/default/freshrss/app/volsync.yaml b/kubernetes/apps/default/freshrss/app/volsync.yaml index b2e022a39..9340c2fec 100644 --- a/kubernetes/apps/default/freshrss/app/volsync.yaml +++ b/kubernetes/apps/default/freshrss/app/volsync.yaml @@ -30,7 +30,7 @@ metadata: name: freshrss namespace: default spec: - sourcePVC: freshrss-config + sourcePVC: config-freshrss-0 trigger: schedule: "0 7 * * *" restic: diff --git a/kubernetes/apps/default/freshrss/app/volume.yaml b/kubernetes/apps/default/freshrss/app/volume.yaml deleted file mode 100644 index 7c3585374..000000000 --- a/kubernetes/apps/default/freshrss/app/volume.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: freshrss-config - namespace: default - labels: - app.kubernetes.io/name: &name freshrss - app.kubernetes.io/instance: *name - snapshot.home.arpa/enabled: "true" -spec: - accessModes: - - ReadWriteOnce - storageClassName: rook-ceph-block - resources: - requests: - storage: 1Gi