From 7f7a7a2ba0efd761d26c1bd4942af399e28875ff Mon Sep 17 00:00:00 2001
From: Luke Ashe-Browne <xactly@gmail.com>
Date: Sat, 10 Apr 2021 16:31:58 +0100
Subject: [PATCH] Change metallb from bitnami images to default metallb images
 Remove amd64 nodSelector from nginx-ingress and metallb setup

---
 components/metallb/metallb_helmrelease.yaml        | 14 +++++++++-----
 .../nginx-ingress/nginx-ingress_helmrelease.yaml   |  8 ++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/components/metallb/metallb_helmrelease.yaml b/components/metallb/metallb_helmrelease.yaml
index be0de1a..1b3174c 100644
--- a/components/metallb/metallb_helmrelease.yaml
+++ b/components/metallb/metallb_helmrelease.yaml
@@ -14,12 +14,16 @@ spec:
         name: bitnami
   interval: 10m0s
   values:
-    controller: 
-      nodeSelector:
-        kubernetes.io/arch: 'amd64'
+    controller:
+      image:
+      repository: metallb/controller
+      tag: v0.9.6
+
     speaker:
-      nodeSelector:
-        kubernetes.io/arch: 'amd64'
+      image:
+        repository: metallb/speaker
+        tag: v0.9.6
+
     configInline:
       address-pools:
       - name: default
diff --git a/components/nginx-ingress/nginx-ingress_helmrelease.yaml b/components/nginx-ingress/nginx-ingress_helmrelease.yaml
index 0dde25f..ae46226 100644
--- a/components/nginx-ingress/nginx-ingress_helmrelease.yaml
+++ b/components/nginx-ingress/nginx-ingress_helmrelease.yaml
@@ -13,9 +13,9 @@ spec:
         kind: HelmRepository
         name: ingress-nginx
   interval: 20m0s
-  values:
-    controller:
-      nodeSelector:
-        kubernetes.io/arch: 'amd64'
+  # values:
+  #   controller:
+  #     nodeSelector:
+  #       kubernetes.io/arch: 'amd64'