From 226d0c88dd0a65c439dc92d92faa1ac8c4a73e32 Mon Sep 17 00:00:00 2001 From: WrenIX Date: Thu, 21 Dec 2023 11:28:05 +0100 Subject: [PATCH] feat: driftDetection (+ cleanup interval) --- base-values/commons.yaml | 2 ++ base/templates/release.yaml | 4 +++- base/values.yaml | 1 + infra-certificates/templates/certmanager/release.yaml | 5 +++-- infra-certificates/templates/certmanager/repo.yaml | 2 +- infra-certificates/values.yaml | 2 ++ infra-ingress/templates/traefik/release.yaml | 5 +++-- infra-ingress/templates/traefik/repo.yaml | 2 +- infra-ingress/values.yaml | 1 + infra-logging/templates/logging-operator/release.yaml | 5 +++-- infra-logging/templates/logging-operator/repo.yaml | 2 +- infra-logging/templates/loki/release.yaml | 5 +++-- infra-logging/templates/loki/repo.yaml | 2 +- infra-logging/values.yaml | 1 + .../templates/alertmanager/authentik-application.yaml | 5 +++-- infra-monitoring/templates/alertmanager/matrix/release.yaml | 6 ++++-- infra-monitoring/templates/alertmanager/ntfy/release.yaml | 6 ++++-- infra-monitoring/templates/exporter/blackbox/release.yaml | 3 ++- .../templates/grafana/authentik-application.yaml | 5 +++-- infra-monitoring/templates/karma/authentik-application.yaml | 5 +++-- infra-monitoring/templates/karma/release.yaml | 5 +++-- infra-monitoring/templates/karma/repo.yaml | 2 +- .../templates/kube-prometheus-stack/release.yaml | 5 +++-- .../templates/prometheus/authentik-application.yaml | 5 +++-- infra-monitoring/templates/repo.yaml | 2 +- infra-monitoring/values.yaml | 1 + infra-trivy/templates/release.yaml | 5 +++-- infra-trivy/templates/repo.yaml | 2 +- infra-trivy/values.yaml | 1 + mycloud-authentik/templates/release.yaml | 5 +++-- mycloud-authentik/templates/repo.yaml | 2 +- mycloud-authentik/values.yaml | 1 + mycloud-services/templates/postgresql/release.yaml | 5 +++-- mycloud-services/values.yaml | 1 + 34 files changed, 71 insertions(+), 40 deletions(-) diff --git a/base-values/commons.yaml b/base-values/commons.yaml index 4a9fea3..8f30ee4 100644 --- a/base-values/commons.yaml +++ b/base-values/commons.yaml @@ -11,6 +11,8 @@ commons: remediation: retries: -1 crds: CreateReplace + driftDetection: + mode: enabled ingress: domain: "wrenix.eu" diff --git a/base/templates/release.yaml b/base/templates/release.yaml index 5358cea..31eb577 100644 --- a/base/templates/release.yaml +++ b/base/templates/release.yaml @@ -2,7 +2,7 @@ {{- if ($config.enabled | default false) }} {{- $componentName := $config.name | default $componentInstance }} --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: "{{ $.Release.Name }}-{{ $componentInstance }}" @@ -21,6 +21,8 @@ spec: {{- toYaml $.Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml $.Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml $.Values.commons.helm.release.driftDetection | nindent 4 }} interval: {{ $.Values.componentCommons.helm.release.interval }} valuesFrom: - kind: ConfigMap diff --git a/base/values.yaml b/base/values.yaml index 98eba04..c977dae 100644 --- a/base/values.yaml +++ b/base/values.yaml @@ -9,6 +9,7 @@ commons: install: {} test: {} upgrade: {} + driftDetection: {} componentCommons: helm: diff --git a/infra-certificates/templates/certmanager/release.yaml b/infra-certificates/templates/certmanager/release.yaml index 8efd256..be0f59b 100644 --- a/infra-certificates/templates/certmanager/release.yaml +++ b/infra-certificates/templates/certmanager/release.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: cert-manager @@ -10,13 +10,14 @@ spec: kind: HelmRepository name: jetstack chart: cert-manager - interval: 10m install: {{- toYaml .Values.commons.helm.release.install | nindent 4 }} test: {{- toYaml .Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }} interval: 10m values: installCRDs: true diff --git a/infra-certificates/templates/certmanager/repo.yaml b/infra-certificates/templates/certmanager/repo.yaml index 30fea54..dc21bd2 100644 --- a/infra-certificates/templates/certmanager/repo.yaml +++ b/infra-certificates/templates/certmanager/repo.yaml @@ -5,4 +5,4 @@ metadata: name: jetstack spec: url: https://charts.jetstack.io - interval: 10m0s + interval: 10m diff --git a/infra-certificates/values.yaml b/infra-certificates/values.yaml index c55d95e..f3c4202 100644 --- a/infra-certificates/values.yaml +++ b/infra-certificates/values.yaml @@ -8,6 +8,8 @@ commons: install: {} test: {} upgrade: {} + driftDetection: {} + prometheus: monitor: labels: {} diff --git a/infra-ingress/templates/traefik/release.yaml b/infra-ingress/templates/traefik/release.yaml index c241add..538e576 100644 --- a/infra-ingress/templates/traefik/release.yaml +++ b/infra-ingress/templates/traefik/release.yaml @@ -1,6 +1,6 @@ {{- if (eq .Values.controller "traefik") }} --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: traefik @@ -11,13 +11,14 @@ spec: kind: HelmRepository name: traefik chart: traefik - interval: 30m install: {{- toYaml .Values.commons.helm.release.install | nindent 4 }} test: {{- toYaml .Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }} interval: 10m values: deployment: diff --git a/infra-ingress/templates/traefik/repo.yaml b/infra-ingress/templates/traefik/repo.yaml index f61dc75..b751c6e 100644 --- a/infra-ingress/templates/traefik/repo.yaml +++ b/infra-ingress/templates/traefik/repo.yaml @@ -6,5 +6,5 @@ metadata: name: traefik spec: url: https://helm.traefik.io/traefik - interval: 12h + interval: 10m {{- end }} diff --git a/infra-ingress/values.yaml b/infra-ingress/values.yaml index 22c9b9c..a8cdc56 100644 --- a/infra-ingress/values.yaml +++ b/infra-ingress/values.yaml @@ -8,6 +8,7 @@ commons: install: {} test: {} upgrade: {} + driftDetection: {} ingress: domain: "wrenix.eu" diff --git a/infra-logging/templates/logging-operator/release.yaml b/infra-logging/templates/logging-operator/release.yaml index 0af2fb7..430d674 100644 --- a/infra-logging/templates/logging-operator/release.yaml +++ b/infra-logging/templates/logging-operator/release.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: logging-operator @@ -10,13 +10,14 @@ spec: kind: HelmRepository name: kube-logging chart: logging-operator - interval: 10m install: {{- toYaml .Values.commons.helm.release.install | nindent 4 }} test: {{- toYaml .Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }} interval: 10m values: monitoring: diff --git a/infra-logging/templates/logging-operator/repo.yaml b/infra-logging/templates/logging-operator/repo.yaml index d8d6536..b91e335 100644 --- a/infra-logging/templates/logging-operator/repo.yaml +++ b/infra-logging/templates/logging-operator/repo.yaml @@ -6,4 +6,4 @@ metadata: spec: url: oci://ghcr.io/kube-logging/helm-charts type: oci - interval: 10m0s + interval: 10m diff --git a/infra-logging/templates/loki/release.yaml b/infra-logging/templates/loki/release.yaml index e13429d..eab0dc3 100644 --- a/infra-logging/templates/loki/release.yaml +++ b/infra-logging/templates/loki/release.yaml @@ -1,6 +1,6 @@ {{- if .Values.loki.enabled }} --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: loki @@ -11,13 +11,14 @@ spec: kind: HelmRepository name: grafana chart: loki - interval: 10m install: {{- toYaml .Values.commons.helm.release.install | nindent 4 }} test: {{- toYaml .Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }} interval: 10m values: singleBinary: diff --git a/infra-logging/templates/loki/repo.yaml b/infra-logging/templates/loki/repo.yaml index f26d019..9478bfd 100644 --- a/infra-logging/templates/loki/repo.yaml +++ b/infra-logging/templates/loki/repo.yaml @@ -6,5 +6,5 @@ metadata: name: grafana spec: url: https://grafana.github.io/helm-charts - interval: 10m0s + interval: 10m {{- end }} diff --git a/infra-logging/values.yaml b/infra-logging/values.yaml index fc8b38d..68ac15e 100644 --- a/infra-logging/values.yaml +++ b/infra-logging/values.yaml @@ -8,6 +8,7 @@ commons: install: {} test: {} upgrade: {} + driftDetection: {} grafana: datasource: diff --git a/infra-monitoring/templates/alertmanager/authentik-application.yaml b/infra-monitoring/templates/alertmanager/authentik-application.yaml index 0311a2f..dcdcd94 100644 --- a/infra-monitoring/templates/alertmanager/authentik-application.yaml +++ b/infra-monitoring/templates/alertmanager/authentik-application.yaml @@ -3,7 +3,7 @@ .Values.alertmanager.ingress.enabled }} --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: authentik-application-alertmanager @@ -16,7 +16,6 @@ spec: namespace: "flux-system" chart: "./authentik-application" reconcileStrategy: "Revision" - interval: 10m releaseName: authentik-application-infra-alertmanager targetNamespace: {{ .Values.commons.auth.namespace }} install: @@ -25,6 +24,8 @@ spec: {{- toYaml .Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }} interval: 10m values: {{- $domain := .Values.alertmanager.ingress.host | default (printf "alertmanager.%s" .Values.commons.ingress.domain) }} diff --git a/infra-monitoring/templates/alertmanager/matrix/release.yaml b/infra-monitoring/templates/alertmanager/matrix/release.yaml index 836a050..5fd0519 100644 --- a/infra-monitoring/templates/alertmanager/matrix/release.yaml +++ b/infra-monitoring/templates/alertmanager/matrix/release.yaml @@ -1,7 +1,7 @@ {{- with .Values.alertmanager.receiver.matrix }} {{- if .enabled }} --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: "alertmanager-matrix" @@ -20,7 +20,9 @@ spec: {{- toYaml $.Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml $.Values.commons.helm.release.upgrade | nindent 4 }} - interval: 5m + driftDetection: + {{- toYaml $.Values.commons.helm.release.driftDetection | nindent 4 }} + interval: 10m valuesFrom: - kind: Secret name: "global-alertmanager-matrix-token" diff --git a/infra-monitoring/templates/alertmanager/ntfy/release.yaml b/infra-monitoring/templates/alertmanager/ntfy/release.yaml index 929bb96..f2f2868 100644 --- a/infra-monitoring/templates/alertmanager/ntfy/release.yaml +++ b/infra-monitoring/templates/alertmanager/ntfy/release.yaml @@ -1,7 +1,7 @@ {{- with .Values.alertmanager.receiver.ntfy }} {{- if .enabled }} --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: "alertmanager-ntfy" @@ -20,7 +20,9 @@ spec: {{- toYaml $.Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml $.Values.commons.helm.release.upgrade | nindent 4 }} - interval: 5m + driftDetection: + {{- toYaml $.Values.commons.helm.release.driftDetection | nindent 4 }} + interval: 10m valuesFrom: - kind: Secret name: "global-alertmanager-ntfy-auth" diff --git a/infra-monitoring/templates/exporter/blackbox/release.yaml b/infra-monitoring/templates/exporter/blackbox/release.yaml index ff53134..6dce996 100644 --- a/infra-monitoring/templates/exporter/blackbox/release.yaml +++ b/infra-monitoring/templates/exporter/blackbox/release.yaml @@ -11,13 +11,14 @@ spec: kind: HelmRepository name: "prometheus-community" chart: "prometheus-blackbox-exporter" - interval: 10m install: {{- toYaml .Values.commons.helm.release.install | nindent 4 }} test: {{- toYaml .Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }} interval: 10m values: diff --git a/infra-monitoring/templates/grafana/authentik-application.yaml b/infra-monitoring/templates/grafana/authentik-application.yaml index 49e766f..d5008f0 100644 --- a/infra-monitoring/templates/grafana/authentik-application.yaml +++ b/infra-monitoring/templates/grafana/authentik-application.yaml @@ -3,7 +3,7 @@ .Values.grafana.ingress.enabled }} --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: authentik-application-grafana @@ -16,7 +16,6 @@ spec: namespace: "flux-system" chart: "./authentik-application" reconcileStrategy: "Revision" - interval: 10m releaseName: authentik-application-infra-grafana targetNamespace: {{ .Values.commons.auth.namespace }} install: @@ -25,6 +24,8 @@ spec: {{- toYaml .Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }} interval: 10m values: {{- $url := default (printf "grafana.%s" .Values.commons.ingress.domain) .Values.grafana.ingress.host }} diff --git a/infra-monitoring/templates/karma/authentik-application.yaml b/infra-monitoring/templates/karma/authentik-application.yaml index cce7f9d..e443e13 100644 --- a/infra-monitoring/templates/karma/authentik-application.yaml +++ b/infra-monitoring/templates/karma/authentik-application.yaml @@ -3,7 +3,7 @@ .Values.karma.enabled }} --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: authentik-application-karma @@ -16,7 +16,6 @@ spec: namespace: "flux-system" chart: "./authentik-application" reconcileStrategy: "Revision" - interval: 10m releaseName: authentik-application-infra-karma targetNamespace: {{ .Values.commons.auth.namespace }} install: @@ -25,6 +24,8 @@ spec: {{- toYaml .Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }} interval: 10m values: {{- $domain := .Values.karma.ingress.host | default (printf "karma.%s" .Values.commons.ingress.domain) }} diff --git a/infra-monitoring/templates/karma/release.yaml b/infra-monitoring/templates/karma/release.yaml index 4b5f29d..9250819 100644 --- a/infra-monitoring/templates/karma/release.yaml +++ b/infra-monitoring/templates/karma/release.yaml @@ -1,6 +1,6 @@ {{- if .Values.karma.enabled }} --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: karma @@ -11,13 +11,14 @@ spec: kind: HelmRepository name: "wiremind" chart: "karma" - interval: 10m install: {{- toYaml .Values.commons.helm.release.install | nindent 4 }} test: {{- toYaml .Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }} interval: 10m values: configMap: diff --git a/infra-monitoring/templates/karma/repo.yaml b/infra-monitoring/templates/karma/repo.yaml index d408c6e..aba395a 100644 --- a/infra-monitoring/templates/karma/repo.yaml +++ b/infra-monitoring/templates/karma/repo.yaml @@ -5,4 +5,4 @@ metadata: name: wiremind spec: url: https://wiremind.github.io/wiremind-helm-charts - interval: 10m0s + interval: 10m diff --git a/infra-monitoring/templates/kube-prometheus-stack/release.yaml b/infra-monitoring/templates/kube-prometheus-stack/release.yaml index d5530ff..48413d9 100644 --- a/infra-monitoring/templates/kube-prometheus-stack/release.yaml +++ b/infra-monitoring/templates/kube-prometheus-stack/release.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: kube-prometheus-stack @@ -10,13 +10,14 @@ spec: kind: HelmRepository name: "prometheus-community" chart: "kube-prometheus-stack" - interval: 10m install: {{- toYaml .Values.commons.helm.release.install | nindent 4 }} test: {{- toYaml .Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }} interval: 10m values: commonLabels: diff --git a/infra-monitoring/templates/prometheus/authentik-application.yaml b/infra-monitoring/templates/prometheus/authentik-application.yaml index e15d4f9..c663435 100644 --- a/infra-monitoring/templates/prometheus/authentik-application.yaml +++ b/infra-monitoring/templates/prometheus/authentik-application.yaml @@ -3,7 +3,7 @@ .Values.prometheus.ingress.enabled }} --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: authentik-application-prometheus @@ -16,7 +16,6 @@ spec: namespace: "flux-system" chart: "./authentik-application" reconcileStrategy: "Revision" - interval: 10m releaseName: authentik-application-infra-prometheus targetNamespace: {{ .Values.commons.auth.namespace }} install: @@ -25,6 +24,8 @@ spec: {{- toYaml .Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }} interval: 10m values: {{- $domain := .Values.prometheus.ingress.host | default (printf "prometheus.%s" .Values.commons.ingress.domain) }} diff --git a/infra-monitoring/templates/repo.yaml b/infra-monitoring/templates/repo.yaml index 1c90ca8..fda32a6 100644 --- a/infra-monitoring/templates/repo.yaml +++ b/infra-monitoring/templates/repo.yaml @@ -5,4 +5,4 @@ metadata: name: prometheus-community spec: url: https://prometheus-community.github.io/helm-charts/ - interval: 10m0s + interval: 10m diff --git a/infra-monitoring/values.yaml b/infra-monitoring/values.yaml index a74e73c..352ff22 100644 --- a/infra-monitoring/values.yaml +++ b/infra-monitoring/values.yaml @@ -18,6 +18,7 @@ commons: install: {} test: {} upgrade: {} + driftDetection: {} ingress: domain: "wrenix.eu" diff --git a/infra-trivy/templates/release.yaml b/infra-trivy/templates/release.yaml index 5131194..d0aaad4 100644 --- a/infra-trivy/templates/release.yaml +++ b/infra-trivy/templates/release.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: trivy-operator @@ -11,13 +11,14 @@ spec: name: "aqua" chart: "trivy-operator" version: "0.18.4" - interval: 10m install: {{- toYaml .Values.commons.helm.release.install | nindent 4 }} test: {{- toYaml .Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }} interval: 10m postRenderers: - kustomize: diff --git a/infra-trivy/templates/repo.yaml b/infra-trivy/templates/repo.yaml index c98c096..9e66df4 100644 --- a/infra-trivy/templates/repo.yaml +++ b/infra-trivy/templates/repo.yaml @@ -5,4 +5,4 @@ metadata: name: aqua spec: url: https://aquasecurity.github.io/helm-charts/ - interval: 10m0s + interval: 10m diff --git a/infra-trivy/values.yaml b/infra-trivy/values.yaml index 2f5e5af..9657ac9 100644 --- a/infra-trivy/values.yaml +++ b/infra-trivy/values.yaml @@ -8,6 +8,7 @@ commons: install: {} test: {} upgrade: {} + driftDetection: {} prometheus: alertmanager: diff --git a/mycloud-authentik/templates/release.yaml b/mycloud-authentik/templates/release.yaml index 4d381d6..b275c68 100644 --- a/mycloud-authentik/templates/release.yaml +++ b/mycloud-authentik/templates/release.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: "{{ .Release.Name }}-hr" @@ -10,13 +10,14 @@ spec: kind: HelmRepository name: "authentik" chart: "authentik" - interval: 10m install: {{- toYaml .Values.commons.helm.release.install | nindent 4 }} test: {{- toYaml .Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }} interval: 10m values: authentik: diff --git a/mycloud-authentik/templates/repo.yaml b/mycloud-authentik/templates/repo.yaml index ebc4ac2..2bcaf32 100644 --- a/mycloud-authentik/templates/repo.yaml +++ b/mycloud-authentik/templates/repo.yaml @@ -5,4 +5,4 @@ metadata: name: authentik spec: url: https://charts.goauthentik.io - interval: 10m0s + interval: 10m diff --git a/mycloud-authentik/values.yaml b/mycloud-authentik/values.yaml index 39657ec..0426a6d 100644 --- a/mycloud-authentik/values.yaml +++ b/mycloud-authentik/values.yaml @@ -22,6 +22,7 @@ commons: install: {} test: {} upgrade: {} + driftDetection: {} ingress: domain: "wrenix.eu" diff --git a/mycloud-services/templates/postgresql/release.yaml b/mycloud-services/templates/postgresql/release.yaml index a9c29db..c46b109 100644 --- a/mycloud-services/templates/postgresql/release.yaml +++ b/mycloud-services/templates/postgresql/release.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: mycloud-services-postgresql @@ -12,7 +12,6 @@ spec: namespace: "flux-system" chart: "./postgresql" reconcileStrategy: "Revision" - interval: 10m releaseName: mycloud-services-postgresql install: {{- toYaml .Values.commons.helm.release.install | nindent 4 }} @@ -20,6 +19,8 @@ spec: {{- toYaml .Values.commons.helm.release.test | nindent 4 }} upgrade: {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }} + driftDetection: + {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }} interval: 10m valuesFrom: - kind: Secret diff --git a/mycloud-services/values.yaml b/mycloud-services/values.yaml index bdbd6da..b1cd667 100644 --- a/mycloud-services/values.yaml +++ b/mycloud-services/values.yaml @@ -12,6 +12,7 @@ commons: install: {} test: {} upgrade: {} + driftDetection: {} postgresql: persistence: