Skip to content

Commit 9ac9134

Browse files
utkuozdemirutkuozdemir
committed
Release huginn chart version 2.0.0.
1 parent c96083f commit 9ac9134

File tree

8 files changed

+136
-16
lines changed

8 files changed

+136
-16
lines changed

‎docs/huginn-2.0.0.tgz

85 KB
Binary file not shown.

‎docs/index.yaml

+50-1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,55 @@ entries:
9797
- https://utkuozdemir.org/helm-charts/gohttpserver-0.1.0.tgz
9898
version: 0.1.0
9999
huginn:
100+
- annotations:
101+
artifacthub.io/changes: |
102+
- Add PostgreSQL as an optional database
103+
- Rework values.yaml keys and defaults
104+
artifacthub.io/images: |
105+
- name: huginn/huginn
106+
image: docker.io/huginn/huginn-single-process:4d17829cf6b15b004ad3f4be196303dca4944810
107+
- name: bitnami/mysql
108+
image: docker.io/bitnami/mysql:8.0.23-debian-10-r28
109+
- name: bitnami/postgresql
110+
image: docker.io/bitnami/postgresql:11.11.0-debian-10-r24
111+
- name: bitnami/bitnami-shell
112+
image: docker.io/bitnami/bitnami-shell:10
113+
artifacthub.io/license: MIT
114+
apiVersion: v2
115+
appVersion: 4d17829cf6b15b004ad3f4be196303dca4944810
116+
created: "2021-03-08T20:21:06.658303+01:00"
117+
dependencies:
118+
- condition: mysql.deployChart
119+
name: mysql
120+
repository: https://charts.bitnami.com/bitnami
121+
version: 8.4.4
122+
- condition: postgresql.deployChart
123+
name: postgresql
124+
repository: https://charts.bitnami.com/bitnami
125+
version: 10.3.11
126+
description: Huginn Helm chart based on its official Docker image
127+
digest: a9624f1d7c014921025c133f817557e2e361fe1e4c195cca2eacdafd03aaf4dc
128+
home: https://github.com/huginn/huginn
129+
icon: https://utkuozdemir.org/helm-charts/huginn.png
130+
keywords:
131+
- huginn
132+
- scraper
133+
- agent
134+
- automation
135+
- webscraping
136+
- rss
137+
maintainers:
138+
- email: [email protected]
139+
name: Utku Özdemir
140+
url: https://utkuozdemir.org
141+
name: huginn
142+
sources:
143+
- https://github.com/huginn/huginn
144+
- https://github.com/utkuozdemir/helm-charts
145+
type: application
146+
urls:
147+
- https://utkuozdemir.org/helm-charts/huginn-2.0.0.tgz
148+
version: 2.0.0
100149
- annotations:
101150
artifacthub.io/changes: |
102151
- Initial release
@@ -382,4 +431,4 @@ entries:
382431
urls:
383432
- https://utkuozdemir.org/helm-charts/transmission-openvpn-0.1.0.tgz
384433
version: 0.1.0
385-
generated: "2021-03-07T20:12:47.933605+01:00"
434+
generated: "2021-03-08T20:21:06.647115+01:00"

‎huginn/Chart.lock

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@ dependencies:
22
- name: mysql
33
repository: https://charts.bitnami.com/bitnami
44
version: 8.4.4
5-
digest: sha256:f0e62276d8b19e9d6cdcade2c3ab1fe9cd593c9d79de7a4150f7d95060e501e1
6-
generated: "2021-03-05T21:56:44.157066+01:00"
5+
- name: postgresql
6+
repository: https://charts.bitnami.com/bitnami
7+
version: 10.3.11
8+
digest: sha256:d3db162af28841b50effab98fd8909e6684cd12834f2925cdc518b45885273e5
9+
generated: "2021-03-08T17:38:58.838284+01:00"

‎huginn/Chart.yaml

+10-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: huginn
33
description: Huginn Helm chart based on its official Docker image
44
type: application
5-
version: 1.0.1
5+
version: 2.0.0
66
appVersion: 4d17829cf6b15b004ad3f4be196303dca4944810
77
home: https://github.com/huginn/huginn
88
keywords:
@@ -23,16 +23,23 @@ maintainers:
2323
annotations:
2424
artifacthub.io/license: MIT
2525
artifacthub.io/changes: |
26-
- Initial release
26+
- Add PostgreSQL as an optional database
27+
- Rework values.yaml keys and defaults
2728
artifacthub.io/images: |
2829
- name: huginn/huginn
2930
image: docker.io/huginn/huginn-single-process:4d17829cf6b15b004ad3f4be196303dca4944810
3031
- name: bitnami/mysql
3132
image: docker.io/bitnami/mysql:8.0.23-debian-10-r28
33+
- name: bitnami/postgresql
34+
image: docker.io/bitnami/postgresql:11.11.0-debian-10-r24
3235
- name: bitnami/bitnami-shell
3336
image: docker.io/bitnami/bitnami-shell:10
3437
dependencies:
3538
- name: mysql
3639
repository: https://charts.bitnami.com/bitnami
3740
version: 8.4.4
38-
condition: mysql.install
41+
condition: mysql.deployChart
42+
- name: postgresql
43+
repository: https://charts.bitnami.com/bitnami
44+
version: 10.3.11
45+
condition: postgresql.deployChart

