diff --git a/charts/freshrss/Chart.yaml b/charts/freshrss/Chart.yaml index 23f4f9b..556a853 100644 --- a/charts/freshrss/Chart.yaml +++ b/charts/freshrss/Chart.yaml @@ -23,7 +23,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0 +version: 1.1.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/freshrss/README.md b/charts/freshrss/README.md index 5a6ccf6..54457de 100644 --- a/charts/freshrss/README.md +++ b/charts/freshrss/README.md @@ -1,6 +1,6 @@ # freshrss -![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.21.0](https://img.shields.io/badge/AppVersion-1.21.0-informational?style=flat-square) +![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.21.0](https://img.shields.io/badge/AppVersion-1.21.0-informational?style=flat-square) A Helm chart for FreshRSS @@ -17,11 +17,11 @@ A Helm chart for FreshRSS | affinity | object | `{}` | | | freshrss.autoInstall.apiEnabled | bool | `false` | Enable FreshRSS API | | freshrss.autoInstall.baseUrl | string | `"freshrss.local"` | URL for FreshRSS instance | -| freshrss.autoInstall.dbBase | string | `"freshrss"` | Database name | -| freshrss.autoInstall.dbHost | string | `""` | Database hostname | -| freshrss.autoInstall.dbPassword | string | `"freshrss"` | Database password | -| freshrss.autoInstall.dbType | string | `"sqlite"` | Database type - `pgsql`, `mysql` or `sqlite` | -| freshrss.autoInstall.dbUser | string | `"freshrss"` | Database user | +| freshrss.autoInstall.db.host | string | `""` | Database hostname | +| freshrss.autoInstall.db.name | string | `"freshrss"` | Database name | +| freshrss.autoInstall.db.password | string | `"freshrss"` | Database password | +| freshrss.autoInstall.db.type | string | `"sqlite"` | Database type - `pgsql`, `mysql` or `sqlite` | +| freshrss.autoInstall.db.user | string | `"freshrss"` | Database user | | freshrss.autoInstall.defaultUser.email | string | `"admin@example.com"` | Email for the default user | | freshrss.autoInstall.defaultUser.password | string | `"admin"` | Password for the default user | | freshrss.autoInstall.defaultUser.user | string | `"admin"` | Username for the default user | diff --git a/charts/freshrss/templates/deployment.yaml b/charts/freshrss/templates/deployment.yaml index e0750b5..d66db64 100644 --- a/charts/freshrss/templates/deployment.yaml +++ b/charts/freshrss/templates/deployment.yaml @@ -54,6 +54,13 @@ spec: {{- end }} --language {{ .Values.freshrss.autoInstall.language }} --default_user {{ .Values.freshrss.autoInstall.defaultUser.user }} + {{- if ne .Values.freshrss.autoInstall.db.type "sqlite" }} + --db-base {{ .Values.freshrss.autoInstall.db.name }} + --db-host {{ .Values.freshrss.autoInstall.db.host }} + --db-password {{ .Values.freshrss.autoInstall.db.password }} + --db-type {{ .Values.freshrss.autoInstall.db.type }} + --db-user {{ .Values.freshrss.autoInstall.db.user }} + {{- end }} - name: FRESHRSS_USER value: |- {{- with .Values.freshrss.autoInstall.defaultUser }} diff --git a/charts/freshrss/values.yaml b/charts/freshrss/values.yaml index aa11a36..5b97211 100644 --- a/charts/freshrss/values.yaml +++ b/charts/freshrss/values.yaml @@ -55,16 +55,17 @@ freshrss: language: en # -- Enable FreshRSS API apiEnabled: false - # -- Database type - `pgsql`, `mysql` or `sqlite` - dbType: sqlite - # -- Database name - dbBase: freshrss - # -- Database hostname - dbHost: "" - # -- Database password - dbPassword: freshrss - # -- Database user - dbUser: freshrss + db: + # -- Database type - `pgsql`, `mysql` or `sqlite` + type: sqlite + # -- Database name + name: freshrss + # -- Database hostname + host: "" + # -- Database password + password: freshrss + # -- Database user + user: freshrss defaultUser: # -- Username for the default user user: admin