From 72b8baa6e152985994e843face144117fc57b438 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Tue, 18 Apr 2023 11:20:25 -0400 Subject: [PATCH] actually disabled oidc --- .../authelia/templates/secert-authellia.yaml | 2 +- k8s/apps/authelia/values.yaml | 2 +- k8s/argoapps/chart-values/prometheus.yaml | 22 +++++++++++++++++++ k8s/argoapps/values.yaml | 20 +++++++++++++++++ 4 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 k8s/argoapps/chart-values/prometheus.yaml diff --git a/k8s/apps/authelia/templates/secert-authellia.yaml b/k8s/apps/authelia/templates/secert-authellia.yaml index 1315e51..e9e12e8 100644 --- a/k8s/apps/authelia/templates/secert-authellia.yaml +++ b/k8s/apps/authelia/templates/secert-authellia.yaml @@ -4,7 +4,7 @@ kind: Secret metadata: name: "{{ .Values.authelia.secret.existingSecret }}" annotations: - secret-generator.v1.mittwald.de/autogenerate: SESSION_ENCRYPTION_KEY,REDIS_PASSWORD,JWT_TOKEN,STORAGE_ENCRYPTION_KEY,OIDC_PRIVATE_KEY,OIDC_HMAC_SECRET + secret-generator.v1.mittwald.de/autogenerate: SESSION_ENCRYPTION_KEY,REDIS_PASSWORD,JWT_TOKEN,STORAGE_ENCRYPTION_KEY data: dummy_values: "" type: Opaque diff --git a/k8s/apps/authelia/values.yaml b/k8s/apps/authelia/values.yaml index 3b94458..55ca5e7 100644 --- a/k8s/apps/authelia/values.yaml +++ b/k8s/apps/authelia/values.yaml @@ -104,7 +104,7 @@ authelia: identity_providers: oidc: - enabled: true + enabled: false access_token_lifespan: 8h authorize_code_lifespan: 1m id_token_lifespan: 1h diff --git a/k8s/argoapps/chart-values/prometheus.yaml b/k8s/argoapps/chart-values/prometheus.yaml new file mode 100644 index 0000000..4f48c57 --- /dev/null +++ b/k8s/argoapps/chart-values/prometheus.yaml @@ -0,0 +1,22 @@ +configmapReload: + prometheus: + enabled: false +alertmanager: + persistence: + enabled: true + storageClass: "{{ .Values.global.nfs.storageClass }}" + existingClaim: "{{ .Values.storage.alertmanager.name }}" + ingress: + enabled: false +server: +{{ if .Values.global.tls.enabled }} + baseURL: "https://{{$prometheusHost}}.{{ .Values.global.domain }}" +{{ else }} + baseURL: "http://{{$prometheusHost}}.{{ .Values.global.domain }}" +{{ end }} + persistentVolume: + enabled: true + storageClass: "{{ .Values.global.nfs.storageClass }}" + existingClaim: "{{ .Values.storage.prometheus.name }}" + ingress: + enabled: false \ No newline at end of file diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index 61099e0..f6248d7 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -229,3 +229,23 @@ storage: storage: 100Gi requests: storage: 10Gi + prometheus: + name: prometheus + namespace: chart-prometheus + accessModes: + - ReadWriteMany + resources: + limits: + storage: 100Gi + requests: + storage: 10Gi + alertmanager: + name: alertmanager + namespace: chart-prometheus + accessModes: + - ReadWriteMany + resources: + limits: + storage: 100Gi + requests: + storage: 10Gi