‎huginn/README.md

+18-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This chart installs and starts 3 applications:
1616

1717
- The Huginn main instance that also function as the web interface
1818
- A Huginn worker instance
19-
- Bitnami's MySQL chart as a dependency as the database
19+
- Optionally, one of Bitnami's MySQL or PostgreSQL charts as a database dependency (default is MySQL)
2020

2121
It is based on the [single-process docker image of Huginn](https://hub.docker.com/r/huginn/huginn-single-process).
2222

@@ -95,12 +95,24 @@ The command removes all the Kubernetes components associated with the chart and
9595
| `seed.enabled` | Seed the database with an initial admin user | `true` |
9696
| `seed.username` | If `seed.enabled` is `true`, the username for the initial user | `admin` |
9797
| `seed.password` | If `seed.enabled` is `true`, the password for the initial user. **Make sure you change this to a secure password** | `ChangeMe!` |
98-
| `mysql.install` | Install a [bitnami/mysql](https://artifacthub.io/packages/helm/bitnami/mysql/8.4.4) instance as a dependency | `true` |
98+
| `database.type` | The type of the backing database. Valid values are `mysql` and `postgresql`. **Ignored if `mysql.deployChart` or `postgresql.deployChart` is true.** | `""` |
99+
| `database.host` | The host address of the backing database. **Ignored if `mysql.deployChart` or `postgresql.deployChart` is true.** | `nil` |
100+
| `database.name` | The name of the backing database. **Ignored if `mysql.deployChart` or `postgresql.deployChart` is true.** | `nil` |
101+
| `database.username` | The auth username for the backing database. **Ignored if `mysql.deployChart` or `postgresql.deployChart` is true.** | `nil` |
102+
| `database.password` | The auth password of the backing database. **Ignored if `mysql.deployChart` or `postgresql.deployChart` is true.** | `nil` |
103+
| `database.port` | The port number of the backing database. **Ignored if `mysql.deployChart` or `postgresql.deployChart` is true.** | `nil` |
104+
| `mysql.deployChart` | Install a [bitnami/mysql](https://artifacthub.io/packages/helm/bitnami/mysql/8.4.4) instance as a dependency. Mutually exclusive with `postgresql.deployChart` | `true` |
99105
| `mysql` | The configuration for the [bitnami/mysql](https://artifacthub.io/packages/helm/bitnami/mysql/8.4.4) subchart. For additional configuration, see the official chart README | _See below_ |
100-
| `mysql.auth.database` | The database name for Huginn to connect to. If `mysql.install` is `true`, the database with this name will be created as well | `huginn` |
101-
| `mysql.auth.username` | The MySQL DB username for Huginn to use. If `mysql.install` is `true`, the user with this name will be configured as well | `huginn` |
102-
| `mysql.auth.password` | The MySQL DB password for Huginn to use. If `mysql.install` is `true`, the user with this password will be configured as well. **Make sure you change this to a secure password** | `ChangeMe!` |
103-
| `mysql.auth.rootPassword` | The MySQL root password. **Used only when `mysql.install` is `true`. Make sure you change this to a secure password** | `DefinitelyChangeMe!` |
106+
| `mysql.auth.database` | The database name for Huginn to connect to. If `mysql.deployChart` is `true`, the database with this name will be created as well | `huginn` |
107+
| `mysql.auth.username` | The MySQL DB username for Huginn to use. If `mysql.deployChart` is `true`, the user with this name will be configured as well | `huginn` |
108+
| `mysql.auth.password` | The MySQL DB password for Huginn to use. If `mysql.deployChart` is `true`, the user with this password will be configured as well. **Make sure you change this to a secure password** | `ChangeMe!` |
109+
| `mysql.auth.rootPassword` | The MySQL root password. **Used only when `mysql.deployChart` is `true`. Make sure you change this to a secure password** | `DefinitelyChangeMe!` |
110+
| `postgresql.deployChart` | Install a [bitnami/postgresql](https://artifacthub.io/packages/helm/bitnami/postgresql/10.3.11) instance as a dependency. Mutually exclusive with `mysql.deployChart` | `false` |
111+
| `postgresql` | The configuration for the [bitnami/postgresql](https://artifacthub.io/packages/helm/bitnami/postgresql/10.3.11) subchart. For additional configuration, see the official chart README | _See below_ |
112+
| `postgresql.postgresqlDatabase` | The database name for Huginn to connect to. If `postgresql.deployChart` is `true`, the database with this name will be created as well | `huginn` |
113+
| `postgresql.postgresqlUsername` | The PostgreSQL DB username for Huginn to use. If `postgresql.deployChart` is `true`, the user with this name will be configured as well | `huginn` |
114+
| `postgresql.postgresqlPassword` | The PostgreSQL DB password for Huginn to use. If `postgresql.deployChart` is `true`, the user with this password will be configured as well. **Make sure you change this to a secure password** | `ChangeMe!` |
115+
| `postgresql.postgresqlPostgresPassword` | The PostgreSQL admin user password. **Used only when `postgresql.deployChart` is `true`. Make sure you change this to a secure password** | `DefinitelyChangeMe!` |
104116

105117

106118
The above config parameters map to the various configuration env variables of a typical Huginn server.

‎huginn/templates/configmap.yaml

+25-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,33 @@ metadata:
55
labels:
66
{{- include "huginn.labels" . | nindent 4 }}
77
data:
8-
{{- if not .Values.seed.enabled }}
8+
HUGINN_PORT: {{ .Values.web.port | quote }}
9+
{{- if not .Values.seed.enabled }}
910
DO_NOT_SEED: "true"
10-
{{- end }}
11+
{{- end }}
12+
{{- if not (or .Values.mysql.deployChart .Values.postgresql.deployChart) }}
13+
{{- if eq .Values.database.type "mysql" }}
1114
HUGINN_DATABASE_ADAPTER: mysql2
15+
{{- else if eq .Values.database.type "postgresql" }}
16+
HUGINN_DATABASE_ADAPTER: postgresql
17+
HUGINN_DATABASE_ENCODING: utf8
18+
{{- else }}
19+
{{- fail "Database type cannot be determined" }}
20+
{{- end }}
21+
{{- end }}
22+
{{- if .Values.mysql.deployChart }}
1223
HUGINN_DATABASE_NAME: {{ .Values.mysql.auth.database | quote }}
1324
HUGINN_DATABASE_HOST: {{ include "huginn.fullname" . }}-mysql
1425
HUGINN_DATABASE_PORT: {{ .Values.mysql.primary.service.port | quote }}
15-
HUGINN_PORT: {{ .Values.web.port | quote }}
26+
HUGINN_DATABASE_ADAPTER: mysql2
27+
{{- else if .Values.postgresql.deployChart }}
28+
HUGINN_DATABASE_NAME: {{ .Values.postgresql.postgresqlDatabase | quote }}
29+
HUGINN_DATABASE_HOST: {{ include "huginn.fullname" . }}-postgresql
30+
HUGINN_DATABASE_PORT: {{ .Values.postgresql.service.port | quote }}
31+
HUGINN_DATABASE_ADAPTER: postgresql
32+
HUGINN_DATABASE_ENCODING: utf8
33+
{{- else }}
34+
HUGINN_DATABASE_NAME: {{ (required "database.name is required" .Values.database.name) | quote }}
35+
HUGINN_DATABASE_HOST: {{ (required "database.host is required" .Values.database.host) | quote }}
36+
HUGINN_DATABASE_PORT: {{ (required "database.port is required" .Values.database.port) | quote }}
37+
{{- end }}

‎huginn/templates/secret.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,13 @@ metadata:
77
data:
88
HUGINN_SEED_USERNAME: {{ .Values.seed.username | b64enc | quote }}
99
HUGINN_SEED_PASSWORD: {{ .Values.seed.password | b64enc | quote }}
10+
{{- if .Values.mysql.deployChart }}
1011
HUGINN_DATABASE_USERNAME: {{ .Values.mysql.auth.username | b64enc | quote }}
1112
HUGINN_DATABASE_PASSWORD: {{ .Values.mysql.auth.password | b64enc | quote }}
13+
{{- else if .Values.postgresql.deployChart }}
14+
HUGINN_DATABASE_USERNAME: {{ .Values.postgresql.postgresqlUsername | b64enc | quote }}
15+
HUGINN_DATABASE_PASSWORD: {{ .Values.postgresql.postgresqlPassword | b64enc | quote }}
16+
{{- else }}
17+
HUGINN_DATABASE_USERNAME: {{ (required "database.username is required" .Values.database.username) | b64enc | quote }}
18+
HUGINN_DATABASE_PASSWORD: {{ (required "database.password is required" .Values.database.password) | b64enc | quote }}
19+
{{- end }}

‎huginn/values.yaml

+20-1
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,16 @@ seed:
100100
username: admin
101101
password: ChangeMe!
102102

103+
database:
104+
type: ""
105+
host:
106+
name:
107+
username:
108+
password:
109+
port:
110+
103111
mysql:
104-
install: true
112+
deployChart: true
105113
volumePermissions:
106114
enabled: true
107115
primary:
@@ -112,3 +120,14 @@ mysql:
112120
username: huginn
113121
password: ChangeMe!
114122
rootPassword: DefinitelyChangeMe!
123+
124+
postgresql:
125+
deployChart: false
126+
volumePermissions:
127+
enabled: true
128+
service:
129+
port: 5432
130+
postgresqlPostgresPassword: DefinitelyChangeMe!
131+
postgresqlUsername: huginn
132+
postgresqlPassword: ChangeMe!
133+
postgresqlDatabase: huginn

0 commit comments

Comments
 (0)