From 07cdde01c844d09ec44312fefa5d205d998d3e8b Mon Sep 17 00:00:00 2001
From: Jazzlyn <9011011+jazzlyn@users.noreply.github.com>
Date: Mon, 3 Feb 2025 21:08:06 +0100
Subject: [PATCH] feat(kube-nas): standardisation refinement

---
 .../apps/backup-system/volsync/app/helm-release.yaml         | 2 ++
 .../apps/database-system/dbman/operator/helm-release.yaml    | 2 ++
 .../kube-nas/apps/database-system/dragonfly/flux-sync.yaml   | 2 --
 kubernetes/kube-nas/apps/nginx-ingress/nginx/flux-sync.yaml  | 2 --
 kubernetes/kube-nas/flux/flux-sync.yaml                      | 5 -----
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/kubernetes/kube-nas/apps/backup-system/volsync/app/helm-release.yaml b/kubernetes/kube-nas/apps/backup-system/volsync/app/helm-release.yaml
index f75dbdf60..fc0c44554 100644
--- a/kubernetes/kube-nas/apps/backup-system/volsync/app/helm-release.yaml
+++ b/kubernetes/kube-nas/apps/backup-system/volsync/app/helm-release.yaml
@@ -16,10 +16,12 @@ spec:
         name: backube-charts
         namespace: flux-system
   install:
+    crds: CreateReplace
     remediation:
       retries: 3
   upgrade:
     cleanupOnFail: true
+    crds: CreateReplace
     remediation:
       strategy: rollback
       retries: 3
diff --git a/kubernetes/kube-nas/apps/database-system/dbman/operator/helm-release.yaml b/kubernetes/kube-nas/apps/database-system/dbman/operator/helm-release.yaml
index 3b3314218..f7b27365b 100644
--- a/kubernetes/kube-nas/apps/database-system/dbman/operator/helm-release.yaml
+++ b/kubernetes/kube-nas/apps/database-system/dbman/operator/helm-release.yaml
@@ -16,10 +16,12 @@ spec:
         name: dbman-charts
         namespace: flux-system
   install:
+    crds: CreateReplace
     remediation:
       retries: 3
   upgrade:
     cleanupOnFail: true
+    crds: CreateReplace
     remediation:
       strategy: rollback
       retries: 3
diff --git a/kubernetes/kube-nas/apps/database-system/dragonfly/flux-sync.yaml b/kubernetes/kube-nas/apps/database-system/dragonfly/flux-sync.yaml
index e0f92b44a..e93cf7804 100644
--- a/kubernetes/kube-nas/apps/database-system/dragonfly/flux-sync.yaml
+++ b/kubernetes/kube-nas/apps/database-system/dragonfly/flux-sync.yaml
@@ -34,8 +34,6 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *appname
-      app.kubernetes.io/instance: *appname
-      app.kubernetes.io/component: dragonfly
   path: ./kubernetes/kube-nas/apps/database-system/dragonfly/cluster
   prune: true
   sourceRef:
diff --git a/kubernetes/kube-nas/apps/nginx-ingress/nginx/flux-sync.yaml b/kubernetes/kube-nas/apps/nginx-ingress/nginx/flux-sync.yaml
index 637c488c6..58bd2bf91 100644
--- a/kubernetes/kube-nas/apps/nginx-ingress/nginx/flux-sync.yaml
+++ b/kubernetes/kube-nas/apps/nginx-ingress/nginx/flux-sync.yaml
@@ -21,5 +21,3 @@ spec:
   interval: 30m
   retryInterval: 1m
   timeout: 5m
-  dependsOn:
-    - name: cert-manager-issuers
diff --git a/kubernetes/kube-nas/flux/flux-sync.yaml b/kubernetes/kube-nas/flux/flux-sync.yaml
index 4e13038dc..ab08521be 100644
--- a/kubernetes/kube-nas/flux/flux-sync.yaml
+++ b/kubernetes/kube-nas/flux/flux-sync.yaml
@@ -38,9 +38,6 @@ spec:
   interval: 30m
   retryInterval: 1m
   timeout: 5m
-  dependsOn:
-    - name: flux-system
-    - name: flux-repositories
 
 ---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
@@ -63,8 +60,6 @@ spec:
   interval: 30m
   retryInterval: 1m
   timeout: 5m
-  dependsOn:
-    - name: flux-operator
 
 ---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json