From 2f3388a00845b79f96f5086573945a73cdafb2a6 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 28 Mar 2023 15:59:40 +0000 Subject: [PATCH] updated authentik --- bin/dryrun-app.sh | 6 ++++ k8s/infra/authentik/Chart.yaml | 1 + .../authentik/templates/certificate.yaml | 4 +-- k8s/infra/authentik/templates/secert-db.yaml | 2 +- k8s/infra/authentik/values.yaml | 28 ++++--------------- k8s/infra/ingresses/values.yaml | 4 +++ 6 files changed, 20 insertions(+), 25 deletions(-) diff --git a/bin/dryrun-app.sh b/bin/dryrun-app.sh index 757b77e..b36b4be 100755 --- a/bin/dryrun-app.sh +++ b/bin/dryrun-app.sh @@ -17,6 +17,12 @@ pushd $full_path &> /dev/null helm dependency update &> /dev/null popd &> /dev/null +if [ -f "$tmp_path" ]; then + echo "found existing file" + echo "renaming old file to "$tmp_path".old" + mv $tmp_path $tmp_path".old" +fi + helm template $app $full_path --namespace $app \ --debug \ --values $argocd_values_path \ diff --git a/k8s/infra/authentik/Chart.yaml b/k8s/infra/authentik/Chart.yaml index 6f1326b..a69131a 100644 --- a/k8s/infra/authentik/Chart.yaml +++ b/k8s/infra/authentik/Chart.yaml @@ -7,3 +7,4 @@ dependencies: - name: authentik repository: https://charts.goauthentik.io version: "2023.3.1" + alias: authentikSettings diff --git a/k8s/infra/authentik/templates/certificate.yaml b/k8s/infra/authentik/templates/certificate.yaml index 3f6fd95..d2ad990 100644 --- a/k8s/infra/authentik/templates/certificate.yaml +++ b/k8s/infra/authentik/templates/certificate.yaml @@ -9,7 +9,7 @@ spec: issuerRef: kind: ClusterIssuer name: "{{ .Values.global.tls.issuer }}" - commonName: "authentik.core.{{.Values.authelia.domain}}" + commonName: "authentik.core.{{.Values.global.domain}}" dnsNames: - - "authentik.core.{{.Values.authelia.domain}}" + - "authentik.core.{{.Values.global.domain}}" {{ end }} diff --git a/k8s/infra/authentik/templates/secert-db.yaml b/k8s/infra/authentik/templates/secert-db.yaml index 033272d..7f88e3b 100644 --- a/k8s/infra/authentik/templates/secert-db.yaml +++ b/k8s/infra/authentik/templates/secert-db.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: "authentik-env" - # annotations: + annotations: secret-generator.v1.mittwald.de/autogenerate: AUTHENTIK_SECRET_KEY data: AUTHENTIK_POSTGRESQL__USER: "authentik" diff --git a/k8s/infra/authentik/values.yaml b/k8s/infra/authentik/values.yaml index 33a055b..3da7235 100644 --- a/k8s/infra/authentik/values.yaml +++ b/k8s/infra/authentik/values.yaml @@ -1,26 +1,10 @@ -authentik: - authentik: - secret_key: "changeme" - error_reporting: - enabled: true - envFrom: - - secretRef: - name: authentik-env - - ingress: - enabled: true - ingressClassName: traefik - hosts: - - host: authentik.core.home.sosnovsky.ca - paths: - - path: "/" - pathType: Prefix - tls: - - hosts: - - authentik.core.home.sosnovsky.ca - secretName: authentik-tls - +authentik: {} +authentikSettings: + nameOverride: "authentik" postgresql: enabled: false redis: enabled: true + envFrom: + - secretRef: + name: authentik-env diff --git a/k8s/infra/ingresses/values.yaml b/k8s/infra/ingresses/values.yaml index 30495fb..3082e44 100644 --- a/k8s/infra/ingresses/values.yaml +++ b/k8s/infra/ingresses/values.yaml @@ -14,6 +14,10 @@ services: port: 8080 annotations: traefik.ingress.kubernetes.io/router.middlewares: app-nextcloud-nextcloud@kubernetescrd + - prefix: "authentik.core" + service: "authentik" + namespace: "authentik" + port: 80 global: {} acmeServer: "https://acme-staging-v02.api.letsencrypt.org/directory" skipTLSVerify: "false"