From afb1782d387b534621fae077471a982d39ee033e Mon Sep 17 00:00:00 2001
From: MichaelFisher1997 <contact@michaelfisher.tech>
Date: Sun, 29 Mar 2026 22:22:29 +0000
Subject: [PATCH] fix: Separate Backup CRs into their own kustomization

The Backup and Restore CRs need the rancher-backup CRDs to exist first.
Moved them to a separate kustomization that depends on the operator being ready.
---
 .../kustomization-rancher-backup-config.yaml     | 16 ++++++++++++++++
 infrastructure/addons/kustomization.yaml         |  1 +
 .../backup-recurring.yaml                        |  0
 .../rancher-backup-config/kustomization.yaml     |  5 +++++
 .../restore-from-b2.yaml                         |  0
 .../addons/rancher-backup/kustomization.yaml     |  2 --
 .../rancher/rancher-tailscale-service.yaml       |  4 ----
 7 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 infrastructure/addons/kustomization-rancher-backup-config.yaml
 rename infrastructure/addons/{rancher-backup => rancher-backup-config}/backup-recurring.yaml (100%)
 create mode 100644 infrastructure/addons/rancher-backup-config/kustomization.yaml
 rename infrastructure/addons/{rancher-backup => rancher-backup-config}/restore-from-b2.yaml (100%)

diff --git a/infrastructure/addons/kustomization-rancher-backup-config.yaml b/infrastructure/addons/kustomization-rancher-backup-config.yaml
new file mode 100644
index 0000000..9962284
--- /dev/null
+++ b/infrastructure/addons/kustomization-rancher-backup-config.yaml
@@ -0,0 +1,16 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: addon-rancher-backup-config
+  namespace: flux-system
+spec:
+  interval: 10m
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: platform
+  path: ./infrastructure/addons/rancher-backup-config
+  timeout: 5m
+  suspend: false
+  dependsOn:
+    - name: addon-rancher-backup
diff --git a/infrastructure/addons/kustomization.yaml b/infrastructure/addons/kustomization.yaml
index c703710..4e28573 100644
--- a/infrastructure/addons/kustomization.yaml
+++ b/infrastructure/addons/kustomization.yaml
@@ -13,3 +13,4 @@ resources:
   - kustomization-rancher.yaml
   - kustomization-rancher-config.yaml
   - kustomization-rancher-backup.yaml
+  - kustomization-rancher-backup-config.yaml
diff --git a/infrastructure/addons/rancher-backup/backup-recurring.yaml b/infrastructure/addons/rancher-backup-config/backup-recurring.yaml
similarity index 100%
rename from infrastructure/addons/rancher-backup/backup-recurring.yaml
rename to infrastructure/addons/rancher-backup-config/backup-recurring.yaml
diff --git a/infrastructure/addons/rancher-backup-config/kustomization.yaml b/infrastructure/addons/rancher-backup-config/kustomization.yaml
new file mode 100644
index 0000000..f0945d2
--- /dev/null
+++ b/infrastructure/addons/rancher-backup-config/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - backup-recurring.yaml
+  - restore-from-b2.yaml
diff --git a/infrastructure/addons/rancher-backup/restore-from-b2.yaml b/infrastructure/addons/rancher-backup-config/restore-from-b2.yaml
similarity index 100%
rename from infrastructure/addons/rancher-backup/restore-from-b2.yaml
rename to infrastructure/addons/rancher-backup-config/restore-from-b2.yaml
diff --git a/infrastructure/addons/rancher-backup/kustomization.yaml b/infrastructure/addons/rancher-backup/kustomization.yaml
index 16c6db1..ec61346 100644
--- a/infrastructure/addons/rancher-backup/kustomization.yaml
+++ b/infrastructure/addons/rancher-backup/kustomization.yaml
@@ -5,5 +5,3 @@ resources:
   - helmrepository-rancher-backup.yaml
   - helmrelease-rancher-backup.yaml
   - b2-credentials-externalsecret.yaml
-  - backup-recurring.yaml
-  - restore-from-b2.yaml
diff --git a/infrastructure/addons/rancher/rancher-tailscale-service.yaml b/infrastructure/addons/rancher/rancher-tailscale-service.yaml
index 7cda20e..feb504b 100644
--- a/infrastructure/addons/rancher/rancher-tailscale-service.yaml
+++ b/infrastructure/addons/rancher/rancher-tailscale-service.yaml
@@ -16,7 +16,3 @@ spec:
       port: 80
       protocol: TCP
       targetPort: 80
-    - name: https
-      port: 443
-      protocol: TCP
-      targetPort: 443