From f7d7b24d9818cf1372e13894a068981157a41755 Mon Sep 17 00:00:00 2001
From: SeanOMik <seanomik@gmail.com>
Date: Tue, 4 Apr 2023 19:05:17 -0400
Subject: [PATCH] Revert "Use flux kustomization for metallb depends"

This reverts commit 1cd0b96d0409dcc1b25f9fe44ac23c975a30b41b.
---
 .../networking/metallb/app/namespace.yaml     |  6 ---
 .../metallb/config/kustomization.yaml         |  4 --
 .../metallb/{app => }/helm-release.yaml       |  0
 cluster/core/networking/metallb/ks.yaml       | 38 -------------------
 .../metallb/{app => }/kustomization.yaml      |  3 +-
 .../{config => }/metallb-static-ips.yaml      |  0
 .../core/networking/metallb/namespace.yaml    |  4 ++
 7 files changed, 6 insertions(+), 49 deletions(-)
 delete mode 100644 cluster/core/networking/metallb/app/namespace.yaml
 delete mode 100644 cluster/core/networking/metallb/config/kustomization.yaml
 rename cluster/core/networking/metallb/{app => }/helm-release.yaml (100%)
 delete mode 100644 cluster/core/networking/metallb/ks.yaml
 rename cluster/core/networking/metallb/{app => }/kustomization.yaml (65%)
 rename cluster/core/networking/metallb/{config => }/metallb-static-ips.yaml (100%)
 create mode 100644 cluster/core/networking/metallb/namespace.yaml

diff --git a/cluster/core/networking/metallb/app/namespace.yaml b/cluster/core/networking/metallb/app/namespace.yaml
deleted file mode 100644
index 9f5c4d1..0000000
--- a/cluster/core/networking/metallb/app/namespace.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: metallb-system
-  labels:
-    name: metallb-system
\ No newline at end of file
diff --git a/cluster/core/networking/metallb/config/kustomization.yaml b/cluster/core/networking/metallb/config/kustomization.yaml
deleted file mode 100644
index 1230a99..0000000
--- a/cluster/core/networking/metallb/config/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- ./metallb-static-ips.yaml
\ No newline at end of file
diff --git a/cluster/core/networking/metallb/app/helm-release.yaml b/cluster/core/networking/metallb/helm-release.yaml
similarity index 100%
rename from cluster/core/networking/metallb/app/helm-release.yaml
rename to cluster/core/networking/metallb/helm-release.yaml
diff --git a/cluster/core/networking/metallb/ks.yaml b/cluster/core/networking/metallb/ks.yaml
deleted file mode 100644
index 500a03a..0000000
--- a/cluster/core/networking/metallb/ks.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
-kind: Kustomization
-metadata:
-  name: cluster-core-metallb
-  namespace: flux-system
-spec:
-  path: ./cluster/core/networking/metallb/app
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
-      kind: HelmRelease
-      name: metallb
-      namespace: metallb-system
-  interval: 30m
-  retryInterval: 1m
-  timeout: 3m
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
-kind: Kustomization
-metadata:
-  name: cluster-core-metallb-config
-  namespace: flux-system
-spec:
-  dependsOn:
-    - name: cluster-apps-metallb
-  path: ./cluster/core/networking/metallb/config
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  wait: true
-  interval: 30m
-  retryInterval: 1m
-  timeout: 3m
\ No newline at end of file
diff --git a/cluster/core/networking/metallb/app/kustomization.yaml b/cluster/core/networking/metallb/kustomization.yaml
similarity index 65%
rename from cluster/core/networking/metallb/app/kustomization.yaml
rename to cluster/core/networking/metallb/kustomization.yaml
index 7b5e69b..046bf58 100644
--- a/cluster/core/networking/metallb/app/kustomization.yaml
+++ b/cluster/core/networking/metallb/kustomization.yaml
@@ -2,4 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ./namespace.yaml
-- ./helm-release.yaml
\ No newline at end of file
+- ./helm-release.yaml
+- ./metallb-static-ips.yaml
\ No newline at end of file
diff --git a/cluster/core/networking/metallb/config/metallb-static-ips.yaml b/cluster/core/networking/metallb/metallb-static-ips.yaml
similarity index 100%
rename from cluster/core/networking/metallb/config/metallb-static-ips.yaml
rename to cluster/core/networking/metallb/metallb-static-ips.yaml
diff --git a/cluster/core/networking/metallb/namespace.yaml b/cluster/core/networking/metallb/namespace.yaml
new file mode 100644
index 0000000..d5b0a9a
--- /dev/null
+++ b/cluster/core/networking/metallb/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: metallb-system
\ No newline at end of file