diff --git a/clusters/cl01tl/applications/freshrss/Chart.yaml b/clusters/cl01tl/applications/freshrss/Chart.yaml index b89830d40..52fc33b77 100644 --- a/clusters/cl01tl/applications/freshrss/Chart.yaml +++ b/clusters/cl01tl/applications/freshrss/Chart.yaml @@ -20,11 +20,11 @@ dependencies: - name: app-template alias: freshrss repository: https://bjw-s-labs.github.io/helm-charts/ - version: 3.7.3 + version: 4.0.1 - name: cloudflared alias: cloudflared repository: oci://harbor.alexlebens.net/helm-charts - version: 1.14.8 + version: 1.15.0 - name: postgres-cluster alias: postgres-17-cluster version: 5.1.0 diff --git a/clusters/cl01tl/applications/freshrss/templates/external-secret.yaml b/clusters/cl01tl/applications/freshrss/templates/external-secret.yaml index c19a39ff0..8eab65bfd 100644 --- a/clusters/cl01tl/applications/freshrss/templates/external-secret.yaml +++ b/clusters/cl01tl/applications/freshrss/templates/external-secret.yaml @@ -4,11 +4,8 @@ metadata: name: freshrss-install-secret namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: freshrss-install-secret + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: web - app.kubernetes.io/part-of: {{ .Release.Name }} spec: secretStoreRef: kind: ClusterSecretStore @@ -45,9 +42,6 @@ metadata: labels: app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: web - app.kubernetes.io/part-of: {{ .Release.Name }} spec: secretStoreRef: kind: ClusterSecretStore @@ -82,11 +76,8 @@ metadata: name: freshrss-cloudflared-secret namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: freshrss-cloudflared-secret + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: web - app.kubernetes.io/part-of: {{ .Release.Name }} spec: secretStoreRef: kind: ClusterSecretStore @@ -107,11 +98,8 @@ metadata: name: freshrss-data-backup-secret namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: freshrss-data-backup-secret + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: backup - app.kubernetes.io/part-of: {{ .Release.Name }} spec: secretStoreRef: kind: ClusterSecretStore @@ -166,11 +154,8 @@ metadata: name: freshrss-postgresql-17-cluster-backup-secret namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: freshrss-postgresql-17-cluster-backup-secret + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: database - app.kubernetes.io/part-of: {{ .Release.Name }} spec: secretStoreRef: kind: ClusterSecretStore diff --git a/clusters/cl01tl/applications/freshrss/templates/replication-source.yaml b/clusters/cl01tl/applications/freshrss/templates/replication-source.yaml index 077e93396..c4dbd2da8 100644 --- a/clusters/cl01tl/applications/freshrss/templates/replication-source.yaml +++ b/clusters/cl01tl/applications/freshrss/templates/replication-source.yaml @@ -4,11 +4,8 @@ metadata: name: freshrss-data-backup-source namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: freshrss-data-backup-source + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: backup - app.kubernetes.io/part-of: {{ .Release.Name }} spec: sourcePVC: freshrss-data trigger: diff --git a/clusters/cl01tl/applications/freshrss/values.yaml b/clusters/cl01tl/applications/freshrss/values.yaml index 0a14ab8f7..f73ca573c 100644 --- a/clusters/cl01tl/applications/freshrss/values.yaml +++ b/clusters/cl01tl/applications/freshrss/values.yaml @@ -28,7 +28,7 @@ freshrss: chown -R 568:568 /var/www/FreshRSS/extensions/xExtension-YouTubeChannel2RssFeed resources: requests: - cpu: 100m + cpu: 10m memory: 128Mi init-download-extension-2: securityContext: @@ -52,7 +52,7 @@ freshrss: chown -R 568:568 /var/www/FreshRSS/extensions/xExtension-YouTubeChannel2RssFeed resources: requests: - cpu: 100m + cpu: 10m memory: 128Mi containers: main: @@ -131,8 +131,6 @@ freshrss: requests: cpu: 10m memory: 128Mi - serviceAccount: - create: true service: main: controller: main