From 3e0d23e18bea7e417d07892c2bdebae54ec18b4d Mon Sep 17 00:00:00 2001 From: j Date: Wed, 13 Aug 2025 21:40:44 +1000 Subject: [PATCH] Convert MariaDB from Helm Release to Application --- applications/20-databases/mariadb.yaml | 91 +++++++++++++------------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/applications/20-databases/mariadb.yaml b/applications/20-databases/mariadb.yaml index ae86891..4ae8b0d 100644 --- a/applications/20-databases/mariadb.yaml +++ b/applications/20-databases/mariadb.yaml @@ -1,53 +1,56 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: mariadb-operator - namespace: flux-system -spec: - url: https://helm.mariadb.com/mariadb-operator - interval: 1h - ---- -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease +# 1. MariaDB Operator CRDs +apiVersion: argoproj.io/v1alpha1 +kind: Application metadata: name: mariadb-operator-crds - namespace: database + namespace: argocd spec: - interval: 30m - chart: - spec: - chart: mariadb-operator-crds - version: 0.38.1 - sourceRef: - kind: HelmRepository - name: mariadb-operator - namespace: flux-system - install: - createNamespace: true - upgrade: - disableWait: true - timeout: 5m + project: default + source: + repoURL: "https://charts.mariadb.com/mariadb-operator" + chart: "mariadb-operator-crds" + targetRevision: "0.38.1" + helm: + releaseName: "mariadb-operator-crds" + destination: + server: "https://kubernetes.default.svc" + namespace: database + syncPolicy: + automated: + prune: true + selfHeal: true + syncOptions: + - CreateNamespace=true + - ApplyOutOfSyncOnly=true + - SkipHooks=false + - SyncWave=0 # ensure this is applied first --- -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease +# 2. MariaDB Operator +apiVersion: argoproj.io/v1alpha1 +kind: Application metadata: name: mariadb-operator - namespace: database + namespace: argocd spec: - interval: 30m - chart: - spec: - chart: mariadb-operator - version: 0.38.1 - sourceRef: - kind: HelmRepository - name: mariadb-operator - namespace: flux-system - install: - createNamespace: true - dependsOn: - - name: mariadb-operator-crds - namespace: database + project: default + source: + repoURL: "https://charts.mariadb.com/mariadb-operator" + chart: "mariadb-operator" + targetRevision: "0.38.1" + helm: + releaseName: "mariadb-operator" + destination: + server: "https://kubernetes.default.svc" + namespace: database + syncPolicy: + automated: + prune: true + selfHeal: true + syncOptions: + - CreateNamespace=true + - ApplyOutOfSyncOnly=true + - SkipHooks=false + - SyncWave=1 # ensure this waits for mariadb-operator-crds +