From 71b54158dcb1907dc300e0dde889bc20483c97a9 Mon Sep 17 00:00:00 2001
From: Jonathan Bartlett <34320158+Jonnobrow@users.noreply.github.com>
Date: Mon, 12 Aug 2024 13:54:46 +0100
Subject: [PATCH] Misc fixes (#470)

---
 .taskfiles/bootstrap.yml                             | 12 ++++++------
 kubernetes/coffee-shop-2/apps/metallb/namespace.yaml |  5 +++++
 kubernetes/coffee-shop-2/cluster/config/cluster.yaml |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 kubernetes/coffee-shop-2/apps/metallb/namespace.yaml

diff --git a/.taskfiles/bootstrap.yml b/.taskfiles/bootstrap.yml
index 56bf3964..70b7cf42 100644
--- a/.taskfiles/bootstrap.yml
+++ b/.taskfiles/bootstrap.yml
@@ -7,9 +7,9 @@ tasks:
     vars:
       cluster: '{{.cluster | default "coffee-shop-2"}}'
     cmds:
-      - kubectl --context {{.cluster}} apply --server-side --kustomize {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap
-      - sops --decrypt {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap/gpg-key.secret.sops.yaml | kubectl --context {{.cluster}} apply --server-side --filename -
-      - sops --decrypt {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap/github-deploy-key.secret.sops.yaml | kubectl --context {{.cluster}} apply --server-side --filename -
-      - sops --decrypt {{.KUBERNETES_DIR}}/{{.cluster}}/cluster/vars/cluster-secrets.secret.sops.yaml | kubectl --context {{.cluster}} apply --server-side --filename -
-      - kubectl --context {{.cluster}} apply --server-side --filename {{.KUBERNETES_DIR}}/{{.cluster}}/cluster/vars/cluster-settings.yaml
-      - kubectl --context {{.cluster}} apply --server-side --kustomize {{.KUBERNETES_DIR}}/{{.cluster}}/cluster/config
+      - kubectl --context {{.cluster}} apply --server-side --kustomize {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap --force-conflicts
+      - sops --decrypt {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap/gpg-key.secret.sops.yaml | kubectl --context {{.cluster}} apply --server-side --filename - --force-conflicts
+      - sops --decrypt {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap/github-deploy-key.secret.sops.yaml | kubectl --context {{.cluster}} apply --server-side --filename - --force-conflicts
+      - sops --decrypt {{.KUBERNETES_DIR}}/{{.cluster}}/cluster/vars/cluster-secrets.secret.sops.yaml | kubectl --context {{.cluster}} apply --server-side --filename - --force-conflicts
+      - kubectl --context {{.cluster}} apply --server-side --filename {{.KUBERNETES_DIR}}/{{.cluster}}/cluster/vars/cluster-settings.yaml --force-conflicts
+      - kubectl --context {{.cluster}} apply --server-side --kustomize {{.KUBERNETES_DIR}}/{{.cluster}}/cluster/config --force-conflicts
diff --git a/kubernetes/coffee-shop-2/apps/metallb/namespace.yaml b/kubernetes/coffee-shop-2/apps/metallb/namespace.yaml
new file mode 100644
index 00000000..928cb910
--- /dev/null
+++ b/kubernetes/coffee-shop-2/apps/metallb/namespace.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: metallb-system
diff --git a/kubernetes/coffee-shop-2/cluster/config/cluster.yaml b/kubernetes/coffee-shop-2/cluster/config/cluster.yaml
index 239e0d4c..ef867fd6 100644
--- a/kubernetes/coffee-shop-2/cluster/config/cluster.yaml
+++ b/kubernetes/coffee-shop-2/cluster/config/cluster.yaml
@@ -26,7 +26,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 30m
-  path: ./kubernetes/coffee-shop-2/flux
+  path: ./kubernetes/coffee-shop-2/cluster
   prune: true
   wait: false
   sourceRef: