add freshrss to community train (#1663)

* add `freshrss` to `community` train

* add initial templates

* fix pat

* whops

* run as 33

* requires root

* more caps

* dont wait for pvc to bind for future jobs

* do the installation

* create user

* add cron

* add questions

* remove group

* fix password field

* add smb

* add size var

library/ix-dev/community/freshrss/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: file://../../../common
+  version: 1.1.1
+digest: sha256:a7dbe3e4d42dbcd4325776e5e01a1d630c7f185f79e7ebf22b1b9cc80f56eed7
+generated: "2023-10-24T17:20:50.519641854+03:00"

library/ix-dev/community/freshrss/Chart.yaml

@@ -0,0 +1,26 @@
+name: freshrss
+description: FreshRSS is a free, self-hostable news aggregator
+annotations:
+  title: FreshRSS
+type: application
+version: 1.0.0
+apiVersion: v2
+appVersion: 1.22.0
+kubeVersion: '>=1.16.0-0'
+maintainers:
+  - name: truenas
+    url: https://www.truenas.com/
+    email: dev@ixsystems.com
+dependencies:
+  - name: common
+    repository: file://../../../common
+    version: 1.1.1
+home: https://freshrss.org/
+icon: https://media.sys.truenas.net/apps/freshrss/icons/icon.png
+sources:
+  - https://github.com/FreshRSS/FreshRSS
+  - https://github.com/truenas/charts/tree/master/library/ix-dev/community/freshrss
+  - https://hub.docker.com/r/freshrss/freshrss
+keywords:
+  - rss
+  - news

library/ix-dev/community/freshrss/README.md

@@ -0,0 +1,3 @@
+# FreshRSS
+
+[FreshRSS](https://freshrss.org/) is a free, self-hostable news aggregator

library/ix-dev/community/freshrss/app-readme.md

@@ -0,0 +1,3 @@
+# FreshRSS
+
+[FreshRSS](https://freshrss.org/) is a free, self-hostable news aggregator

library/ix-dev/community/freshrss/ci/basic-values.yaml

@@ -0,0 +1,16 @@
+freshrssConfig:
+  defaultAdmin: admin
+  defaultAdminPass: admin
+
+freshrssNetwork:
+  webPort: 32000
+
+freshrssStorage:
+  data:
+    type: pvc
+  extensions:
+    type: pvc
+  pgData:
+    type: pvc
+  pgBackup:
+    type: emptyDir

library/ix-dev/community/freshrss/ci/extra-values.yaml

@@ -0,0 +1,28 @@
+freshrssConfig:
+  defaultAdmin: admin
+  defaultAdminPass: admin
+  enableCron: true
+  cronSchedule: "*/5 * * * *"
+  additionalEnvs:
+    - name: freshrss__API_KEY
+      value: some-long-api-key
+    - name: freshrss__LOG_LEVEL
+      value: error
+
+freshrssNetwork:
+  webPort: 32000
+
+freshrssStorage:
+  data:
+    type: pvc
+  extensions:
+    type: pvc
+  pgData:
+    type: pvc
+  pgBackup:
+    type: emptyDir
+  additionalStorages:
+  - type: pvc
+    mountPath: /data1
+  - type: pvc
+    mountPath: /data2

library/ix-dev/community/freshrss/ci/hostNet-values.yaml

@@ -0,0 +1,17 @@
+freshrssConfig:
+  defaultAdmin: admin
+  defaultAdminPass: admin
+
+freshrssNetwork:
+  webPort: 30000
+  hostNetwork: true
+
+freshrssStorage:
+  data:
+    type: pvc
+  extensions:
+    type: pvc
+  pgData:
+    type: pvc
+  pgBackup:
+    type: emptyDir

library/ix-dev/community/freshrss/item.yaml

@@ -0,0 +1,8 @@
+icon_url: https://media.sys.truenas.net/apps/freshrss/icons/icon.png
+categories:
+  - productivity
+screenshots:
+  - https://media.sys.truenas.net/apps/freshrss/screenshots/screenshot1.webp
+tags:
+  - rss
+  - news

library/ix-dev/community/freshrss/metadata.yaml

@@ -0,0 +1,14 @@
+runAsContext:
+  - userName: root
+    groupName: root
+    gid: 0
+    uid: 0
+    description: FreshRSS runs as root user
+capabilities:
+  - name: CHOWN
+    description: FreshRSS is able to chown files.
+  - name: SETGID
+    description: FreshRSS is able to set group ID for it's sub-processes.
+  - name: SETUID
+    description: FreshRSS is able to set user ID for it's sub-processes.
+hostMounts: []

library/ix-dev/community/freshrss/questions.yaml

@@ -0,0 +1,417 @@
+groups:
+  - name: FreshRSS Configuration
+    description: Configure FreshRSS
+  - name: Network Configuration
+    description: Configure Network for FreshRSS
+  - name: Storage Configuration
+    description: Configure Storage for FreshRSS
+  - name: Resources Configuration
+    description: Configure Resources for FreshRSS
+
+portals:
+  web_portal:
+    protocols:
+      - "$kubernetes-resource_configmap_portal_protocol"
+    host:
+      - "$kubernetes-resource_configmap_portal_host"
+    ports:
+      - "$kubernetes-resource_configmap_portal_port"
+    path: "$kubernetes-resource_configmap_portal_path"
+
+questions:
+  - variable: TZ
+    group: FreshRSS Configuration
+    label: Timezone
+    schema:
+      type: string
+      default: Etc/UTC
+      required: true
+      $ref:
+        - definitions/timezone
+
+  - variable: freshrssConfig
+    label: ""
+    group: FreshRSS Configuration
+    schema:
+      type: dict
+      attrs:
+        - variable: defaultAdmin
+          label: Default Admin Username
+          description: The default admin username for FreshRSS.
+          schema:
+            type: string
+            default: ""
+            required: true
+            immutable: true
+        - variable: defaultAdminPass
+          label: Default Admin Password
+          description: The default admin password for FreshRSS.
+          schema:
+            type: string
+            default: ""
+            required: true
+            immutable: true
+            private: true
+        - variable: enableCron
+          label: Enable Cron
+          description: Enable cron for FreshRSS.
+          schema:
+            type: boolean
+            default: false
+        - variable: cronSchedule
+          label: Cron Schedule
+          description: |
+            The cron schedule for FreshRSS.</br>
+            Default: */20 * * * * (every 20 minutes)
+          schema:
+            type: string
+            default: "*/20 * * * *"
+            show_if: [["enableCron", "=", true]]
+            required: true
+        - variable: additionalEnvs
+          label: Additional Environment Variables
+          description: Configure additional environment variables for FreshRSS.
+          schema:
+            type: list
+            default: []
+            items:
+              - variable: env
+                label: Environment Variable
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: name
+                      label: Name
+                      schema:
+                        type: string
+                        required: true
+                    - variable: value
+                      label: Value
+                      schema:
+                        type: string
+                        required: true
+
+  - variable: freshrssNetwork
+    label: ""
+    group: Network Configuration
+    schema:
+      type: dict
+      attrs:
+        - variable: webPort
+          label: Web Port
+          description: The port for the FreshRSS Web UI.
+          schema:
+            type: int
+            default: 31000
+            min: 9000
+            max: 65535
+            required: true
+        - variable: hostNetwork
+          label: Host Network
+          description: |
+            Bind to the host network. It's recommended to keep this disabled.</br>
+          schema:
+            type: boolean
+            default: false
+
+  - variable: freshrssStorage
+    label: ""
+    group: Storage Configuration
+    schema:
+      type: dict
+      attrs:
+        - variable: data
+          label: FreshRSS Data Storage
+          description: The path to store FreshRSS Data.
+          schema:
+            type: dict
+            attrs:
+              - variable: type
+                label: Type
+                description: |
+                  ixVolume: Is dataset created automatically by the system.</br>
+                  Host Path: Is a path that already exists on the system.
+                schema:
+                  type: string
+                  required: true
+                  immutable: true
+                  default: "ixVolume"
+                  enum:
+                    - value: "hostPath"
+                      description: Host Path (Path that already exists on the system)
+                    - value: "ixVolume"
+                      description: ixVolume (Dataset created automatically by the system)
+              - variable: datasetName
+                label: Dataset Name
+                schema:
+                  type: string
+                  show_if: [["type", "=", "ixVolume"]]
+                  required: true
+                  hidden: true
+                  immutable: true
+                  default: "data"
+                  $ref:
+                    - "normalize/ixVolume"
+              - variable: hostPath
+                label: Host Path
+                schema:
+                  type: hostpath
+                  show_if: [["type", "=", "hostPath"]]
+                  immutable: true
+                  required: true
+        - variable: extensions
+          label: FreshRSS Extensions Storage
+          description: The path to store FreshRSS Extensions.
+          schema:
+            type: dict
+            attrs:
+              - variable: type
+                label: Type
+                description: |
+                  ixVolume: Is dataset created automatically by the system.</br>
+                  Host Path: Is a path that already exists on the system.
+                schema:
+                  type: string
+                  required: true
+                  immutable: true
+                  default: "ixVolume"
+                  enum:
+                    - value: "hostPath"
+                      description: Host Path (Path that already exists on the system)
+                    - value: "ixVolume"
+                      description: ixVolume (Dataset created automatically by the system)
+              - variable: datasetName
+                label: Dataset Name
+                schema:
+                  type: string
+                  show_if: [["type", "=", "ixVolume"]]
+                  required: true
+                  hidden: true
+                  immutable: true
+                  default: "extensions"
+                  $ref:
+                    - "normalize/ixVolume"
+              - variable: hostPath
+                label: Host Path
+                schema:
+                  type: hostpath
+                  show_if: [["type", "=", "hostPath"]]
+                  immutable: true
+                  required: true
+        - variable: pgData
+          label: Postgres Data Storage
+          description: The path to store Postgres Data.
+          schema:
+            type: dict
+            attrs:
+              - variable: type
+                label: Type
+                description: |
+                  ixVolume: Is dataset created automatically by the system.</br>
+                  Host Path: Is a path that already exists on the system.
+                schema:
+                  type: string
+                  required: true
+                  immutable: true
+                  default: "ixVolume"
+                  enum:
+                    - value: "hostPath"
+                      description: Host Path (Path that already exists on the system)
+                    - value: "ixVolume"
+                      description: ixVolume (Dataset created automatically by the system)
+              - variable: datasetName
+                label: Dataset Name
+                schema:
+                  type: string
+                  show_if: [["type", "=", "ixVolume"]]
+                  required: true
+                  hidden: true
+                  immutable: true
+                  default: "pgData"
+                  $ref:
+                    - "normalize/ixVolume"
+              - variable: hostPath
+                label: Host Path
+                schema:
+                  type: hostpath
+                  show_if: [["type", "=", "hostPath"]]
+                  immutable: true
+                  required: true
+        - variable: pgBackup
+          label: Postgres Backup Storage
+          description: The path to store Postgres Backup.
+          schema:
+            type: dict
+            attrs:
+              - variable: type
+                label: Type
+                description: |
+                  ixVolume: Is dataset created automatically by the system.</br>
+                  Host Path: Is a path that already exists on the system.
+                schema:
+                  type: string
+                  required: true
+                  immutable: true
+                  default: "ixVolume"
+                  enum:
+                    - value: "hostPath"
+                      description: Host Path (Path that already exists on the system)
+                    - value: "ixVolume"
+                      description: ixVolume (Dataset created automatically by the system)
+              - variable: datasetName
+                label: Dataset Name
+                schema:
+                  type: string
+                  show_if: [["type", "=", "ixVolume"]]
+                  required: true
+                  hidden: true
+                  immutable: true
+                  default: "pgBackup"
+                  $ref:
+                    - "normalize/ixVolume"
+              - variable: hostPath
+                label: Host Path
+                schema:
+                  type: hostpath
+                  show_if: [["type", "=", "hostPath"]]
+                  immutable: true
+                  required: true
+        - variable: additionalStorages
+          label: Additional Storage
+          description: Additional storage for FreshRSS.
+          schema:
+            type: list
+            default: []
+            items:
+              - variable: storageEntry
+                label: Storage Entry
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: type
+                      label: Type
+                      description: |
+                        ixVolume: Is dataset created automatically by the system.</br>
+                        Host Path: Is a path that already exists on the system.</br>
+                        SMB Share: Is a SMB share that is mounted to a persistent volume claim.
+                      schema:
+                        type: string
+                        required: true
+                        immutable: true
+                        default: "ixVolume"
+                        enum:
+                          - value: "hostPath"
+                            description: Host Path (Path that already exists on the system)
+                          - value: "ixVolume"
+                            description: ixVolume (Dataset created automatically by the system)
+                          - value: "smb-pv-pvc"
+                            description: SMB Share (Mounts a persistent volume claim to a SMB share)
+                    - variable: mountPath
+                      label: Mount Path
+                      description: The path inside the container to mount the storage.
+                      schema:
+                        type: path
+                        required: true
+                    - variable: hostPath
+                      label: Host Path
+                      description: The host path to use for storage.
+                      schema:
+                        type: hostpath
+                        show_if: [["type", "=", "hostPath"]]
+                        required: true
+                    - variable: datasetName
+                      label: Dataset Name
+                      description: The name of the dataset to use for storage.
+                      schema:
+                        type: string
+                        show_if: [["type", "=", "ixVolume"]]
+                        required: true
+                        immutable: true
+                        default: "storage_entry"
+                        $ref:
+                          - "normalize/ixVolume"
+                    - variable: server
+                      label: Server
+                      description: The server for the SMB share.
+                      schema:
+                        type: string
+                        show_if: [["type", "=", "smb-pv-pvc"]]
+                        required: true
+                    - variable: share
+                      label: Share
+                      description: The share name for the SMB share.
+                      schema:
+                        type: string
+                        show_if: [["type", "=", "smb-pv-pvc"]]
+                        required: true
+                    - variable: domain
+                      label: Domain (Optional)
+                      description: The domain for the SMB share.
+                      schema:
+                        type: string
+                        show_if: [["type", "=", "smb-pv-pvc"]]
+                    - variable: username
+                      label: Username
+                      description: The username for the SMB share.
+                      schema:
+                        type: string
+                        show_if: [["type", "=", "smb-pv-pvc"]]
+                        required: true
+                    - variable: password
+                      label: Password
+                      description: The password for the SMB share.
+                      schema:
+                        type: string
+                        show_if: [["type", "=", "smb-pv-pvc"]]
+                        required: true
+                        private: true
+                    - variable: size
+                      label: Size (in Gi)
+                      description: The size of the volume quota.
+                      schema:
+                        type: int
+                        show_if: [["type", "=", "smb-pv-pvc"]]
+                        required: true
+                        min: 1
+                        default: 1
+
+  - variable: resources
+    group: Resources Configuration
+    label: ""
+    schema:
+      type: dict
+      attrs:
+        - variable: limits
+          label: Limits
+          schema:
+            type: dict
+            attrs:
+              - variable: cpu
+                label: CPU
+                description: CPU limit for FreshRSS.
+                schema:
+                  type: string
+                  max_length: 6
+                  valid_chars: '^(0\.[1-9]|[1-9][0-9]*)(\.[0-9]|m?)$'
+                  valid_chars_error: |
+                    Valid CPU limit formats are</br>
+                    - Plain Integer - eg. 1</br>
+                    - Float - eg. 0.5</br>
+                    - Milicpu - eg. 500m
+                  default: "4000m"
+                  required: true
+              - variable: memory
+                label: Memory
+                description: Memory limit for FreshRSS.
+                schema:
+                  type: string
+                  max_length: 12
+                  valid_chars: '^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$'
+                  valid_chars_error: |
+                    Valid Memory limit formats are</br>
+                    - Suffixed with E/P/T/G/M/K - eg. 1G</br>
+                    - Suffixed with Ei/Pi/Ti/Gi/Mi/Ki - eg. 1Gi</br>
+                    - Plain Integer in bytes - eg. 1024</br>
+                    - Exponent - eg. 134e6
+                  default: "8Gi"
+                  required: true

library/ix-dev/community/freshrss/templates/NOTES.txt

@@ -0,0 +1 @@
+{{ include "ix.v1.common.lib.chart.notes" $ }}

library/ix-dev/community/freshrss/templates/_configuration.tpl

@@ -0,0 +1,53 @@
+{{- define "freshrss.configuration" -}}
+  {{- $fullname := (include "ix.v1.common.lib.chart.names.fullname" $) -}}
+
+  {{- $dbHost := (printf "%s-postgres" $fullname) -}}
+  {{- $dbUser := "freshrss" -}}
+  {{- $dbName := "freshrss" -}}
+
+  {{- $dbPass := (randAlphaNum 32) -}}
+  {{- with (lookup "v1" "Secret" .Release.Namespace (printf "%s-postgres-creds" $fullname)) -}}
+    {{- $dbPass = ((index .data "POSTGRES_PASSWORD") | b64dec) -}}
+  {{- end -}}
+
+  {{- $dbURL := (printf "postgres://%s:%s@%s:5432/%s?sslmode=disable" $dbUser $dbPass $dbHost $dbName) -}}
+  {{/* Temporary set dynamic db details on values,
+  so we can print them on the notes */}}
+  {{- $_ := set .Values "freshrssDbPass" $dbPass -}}
+  {{- $_ := set .Values "freshrssDbHost" $dbHost -}}
+
+secret:
+  postgres-creds:
+    enabled: true
+    data:
+      POSTGRES_USER: {{ $dbUser }}
+      POSTGRES_DB: {{ $dbName }}
+      POSTGRES_PASSWORD: {{ $dbPass }}
+      POSTGRES_HOST: {{ $dbHost }}
+      POSTGRES_URL: {{ $dbURL }}
+
+  freshrss-creds:
+    enabled: true
+    data:
+      # This is only used on the first install
+      FRESHRSS_INSTALL: |
+        --default_user {{ .Values.freshrssConfig.defaultAdmin }}
+        --db-type pgsql
+        --db-base {{ $dbName }}
+        --db-host {{ $dbHost }}
+        --db-user {{ $dbUser }}
+        --db-password {{ $dbPass }}
+      # This is only used on the first install
+      FRESHRSS_USER: |
+        --user {{ .Values.freshrssConfig.defaultAdmin }}
+        --password {{ .Values.freshrssConfig.defaultAdminPass }}
+configmap:
+  freshrss-config:
+    enabled: true
+    data:
+      FRESHRSS_ENV: production
+      LISTEN: {{ .Values.freshrssNetwork.webPort | quote }}
+      DATA_PATH: /var/www/FreshRSS/data
+      # We use k8s cron instead of the in-container cron
+      CRON_MIN: ""
+{{- end -}}

library/ix-dev/community/freshrss/templates/_cron.tpl

@@ -0,0 +1,52 @@
+{{- define "freshrss.cron" -}}
+workload:
+  freshrss-cron:
+    enabled: true
+    type: CronJob
+    schedule: {{ .Values.freshrssConfig.cronSchedule | quote }}
+    podSpec:
+      hostNetwork: {{ .Values.freshrssNetwork.hostNetwork }}
+      restartPolicy: Never
+      containers:
+        freshrss-cron:
+          enabled: true
+          primary: true
+          imageSelector: image
+          securityContext:
+            runAsUser: 0
+            runAsGroup: 0
+            runAsNonRoot: false
+            readOnlyRootFilesystem: false
+            capabilities:
+              add:
+                - SETGID
+                - SETUID
+          command:
+            - /bin/sh
+          args:
+            - -c
+            - |
+              /var/www/FreshRSS/app/actualize_script.php
+          envFrom:
+            - secretRef:
+                name: freshrss-creds
+            - configMapRef:
+                name: freshrss-config
+          {{ with .Values.freshrssConfig.additionalEnvs }}
+          envList:
+            {{ range $env := . }}
+            - name: {{ $env.name }}
+              value: {{ $env.value }}
+            {{ end }}
+          {{ end }}
+          probes:
+            liveness:
+              enabled: false
+            readiness:
+              enabled: false
+            startup:
+              enabled: false
+      initContainers:
+      {{- include "ix.v1.common.app.postgresWait" (dict "name" "01-postgres-wait"
+                                                        "secretName" "postgres-creds") | nindent 8 }}
+{{- end -}}

library/ix-dev/community/freshrss/templates/_freshrss.tpl

@@ -0,0 +1,55 @@
+{{- define "freshrss.workload" -}}
+workload:
+  freshrss:
+    enabled: true
+    primary: true
+    type: Deployment
+    podSpec:
+      hostNetwork: {{ .Values.freshrssNetwork.hostNetwork }}
+      containers:
+        freshrss:
+          enabled: true
+          primary: true
+          imageSelector: image
+          securityContext:
+            runAsUser: 0
+            runAsGroup: 0
+            runAsNonRoot: false
+            readOnlyRootFilesystem: false
+            capabilities:
+              add:
+                - CHOWN
+                - SETGID
+                - SETUID
+          envFrom:
+            - secretRef:
+                name: freshrss-creds
+            - configMapRef:
+                name: freshrss-config
+          {{ with .Values.freshrssConfig.additionalEnvs }}
+          envList:
+            {{ range $env := . }}
+            - name: {{ $env.name }}
+              value: {{ $env.value }}
+            {{ end }}
+          {{ end }}
+          probes:
+            liveness:
+              enabled: true
+              type: http
+              port: {{ .Values.freshrssNetwork.webPort }}
+              path: /i/
+            readiness:
+              enabled: true
+              type: http
+              port: {{ .Values.freshrssNetwork.webPort }}
+              path: /i/
+            startup:
+              enabled: true
+              type: http
+              port: {{ .Values.freshrssNetwork.webPort }}
+              path: /i/
+      initContainers:
+      {{- include "ix.v1.common.app.postgresWait" (dict "name" "01-postgres-wait"
+                                                        "secretName" "postgres-creds") | nindent 8 }}
+{{- end -}}

library/ix-dev/community/freshrss/templates/_persistence.tpl

@@ -0,0 +1,97 @@
+{{- define "freshrss.persistence" -}}
+persistence:
+  data:
+    enabled: true
+    type: {{ .Values.freshrssStorage.data.type }}
+    datasetName: {{ .Values.freshrssStorage.data.datasetName | default "" }}
+    hostPath: {{ .Values.freshrssStorage.data.hostPath | default "" }}
+    targetSelector:
+      freshrss:
+        freshrss:
+          mountPath: /var/www/FreshRSS/data
+      freshrss-cron:
+        freshrss-cron:
+          mountPath: /var/www/FreshRSS/data
+  extensions:
+    enabled: true
+    type: {{ .Values.freshrssStorage.extensions.type }}
+    datasetName: {{ .Values.freshrssStorage.extensions.datasetName | default "" }}
+    hostPath: {{ .Values.freshrssStorage.extensions.hostPath | default "" }}
+    targetSelector:
+      freshrss:
+        freshrss:
+          mountPath: /var/www/FreshRSS/extensions
+      freshrss:
+        freshrss:
+          mountPath: /var/www/FreshRSS/extensions
+      freshrss-cron:
+        freshrss-cron:
+          mountPath: /var/www/FreshRSS/extensions
+  tmp:
+    enabled: true
+    type: emptyDir
+    targetSelector:
+      freshrss:
+        freshrss:
+          mountPath: /tmp
+  {{- range $idx, $storage := .Values.freshrssStorage.additionalStorages }}
+  {{ printf "freshrss-%v" (int $idx) }}:
+    {{- $size := "" -}}
+    {{- if $storage.size -}}
+      {{- $size = (printf "%vGi" $storage.size) -}}
+    {{- end }}
+    enabled: true
+    type: {{ $storage.type }}
+    datasetName: {{ $storage.datasetName | default "" }}
+    hostPath: {{ $storage.hostPath | default "" }}
+    server: {{ $storage.server | default "" }}
+    share: {{ $storage.share | default "" }}
+    domain: {{ $storage.domain | default "" }}
+    username: {{ $storage.username | default "" }}
+    password: {{ $storage.password | default "" }}
+    size: {{ $size }}
+    {{- if eq $storage.type "smb-pv-pvc" }}
+    mountOptions:
+      - key: noperm
+    {{- end }}
+    targetSelector:
+      freshrss:
+        freshrss:
+          mountPath: {{ $storage.mountPath }}
+      freshrss-cron:
+        freshrss-cron:
+          mountPath: {{ $storage.mountPath }}
+  {{- end }}
+
+  {{/* Database */}}
+  postgresdata:
+    enabled: true
+    type: {{ .Values.freshrssStorage.pgData.type }}
+    datasetName: {{ .Values.freshrssStorage.pgData.datasetName | default "" }}
+    hostPath: {{ .Values.freshrssStorage.pgData.hostPath | default "" }}
+    targetSelector:
+      # Postgres pod
+      postgres:
+        # Postgres container
+        postgres:
+          mountPath: /var/lib/postgresql/data
+        # Postgres - Permissions container
+        # Different than the 01-permissions
+        permissions:
+          mountPath: /mnt/directories/postgres_data
+  postgresbackup:
+    enabled: true
+    type: {{ .Values.freshrssStorage.pgBackup.type }}
+    datasetName: {{ .Values.freshrssStorage.pgBackup.datasetName | default "" }}
+    hostPath: {{ .Values.freshrssStorage.pgBackup.hostPath | default "" }}
+    targetSelector:
+      # Postgres backup pod
+      postgresbackup:
+        # Postgres backup container
+        postgresbackup:
+          mountPath: /postgres_backup
+        # Postgres - Permissions container
+        # Different than the 01-permissions
+        permissions:
+          mountPath: /mnt/directories/postgres_backup
+{{- end -}}

library/ix-dev/community/freshrss/templates/_portal.tpl

@@ -0,0 +1,12 @@
+{{- define "freshrss.portal" -}}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: portal
+data:
+  path: "/"
+  port: {{ .Values.freshrssNetwork.webPort | quote }}
+  protocol: http
+  host: $node_ip
+{{- end -}}

library/ix-dev/community/freshrss/templates/_postgres.tpl

@@ -0,0 +1,6 @@
+{{- define "freshrss.postgres.workload" -}}
+workload:
+{{- include "ix.v1.common.app.postgres" (dict "secretName" "postgres-creds"
+                                              "resources" .Values.resources
+                                              "ixChartContext" .Values.ixChartContext) | nindent 2 }}
+{{- end -}}

library/ix-dev/community/freshrss/templates/_service.tpl

@@ -0,0 +1,28 @@
+{{- define "freshrss.service" -}}
+service:
+  freshrss:
+    enabled: true
+    primary: true
+    type: NodePort
+    targetSelector: freshrss
+    ports:
+      webui:
+        enabled: true
+        primary: true
+        port: {{ .Values.freshrssNetwork.webPort }}
+        nodePort: {{ .Values.freshrssNetwork.webPort }}
+        targetSelector: freshrss
+
+  {{/* Database */}}
+  postgres:
+    enabled: true
+    type: ClusterIP
+    targetSelector: postgres
+    ports:
+      postgres:
+        enabled: true
+        primary: true
+        port: 5432
+        targetPort: 5432
+        targetSelector: postgres
+{{- end -}}

library/ix-dev/community/freshrss/templates/common.yaml

@@ -0,0 +1,16 @@
+{{- include "ix.v1.common.loader.init" . -}}
+
+{{/* Merge the templates with Values */}}
+{{- $_ := mustMergeOverwrite .Values (include "freshrss.configuration" $ | fromYaml) -}}
+{{- $_ := mustMergeOverwrite .Values (include "freshrss.persistence" $ | fromYaml) -}}
+{{- $_ := mustMergeOverwrite .Values (include "freshrss.service" $ | fromYaml) -}}
+{{- $_ := mustMergeOverwrite .Values (include "freshrss.workload" $ | fromYaml) -}}
+{{- $_ := mustMergeOverwrite .Values (include "freshrss.postgres.workload" $ | fromYaml) -}}
+{{- if .Values.freshrssConfig.enableCron -}}
+  {{- $_ := mustMergeOverwrite .Values (include "freshrss.cron" $ | fromYaml) -}}
+{{- end -}}
+
+{{/* Create the configmap for portal manually*/}}
+{{- include "freshrss.portal" $ -}}
+
+{{- include "ix.v1.common.loader.apply" . -}}

library/ix-dev/community/freshrss/upgrade_info.json

@@ -0,0 +1 @@
+{"filename": "values.yaml", "keys": ["image"]}

library/ix-dev/community/freshrss/upgrade_strategy

@@ -0,0 +1,31 @@
+#!/usr/bin/python3
+import json
+import re
+import sys
+
+from catalog_update.upgrade_strategy import semantic_versioning
+
+
+RE_STABLE_VERSION = re.compile(r'\d+\.\d+\.\d+')
+
+
+def newer_mapping(image_tags):
+    key = list(image_tags.keys())[0]
+    tags = {t: t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)}
+    version = semantic_versioning(list(tags))
+    if not version:
+        return {}
+
+    return {
+        'tags': {key: tags[version]},
+        'app_version': version,
+    }
+
+
+if __name__ == '__main__':
+    try:
+        versions_json = json.loads(sys.stdin.read())
+    except ValueError:
+        raise ValueError('Invalid json specified')
+
+    print(json.dumps(newer_mapping(versions_json)))

library/ix-dev/community/freshrss/values.yaml

@@ -0,0 +1,54 @@
+image:
+  repository: freshrss/freshrss
+  pullPolicy: IfNotPresent
+  tag: 1.22.0
+
+resources:
+  limits:
+    cpu: 4000m
+    memory: 8Gi
+
+freshrssConfig:
+  defaultAdmin: ''
+  defaultAdminPass: ''
+  enableCron: false
+  # */20 * * * * = every 20 minutes (Recommended)
+  cronSchedule: ''
+  additionalEnvs: []
+
+freshrssNetwork:
+  webPort: 31000
+  hostNetwork: false
+
+freshrssStorage:
+  data:
+    type: ixVolume
+    datasetName: data
+  extensions:
+    type: ixVolume
+    datasetName: extensions
+  additionalStorages: []
+  pgData:
+    type: ixVolume
+    datasetName: pgData
+  pgBackup:
+    type: ixVolume
+    datasetName: pgBackup
+
+notes:
+  custom: |
+    ## Database
+    You can connect to the database using the pgAdmin App from the catalog
+
+    <details>
+      <summary>Database Details</summary>
+
+      - Database: `freshrss`
+      - Username: `freshrss`
+      - Password: `{{ .Values.freshrssDbPass }}`
+      - Host:     `{{ .Values.freshrssDbHost }}.{{ .Release.Namespace }}.svc.cluster.local`
+      - Port:     `5432`
+
+    </details>
+    {{- $_ := unset .Values "freshrssDbPass" }}
+    {{- $_ := unset .Values "freshrssDbHost" }}