From d3b554f9059ade3c60217882ccc97a6942e1c4a9 Mon Sep 17 00:00:00 2001 From: James Date: Sun, 8 Jan 2023 14:22:47 +0000 Subject: [PATCH] add initial auto-install env var --- charts/freshrss/templates/deployment.yaml | 22 ++++++++++++++- charts/freshrss/values.yaml | 33 ++++++++++++----------- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/charts/freshrss/templates/deployment.yaml b/charts/freshrss/templates/deployment.yaml index 61b1304..c2b901b 100644 --- a/charts/freshrss/templates/deployment.yaml +++ b/charts/freshrss/templates/deployment.yaml @@ -39,11 +39,31 @@ spec: protocol: TCP env: - name: TZ - value: {{ .Values.timezone }} + value: {{ .Values.freshrss.timezone }} + - name: FRESHRSS_ENV + value: {{ .Values.freshrss.freshEnv }} + {{- if .Values.freshrss.autoInstall.enabled }} + - name: FRESHRSS_INSTALL + value: |- + {{- if .Values.freshrss.autoInstall.apiEnabled }} + --api_enabled + {{- end }} + --language {{ .Values.freshrss.autoInstall.language }} + --default_user {{ .Values.freshrss.autoInstall.defaultUser.user }} + - name: FRESHRSS_USER + value: |- + {{- with .Values.freshrss.autoInstall.defaultUser }} + --email {{ .email }} + --password {{ .password }} + --user {{ .user }} + {{- end }} + --language {{ .Values.freshrss.autoInstall.language }} + {{- end }} livenessProbe: httpGet: path: / port: http + initialDelaySeconds: 30 readinessProbe: httpGet: path: / diff --git a/charts/freshrss/values.yaml b/charts/freshrss/values.yaml index b635fc3..22b1dd5 100644 --- a/charts/freshrss/values.yaml +++ b/charts/freshrss/values.yaml @@ -42,13 +42,23 @@ service: type: ClusterIP port: 80 -# externalPostgresql: -# enabled: false -# host: "" -# port: 5432 -# username: freshrss -# password: freshrss -# database: freshrss +freshrss: + timezone: UTC + freshEnv: production + autoInstall: + enabled: true + baseUrl: freshrss.local + language: en + apiEnabled: false + dbType: sqlite + dbBase: freshrss + dbHost: "" + dbPassword: freshrss + dbUser: freshrss + defaultUser: + user: admin + password: admin + email: admin@example.com persistence: enabled: false @@ -58,8 +68,6 @@ persistence: storageClass: "" size: 10Gi -timezone: UTC - ingress: enabled: false className: "" @@ -88,13 +96,6 @@ resources: {} # cpu: 100m # memory: 128Mi -# autoscaling: -# enabled: false -# minReplicas: 1 -# maxReplicas: 100 -# targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - nodeSelector: {} tolerations: []