From a664d90787cb245bfdcdfcc334b907b5ac664e85 Mon Sep 17 00:00:00 2001
From: ytshih <ytshih@konchin.com>
Date: Sun, 2 Feb 2025 14:09:28 +0800
Subject: [PATCH] Fix: metallb bootstrap

---
 flux-infrastructures/metallb.yaml             | 19 +++++++++++++++++--
 .../{ => crd-resources}/ipaddresspool.yaml    |  0
 .../{ => crd-resources}/l2advertisement.yaml  |  0
 .../{ => helminstall}/helmrelease.yaml        |  0
 .../{ => helminstall}/kustomization.yaml      |  2 --
 .../{ => helminstall}/namespace.yaml          |  0
 metallb-system/{ => helminstall}/values.yaml  |  0
 7 files changed, 17 insertions(+), 4 deletions(-)
 rename metallb-system/{ => crd-resources}/ipaddresspool.yaml (100%)
 rename metallb-system/{ => crd-resources}/l2advertisement.yaml (100%)
 rename metallb-system/{ => helminstall}/helmrelease.yaml (100%)
 rename metallb-system/{ => helminstall}/kustomization.yaml (84%)
 rename metallb-system/{ => helminstall}/namespace.yaml (100%)
 rename metallb-system/{ => helminstall}/values.yaml (100%)

diff --git a/flux-infrastructures/metallb.yaml b/flux-infrastructures/metallb.yaml
index 8079369..f540af0 100644
--- a/flux-infrastructures/metallb.yaml
+++ b/flux-infrastructures/metallb.yaml
@@ -2,13 +2,28 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: metallb
+  name: metallb-helm
   namespace: flux-system
 spec:
   interval: 10m0s
-  path: ./metallb-system/
+  path: ./metallb-system/helminstall
   prune: true
   force: false
   sourceRef:
     kind: GitRepository
     name: infrastructures
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: metadata-resources
+  namespace: flux-system
+spec:
+  interval: 10m0s
+  path: ./metallb-system/crd-resources
+  prune: true
+  force: false
+  dependsOn: metallb-helm
+  sourceRef:
+    kind: GitRepository
+    name: infrastructures
diff --git a/metallb-system/ipaddresspool.yaml b/metallb-system/crd-resources/ipaddresspool.yaml
similarity index 100%
rename from metallb-system/ipaddresspool.yaml
rename to metallb-system/crd-resources/ipaddresspool.yaml
diff --git a/metallb-system/l2advertisement.yaml b/metallb-system/crd-resources/l2advertisement.yaml
similarity index 100%
rename from metallb-system/l2advertisement.yaml
rename to metallb-system/crd-resources/l2advertisement.yaml
diff --git a/metallb-system/helmrelease.yaml b/metallb-system/helminstall/helmrelease.yaml
similarity index 100%
rename from metallb-system/helmrelease.yaml
rename to metallb-system/helminstall/helmrelease.yaml
diff --git a/metallb-system/kustomization.yaml b/metallb-system/helminstall/kustomization.yaml
similarity index 84%
rename from metallb-system/kustomization.yaml
rename to metallb-system/helminstall/kustomization.yaml
index 8614cab..babbb49 100644
--- a/metallb-system/kustomization.yaml
+++ b/metallb-system/helminstall/kustomization.yaml
@@ -7,8 +7,6 @@ generatorOptions:
 resources:
   - namespace.yaml
   - helmrelease.yaml
-  - l2advertisement.yaml
-  - ipaddresspool.yaml
 configMapGenerator:
   - name: metallb-values
     files:
diff --git a/metallb-system/namespace.yaml b/metallb-system/helminstall/namespace.yaml
similarity index 100%
rename from metallb-system/namespace.yaml
rename to metallb-system/helminstall/namespace.yaml
diff --git a/metallb-system/values.yaml b/metallb-system/helminstall/values.yaml
similarity index 100%
rename from metallb-system/values.yaml
rename to metallb-system/helminstall/values.yaml