diff --git a/clusters/cl01tl/applications/freshrss/templates/external-secret.yaml b/clusters/cl01tl/applications/freshrss/templates/external-secret.yaml index b7d2e37a8..93920aa6e 100644 --- a/clusters/cl01tl/applications/freshrss/templates/external-secret.yaml +++ b/clusters/cl01tl/applications/freshrss/templates/external-secret.yaml @@ -43,7 +43,7 @@ metadata: name: freshrss-install-secret namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: freshrss-install-secret app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web @@ -53,20 +53,27 @@ spec: kind: ClusterSecretStore name: vault data: - - secretKey: FRESHRSS_INSTALL + - secretKey: ADMIN_EMAIL remoteRef: conversionStrategy: Default decodingStrategy: None - key: /freshrss/config + key: /cl01tl/freshrss/config metadataPolicy: None - property: FRESHRSS_INSTALL - - secretKey: FRESHRSS_USER + property: ADMIN_EMAIL + - secretKey: ADMIN_PASSWORD remoteRef: conversionStrategy: Default decodingStrategy: None - key: /freshrss/config + key: /cl01tl/freshrss/config metadataPolicy: None - property: FRESHRSS_USER + property: ADMIN_PASSWORD + - secretKey: ADMIN_API_PASSWORD + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /cl01tl/freshrss/config + metadataPolicy: None + property: ADMIN_API_PASSWORD --- apiVersion: external-secrets.io/v1beta1 diff --git a/clusters/cl01tl/applications/freshrss/values.yaml b/clusters/cl01tl/applications/freshrss/values.yaml index b85b76ec9..c6c3b851d 100644 --- a/clusters/cl01tl/applications/freshrss/values.yaml +++ b/clusters/cl01tl/applications/freshrss/values.yaml @@ -53,7 +53,15 @@ freshrss: --db-password ${DB_PASSWORD} --db-type pgsql --db-user ${DB_USER} + --default_user alexlebens --language en + - name: FRESHRSS_USER + value: | + --api-password ${ADMIN_API_PASSWORD} + --email ${ADMIN_EMAIL} + --language en + --password ${ADMIN_PASSWORD} + --user alexlebens - name: OIDC_ENABLED value: 1 - name: OIDC_PROVIDER_METADATA_URL @@ -67,6 +75,8 @@ freshrss: envFrom: - secretRef: name: freshrss-oidc-secret + - secretRef: + name: freshrss-install-secret resources: requests: cpu: 100m