Skip to content

Commit

Permalink
revert: integrated dbs and add tests (#228)
Browse files Browse the repository at this point in the history
This reverts commit 48c5657 and 7bbbb37. These commits introduced a packaging error that was undetected by chart-testing and can only be detected by chart-releaser. This also adds a test to ensure the chart can be packaged.
  • Loading branch information
james-d-elliott committed Apr 18, 2024
1 parent 96ab137 commit bbbd05d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 92 deletions.
9 changes: 9 additions & 0 deletions .buildkite/pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ steps:
charts: "true"
if: build.branch != "gh-pages" && build.env("CHART_CHANGES") == "true"

- command: "ct --config .buildkite/ct.yaml list-changed --since HEAD~1 | xargs -n1 cr --config .buildkite/cr.yaml package"
key: "package-test"
label: ":package: Package Chart (Chart Releaser)"
artifact_paths:
- ".cr-release-packages/*"
agents:
charts: "true"
if: build.branch != "gh-pages" && build.branch != "master" && build.env("CHART_CHANGES") == "true"

- wait: ~
continue_on_failure: true
if: build.branch == "master" && build.env("CHART_CHANGES") == "true"
Expand Down
14 changes: 1 addition & 13 deletions charts/authelia/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,7 @@ home: https://www.authelia.com
sources:
- https://github.com/authelia/chartrepo/tree/master/charts/authelia
- https://www.github.com/authelia/authelia
dependencies:
- name: postgresql
version: ~15.1.4
repository: https://charts.bitnami.com/bitnami
condition: storage.postgres.deploy
- name: mariadb
version: ~17.0.1
repository: https://charts.bitnami.com/bitnami
condition: storage.mysql.deploy
- name: redis
version: ~19.0.2
repository: https://charts.bitnami.com/bitnami
condition: session.redis.deploy
dependencies: []
maintainers:
- name: james-d-elliott
email: james-d-elliott@users.noreply.github.com
Expand Down
11 changes: 3 additions & 8 deletions charts/authelia/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
not recommended at this stage for production environments without manual intervention to check the templated manifests
match your desired state.

This chart uses api version 2 which is only supported by helm v3+. This chart includes Bitnami subcharts to optionally
deploy `redis`, `postgresql` and/or `mariadb`.
This chart uses api version 2 which is only supported by helm v3+. This is a ***standalone*** chart intended just to
deploy *Authelia* on its own. Eventually we may publish an `authelia-bundle` chart which includes `redis` and
`postgresql`.

# Breaking Changes

Expand Down Expand Up @@ -154,23 +155,17 @@ values.yaml is based on the *Authelia* configuration. See the
| configMap.authentication_backend.ldap.enabled | Enables LDAP auth when generating the config | true |
| configMap.authentication_backend.file.enabled | Enables file auth when generating the config | false |
| configMap.session.redis.enabled | Enables redis session storage when generating the config | true |
| configMap.session.redis.deploy | Deploy a redis instance | false |
| configMap.session.redis.enabledSecret | Forces redis password auth using a secret if true | false |
| configMap.session.redis.high_availability.enabled | Enables redis sentinel when generating the config | false |
| configMap.session.redis.high_availability.enabledSecret | Forces sentinel password auth using a secret if true | false |
| configMap.storage.local.enabled | Enables the SQLite3 storage provider | false |
| configMap.storage.mysql.enabled | Enables the MySQL storage provider | false |
| configMap.storage.mysql.deploy | Deploy a MariaDB instance | false |
| configMap.storage.postgres.enabled | Enables the PostgreSQL storage provider | true |
| configMap.storage.postgres.deploy | Deploy a PostgreSQL instance | false |
| configMap.notifier.filesystem.enabled | Enables the filesystem notification provider | false |
| configMap.notifier.smtp.enabled | Enables the SMTP notification provider | true |
| configMap.notifier.smtp.enabledSecret | Forces smtp password auth using a secret if true | false |
| configMap.identity_providers.oidc.enabled | Enables the OpenID Connect Idp | false |

If any of `configMap.session.redis.deploy`, `configMap.storage.mysql.deploy` or `configMap.storage.postgres.deploy` are
enabled, the corresponding top-level `redis`, `mariadb` or `postgresql` sections must be configured.

## Secret

The secret section defines how the secret values are added to Authelia. All values that can be a secret are forced as
Expand Down
72 changes: 1 addition & 71 deletions charts/authelia/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1149,7 +1149,6 @@ configMap:
## The redis connection details
redis:
enabled: false
deploy: false
enabledSecret: false
host: 'redis.databases.svc.cluster.local'
port: 6379
Expand Down Expand Up @@ -1309,7 +1308,6 @@ configMap:
##
mysql:
enabled: false
deploy: false
address: 'tcp://mysql.databases.svc.cluster.local:3306'
timeout: '5 seconds'
database: 'authelia'
Expand Down Expand Up @@ -1355,7 +1353,6 @@ configMap:
##
postgres:
enabled: false
deploy: false
address: 'tcp://postgres.databases.svc.cluster.local:5432'
timeout: '5 seconds'
database: 'authelia'
Expand Down Expand Up @@ -1849,71 +1846,4 @@ persistence:
size: '100Mi'

selector: {}

# -- Configure mariadb database subchart under this key.
# This will be deployed when storage.mysql.deploy is set to true
# Currently settings need to be manually copied from here to the storage.mysql section
# For more options see [mariadb chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/mariadb)
mariadb:
architecture: standalone
auth:
database: authelia
username: authelia
password: authelia
rootPassword: authelia
primary:
resources: {}
persistence:
enabled: false
size: 1Gi
# storageClass: ""

# -- Configure postgresql database subchart under this key.
# This will be deployed when storage.postgres.deploy is set to true
# Currently settings need to be manually copied from here to the storage.postgres section
# For more options see [postgresql chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/postgresql)
postgresql:
auth:
postgresPassword: authelia
username: authelia
password: authelia
database: authelia
primary:
persistence:
enabled: false
# storageClass: ""
size: 1Gi
resources: {}

# -- Configure redis database subchart under this key.
# This will be deployed when session.redis.deploy is set to true
# Currently settings need to be manually copied from here to the session.redis section
# For more options see [redis chart documentation](https://github.com/bitnami/charts/tree/main/bitnami/redis)
redis:
architecture: standalone
auth:
enabled: false
sentinel: true
password: "redis"
existingSecret: ""
existingSecretPasswordKey: ""
usePasswordFiles: false
master:
resources: {}
priorityClassName: ""
persistence:
enabled: false
# storageClass: ""
accessModes:
- ReadWriteOnce
size: 1Gi
replica:
replicaCount: 3
resources: {}
priorityClassName: ""
persistence:
enabled: false
# storageClass: ""
accessModes:
- ReadWriteOnce
size: 1Gi
...

0 comments on commit bbbd05d

Please sign in to comment.