Make domains in autheliarules a list and add db-wait-initcontainer to vaultwarden and fireflyiii

This commit is contained in:
kjeld Schouten-Lebbing
2021-09-01 18:38:03 +02:00
parent 87e22f2d88
commit 3b6d315edb
10 changed files with 76 additions and 8 deletions
+1 -1
View File
@@ -38,4 +38,4 @@ sources:
- https://github.com/authelia/chartrepo
- https://github.com/authelia/authelia
type: application
version: 1.6.15
version: 1.6.16
+11 -5
View File
@@ -15,7 +15,7 @@ groups:
description: "Ingress Configuration"
- name: "Security and Permissions"
description: "Configure security context and permissions"
- name: "Resources and Devices"
- name: "Resources and Devices"
description: "Specify resources/devices to be allocated to workload"
- name: "Advanced"
description: "Advanced Configuration"
@@ -859,12 +859,18 @@ questions:
type: dict
attrs:
- variable: domain
label: "Domain"
label: "Domains"
description: "defines which domain or set of domains the rule applies to."
schema:
type: string
default: ""
required: true
type: list
default: []
items:
- variable: domainEntry
label: "Domain"
schema:
type: string
default: ""
required: true
- variable: policy
label: "Policy"
description: "The policy to apply to resources. It must be either 'bypass', 'one_factor', 'two_factor' or 'deny'."
+1 -1
View File
@@ -27,4 +27,4 @@ name: fireflyiii
sources:
- https://github.com/firefly-iii/firefly-iii/
type: application
version: 6.1.4
version: 6.1.5
@@ -9,6 +9,21 @@ image:
pullPolicy: IfNotPresent
tag: version-5.5.12
initContainers:
- name: init-postgresdb
image: postgres:13.1
command:
- "sh"
- "-c"
- "until pg_isready -U authelia -h ${pghost} ; do sleep 2 ; done"
imagePullPolicy: IfNotPresent
env:
- name: pghost
valueFrom:
secretKeyRef:
name: dbcreds
key: plainhost
probes:
liveness:
path: "/login"
@@ -16,4 +16,5 @@ data:
{{- end }}
url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }}
postgresql_host: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }}
plainhost: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }}
type: Opaque
+15
View File
@@ -28,6 +28,21 @@ service:
port: 51080
protocol: TCP
initContainers:
- name: init-postgresdb
image: postgres:13.1
command:
- "sh"
- "-c"
- "until pg_isready -U authelia -h ${pghost} ; do sleep 2 ; done"
imagePullPolicy: IfNotPresent
env:
- name: pghost
valueFrom:
secretKeyRef:
name: dbcreds
key: plainhost
probes:
liveness:
path: "/login"
+1 -1
View File
@@ -31,4 +31,4 @@ name: vaultwarden
sources:
- https://github.com/dani-garcia/vaultwarden
type: application
version: 6.1.4
version: 6.1.5
@@ -18,6 +18,21 @@ envFrom:
- secretRef:
name: vaultwardensecret
initContainers:
- name: init-postgresdb
image: postgres:13.1
command:
- "sh"
- "-c"
- "until pg_isready -U authelia -h ${pghost} ; do sleep 2 ; done"
imagePullPolicy: IfNotPresent
env:
- name: pghost
valueFrom:
secretKeyRef:
name: dbcreds
key: plainhost
envValueFrom:
DATABASE_URL:
@@ -55,5 +55,6 @@ data:
postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }}
{{- end }}
url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }}
plainhost: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }}
type: Opaque
{{- end -}}
+15
View File
@@ -21,6 +21,21 @@ service:
env: {}
initContainers:
- name: init-postgresdb
image: postgres:13.1
command:
- "sh"
- "-c"
- "until pg_isready -U authelia -h ${pghost} ; do sleep 2 ; done"
imagePullPolicy: IfNotPresent
env:
- name: pghost
valueFrom:
secretKeyRef:
name: dbcreds
key: plainhost
envTpl:
DOMAIN: "https://{{ if .Values.ingress }}{{ if .Values.ingress.main.enabled }}{{ ( index .Values.ingress.main.hosts 0 ).host }}{{ else }}placeholder.com{{ end }}{{ else }}placeholder.com{{ end }}"