From 13627bf81f0e4c3cc6bbafcf983c86d0bb3e6743 Mon Sep 17 00:00:00 2001
From: MichaelFisher1997 <contact@michaelfisher.tech>
Date: Thu, 26 Mar 2026 00:06:34 +0000
Subject: [PATCH] fix: Split CNP operator from CNP cluster to fix CRD
 dependency

- Move CNP operator HelmRelease to cnpg-operator folder
- Create addon-cnpg-operator kustomization (deploys operator first)
- Update addon-cnpg to dependOn addon-cnpg-operator
- Add addon-cnpg as dependency for addon-rancher (needs database)
---
 .../{cnpg => cnpg-operator}/helmrelease-cnpg.yaml |  0
 .../helmrepository-cnpg.yaml                      |  0
 .../addons/cnpg-operator/kustomization.yaml       |  5 +++++
 infrastructure/addons/cnpg/kustomization.yaml     |  2 --
 .../addons/kustomization-cnpg-operator.yaml       | 15 +++++++++++++++
 infrastructure/addons/kustomization-cnpg.yaml     |  4 +++-
 infrastructure/addons/kustomization-rancher.yaml  |  1 +
 infrastructure/addons/kustomization.yaml          |  1 +
 8 files changed, 25 insertions(+), 3 deletions(-)
 rename infrastructure/addons/{cnpg => cnpg-operator}/helmrelease-cnpg.yaml (100%)
 rename infrastructure/addons/{cnpg => cnpg-operator}/helmrepository-cnpg.yaml (100%)
 create mode 100644 infrastructure/addons/cnpg-operator/kustomization.yaml
 create mode 100644 infrastructure/addons/kustomization-cnpg-operator.yaml

diff --git a/infrastructure/addons/cnpg/helmrelease-cnpg.yaml b/infrastructure/addons/cnpg-operator/helmrelease-cnpg.yaml
similarity index 100%
rename from infrastructure/addons/cnpg/helmrelease-cnpg.yaml
rename to infrastructure/addons/cnpg-operator/helmrelease-cnpg.yaml
diff --git a/infrastructure/addons/cnpg/helmrepository-cnpg.yaml b/infrastructure/addons/cnpg-operator/helmrepository-cnpg.yaml
similarity index 100%
rename from infrastructure/addons/cnpg/helmrepository-cnpg.yaml
rename to infrastructure/addons/cnpg-operator/helmrepository-cnpg.yaml
diff --git a/infrastructure/addons/cnpg-operator/kustomization.yaml b/infrastructure/addons/cnpg-operator/kustomization.yaml
new file mode 100644
index 0000000..f2a949e
--- /dev/null
+++ b/infrastructure/addons/cnpg-operator/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - helmrepository-cnpg.yaml
+  - helmrelease-cnpg.yaml
\ No newline at end of file
diff --git a/infrastructure/addons/cnpg/kustomization.yaml b/infrastructure/addons/cnpg/kustomization.yaml
index 370703d..12664c8 100644
--- a/infrastructure/addons/cnpg/kustomization.yaml
+++ b/infrastructure/addons/cnpg/kustomization.yaml
@@ -1,8 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - helmrepository-cnpg.yaml
-  - helmrelease-cnpg.yaml
   - namespace.yaml
   - b2-credentials-externalsecret.yaml
   - rancher-db-password-externalsecret.yaml
diff --git a/infrastructure/addons/kustomization-cnpg-operator.yaml b/infrastructure/addons/kustomization-cnpg-operator.yaml
new file mode 100644
index 0000000..4ed6cb7
--- /dev/null
+++ b/infrastructure/addons/kustomization-cnpg-operator.yaml
@@ -0,0 +1,15 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: addon-cnpg-operator
+  namespace: flux-system
+spec:
+  interval: 10m
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: platform
+  path: ./infrastructure/addons/cnpg-operator
+  wait: true
+  timeout: 10m
+  suspend: false
\ No newline at end of file
diff --git a/infrastructure/addons/kustomization-cnpg.yaml b/infrastructure/addons/kustomization-cnpg.yaml
index 5d7f2a9..8ccb25f 100644
--- a/infrastructure/addons/kustomization-cnpg.yaml
+++ b/infrastructure/addons/kustomization-cnpg.yaml
@@ -12,4 +12,6 @@ spec:
   path: ./infrastructure/addons/cnpg
   wait: true
   timeout: 10m
-  suspend: false
\ No newline at end of file
+  suspend: false
+  dependsOn:
+    - name: addon-cnpg-operator
\ No newline at end of file
diff --git a/infrastructure/addons/kustomization-rancher.yaml b/infrastructure/addons/kustomization-rancher.yaml
index 4a716e7..78e3cd5 100644
--- a/infrastructure/addons/kustomization-rancher.yaml
+++ b/infrastructure/addons/kustomization-rancher.yaml
@@ -16,3 +16,4 @@ spec:
   dependsOn:
     - name: addon-tailscale-operator
     - name: addon-tailscale-proxyclass
+    - name: addon-cnpg
diff --git a/infrastructure/addons/kustomization.yaml b/infrastructure/addons/kustomization.yaml
index 4a88589..e593ccd 100644
--- a/infrastructure/addons/kustomization.yaml
+++ b/infrastructure/addons/kustomization.yaml
@@ -11,5 +11,6 @@ resources:
   - kustomization-observability.yaml
   - kustomization-observability-content.yaml
   - kustomization-lpp.yaml
+  - kustomization-cnpg-operator.yaml
   - kustomization-cnpg.yaml
   - kustomization-rancher.yaml
\ No newline at end of file