From 2b09fbca7bef36f6f1a5dfaccc2dc0f32c565ad7 Mon Sep 17 00:00:00 2001
From: Rojikku <Rojikku@users.noreply.github.com>
Date: Fri, 7 Oct 2022 13:05:16 -0400
Subject: [PATCH] fix(metallb): Update to version with CRDs (#485)

---
 cluster/apps/networking/metallb/config.yaml   | 18 +++++++++++
 .../apps/networking/metallb/helm-release.yaml | 10 ++-----
 .../networking/metallb/kustomization.yaml     |  1 +
 cluster/crds/kustomization.yaml               |  1 +
 cluster/crds/metallb/crds.yaml                | 30 +++++++++++++++++++
 cluster/crds/metallb/kustomization.yaml       |  5 ++++
 6 files changed, 58 insertions(+), 7 deletions(-)
 create mode 100644 cluster/apps/networking/metallb/config.yaml
 create mode 100644 cluster/crds/metallb/crds.yaml
 create mode 100644 cluster/crds/metallb/kustomization.yaml

diff --git a/cluster/apps/networking/metallb/config.yaml b/cluster/apps/networking/metallb/config.yaml
new file mode 100644
index 00000000..06f5d0be
--- /dev/null
+++ b/cluster/apps/networking/metallb/config.yaml
@@ -0,0 +1,18 @@
+---
+apiVersion: metallb.io/v1beta1
+kind: L2Advertisement
+metadata:
+  name: l2-ip
+  namespace: metallb-system
+spec:
+  ipAddressPools:
+    - default-pool
+---
+apiVersion: metallb.io/v1beta1
+kind: IPAddressPool
+metadata:
+  name: default-pool
+  namespace: metallb-system
+spec:
+  addresses:
+    - "${METALLB_LB_RANGE}"
diff --git a/cluster/apps/networking/metallb/helm-release.yaml b/cluster/apps/networking/metallb/helm-release.yaml
index e9e12612..e5aeddca 100644
--- a/cluster/apps/networking/metallb/helm-release.yaml
+++ b/cluster/apps/networking/metallb/helm-release.yaml
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: metallb
-      version: 0.12.1
+      version: 0.13.5
       sourceRef:
         kind: HelmRepository
         name: metallb
@@ -24,9 +24,5 @@ spec:
   values:
     psp:
       create: false
-    configInline:
-      address-pools:
-        - name: default
-          protocol: layer2
-          addresses:
-            - "${METALLB_LB_RANGE}"
+    crds:
+      enabled: false
diff --git a/cluster/apps/networking/metallb/kustomization.yaml b/cluster/apps/networking/metallb/kustomization.yaml
index 2fa2de20..b7af5433 100644
--- a/cluster/apps/networking/metallb/kustomization.yaml
+++ b/cluster/apps/networking/metallb/kustomization.yaml
@@ -3,3 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - helm-release.yaml
+  - config.yaml
diff --git a/cluster/crds/kustomization.yaml b/cluster/crds/kustomization.yaml
index b9674345..0e7d6d6f 100644
--- a/cluster/crds/kustomization.yaml
+++ b/cluster/crds/kustomization.yaml
@@ -4,3 +4,4 @@ kind: Kustomization
 resources:
   - cert-manager
   - system-upgrade-controller
+  - metallb
diff --git a/cluster/crds/metallb/crds.yaml b/cluster/crds/metallb/crds.yaml
new file mode 100644
index 00000000..4db1a0a4
--- /dev/null
+++ b/cluster/crds/metallb/crds.yaml
@@ -0,0 +1,30 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: GitRepository
+metadata:
+  name: metallb-source
+  namespace: flux-system
+spec:
+  interval: 12h
+  url: https://github.com/metallb/metallb.git
+  ref:
+    # renovate: registryUrl=https://metallb.github.io/metallb chart=metallb
+    tag: v0.13.5
+  ignore: |
+    # exclude all
+    /*
+    # include crd directory
+    !/config/crd
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: crds-metallb
+  namespace: flux-system
+spec:
+  interval: 30m
+  prune: false
+  wait: true
+  sourceRef:
+    kind: GitRepository
+    name: metallb-source
diff --git a/cluster/crds/metallb/kustomization.yaml b/cluster/crds/metallb/kustomization.yaml
new file mode 100644
index 00000000..7d6dc05e
--- /dev/null
+++ b/cluster/crds/metallb/kustomization.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - crds.yaml