From d7c0f7def5f72ef29fc4bf0c604398710c522693 Mon Sep 17 00:00:00 2001
From: Luke Ashe-Browne <xactly@gmail.com>
Date: Mon, 5 Apr 2021 17:37:13 +0100
Subject: [PATCH] add nginx-ingress component, move metallb to metallb-system
 ns

---
 clusters/odc2-110-admin/nodeTaints.sh           |  8 ++++++++
 components/metallb/bitnami_helmrepo.yaml        |  2 +-
 components/metallb/metallb_helmrelease.yaml     |  2 +-
 components/metallb/namespace.yaml               |  2 +-
 .../ingress-nginx_helmrepository.yaml           | 10 ++++++++++
 components/nginx-ingress/namespace.yaml         |  4 ++++
 .../nginx-ingress_helmrelease.yaml              | 17 +++++++++++++++++
 7 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100755 clusters/odc2-110-admin/nodeTaints.sh
 create mode 100644 components/nginx-ingress/ingress-nginx_helmrepository.yaml
 create mode 100644 components/nginx-ingress/namespace.yaml
 create mode 100644 components/nginx-ingress/nginx-ingress_helmrelease.yaml

diff --git a/clusters/odc2-110-admin/nodeTaints.sh b/clusters/odc2-110-admin/nodeTaints.sh
new file mode 100755
index 0000000..9563c3d
--- /dev/null
+++ b/clusters/odc2-110-admin/nodeTaints.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -x
+MASTER=odc2-110
+ARM_NODES="pi4-115, pi4-116"
+kubectl taint nodes "$MASTER" node-role.kubernetes.io/master=true:NoSchedule
+kubectl label node "$MASTER" kubernetes.io/role=master node-role.kubernetes.io/master=
+
+#kubectl taint nodes "$ARM_NODES" 
\ No newline at end of file
diff --git a/components/metallb/bitnami_helmrepo.yaml b/components/metallb/bitnami_helmrepo.yaml
index 0f904af..0804726 100644
--- a/components/metallb/bitnami_helmrepo.yaml
+++ b/components/metallb/bitnami_helmrepo.yaml
@@ -3,7 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: HelmRepository
 metadata:
   name: bitnami
-  namespace: metallb
+  namespace: metallb-system
 spec:
   interval: 1m0s
   url: https://stefanprodan.github.io/podinfo
diff --git a/components/metallb/metallb_helmrelease.yaml b/components/metallb/metallb_helmrelease.yaml
index 58cba1d..84a9cf8 100644
--- a/components/metallb/metallb_helmrelease.yaml
+++ b/components/metallb/metallb_helmrelease.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: metallb
-  namespace: metallb
+  namespace: metallb-system
 spec:
   chart:
     spec:
diff --git a/components/metallb/namespace.yaml b/components/metallb/namespace.yaml
index 8fc91e4..fe6f1d8 100644
--- a/components/metallb/namespace.yaml
+++ b/components/metallb/namespace.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: metallb
+  name: metallb-system
diff --git a/components/nginx-ingress/ingress-nginx_helmrepository.yaml b/components/nginx-ingress/ingress-nginx_helmrepository.yaml
new file mode 100644
index 0000000..4c09bb0
--- /dev/null
+++ b/components/nginx-ingress/ingress-nginx_helmrepository.yaml
@@ -0,0 +1,10 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: HelmRepository
+metadata:
+  name: ingress-nginx
+  namespace: ingress-system
+spec:
+  interval: 20m0s
+  url: https://kubernetes.github.io/ingress-nginx
+
diff --git a/components/nginx-ingress/namespace.yaml b/components/nginx-ingress/namespace.yaml
new file mode 100644
index 0000000..e37da3e
--- /dev/null
+++ b/components/nginx-ingress/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: ingress-system
diff --git a/components/nginx-ingress/nginx-ingress_helmrelease.yaml b/components/nginx-ingress/nginx-ingress_helmrelease.yaml
new file mode 100644
index 0000000..aec5ec4
--- /dev/null
+++ b/components/nginx-ingress/nginx-ingress_helmrelease.yaml
@@ -0,0 +1,17 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: nginx-ingress
+  namespace: ingress-system
+spec:
+  chart:
+    spec:
+      chart: ingress-nginx
+      version: "3.26.x"
+      sourceRef:
+        kind: HelmRepository
+        name: ingress-nginx
+  interval: 20m0s
+
+