From 2e36cdfb1e6dc5d561d8526a6ce0afc98e50f1d3 Mon Sep 17 00:00:00 2001
From: Vivian Roest <vivian@0x76.dev>
Date: Tue, 19 Jul 2022 12:30:00 +0200
Subject: [PATCH] update metallb to 0.13.3 with CRDs

---
 flux/cluster/core/networking/metallb/address-pool.yaml |  8 ++++++++
 flux/cluster/core/networking/metallb/helm-release.yaml | 10 +++-------
 .../cluster/core/networking/metallb/kustomization.yaml |  2 ++
 .../core/networking/metallb/l2advertisement.yaml       |  8 ++++++++
 4 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 flux/cluster/core/networking/metallb/address-pool.yaml
 create mode 100644 flux/cluster/core/networking/metallb/l2advertisement.yaml

diff --git a/flux/cluster/core/networking/metallb/address-pool.yaml b/flux/cluster/core/networking/metallb/address-pool.yaml
new file mode 100644
index 00000000..5a56125e
--- /dev/null
+++ b/flux/cluster/core/networking/metallb/address-pool.yaml
@@ -0,0 +1,8 @@
+apiVersion: metallb.io/v1beta1
+kind: IPAddressPool
+metadata:
+  name: main-pool
+  namespace: networking
+spec:
+  addresses:
+    - 10.42.42.150-192.168.42.200
\ No newline at end of file
diff --git a/flux/cluster/core/networking/metallb/helm-release.yaml b/flux/cluster/core/networking/metallb/helm-release.yaml
index e9d2cfd8..c9cb0361 100644
--- a/flux/cluster/core/networking/metallb/helm-release.yaml
+++ b/flux/cluster/core/networking/metallb/helm-release.yaml
@@ -10,19 +10,15 @@ spec:
     spec:
       # renovate: registryUrl=https://metallb.github.io/metallb
       chart: metallb
-      version: 0.12.1
+      version: 0.13.3
       sourceRef:
         kind: HelmRepository
         name: metallb-charts
         namespace: flux-system
       interval: 5m
   values:
-    configInline:
-      address-pools:
-        - name: default
-          protocol: layer2
-          addresses:
-            - 10.42.42.150-192.168.42.200
+    crds:
+      enabled: true
     speaker:
       tolerations:
         - effect: "NoExecute"
diff --git a/flux/cluster/core/networking/metallb/kustomization.yaml b/flux/cluster/core/networking/metallb/kustomization.yaml
index 2fa2de20..806406f7 100644
--- a/flux/cluster/core/networking/metallb/kustomization.yaml
+++ b/flux/cluster/core/networking/metallb/kustomization.yaml
@@ -3,3 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - helm-release.yaml
+  - address-pool.yaml
+  - l2advertisement.yaml
diff --git a/flux/cluster/core/networking/metallb/l2advertisement.yaml b/flux/cluster/core/networking/metallb/l2advertisement.yaml
new file mode 100644
index 00000000..a6215146
--- /dev/null
+++ b/flux/cluster/core/networking/metallb/l2advertisement.yaml
@@ -0,0 +1,8 @@
+apiVersion: metallb.io/v1beta1
+kind: L2Advertisement
+metadata:
+  name: main-pool
+  namespace: networking
+spec:
+  ipAddressPools:
+  - main-pool