From 35185f8aa250c46a3b341de712ac17043ce71e0f Mon Sep 17 00:00:00 2001
From: Devin Buhl <onedr0p@users.noreply.github.com>
Date: Thu, 25 Jan 2024 07:39:17 -0500
Subject: [PATCH] fix: cluster user settings and secrets should be optional
 (#1245)

* fix: cluster user settings and secrets should be optional

* Delete bootstrap/templates/kubernetes/flux/vars/cluster-secrets-user.sops.yaml.j2

* Delete bootstrap/templates/kubernetes/flux/vars/cluster-settings-user.yaml.j2

* Update kustomization.yaml.j2

* Update storageclass.yaml.j2
---
 .../apps/storage/csi-driver-smb/app/storageclass.yaml.j2  | 2 +-
 bootstrap/templates/kubernetes/flux/apps.yaml.j2          | 4 ++++
 .../flux/vars/cluster-secrets-user.sops.yaml.j2           | 8 --------
 .../kubernetes/flux/vars/cluster-settings-user.yaml.j2    | 8 --------
 .../templates/kubernetes/flux/vars/kustomization.yaml.j2  | 2 --
 5 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 bootstrap/templates/kubernetes/flux/vars/cluster-secrets-user.sops.yaml.j2
 delete mode 100644 bootstrap/templates/kubernetes/flux/vars/cluster-settings-user.yaml.j2

diff --git a/bootstrap/templates/kubernetes/apps/storage/csi-driver-smb/app/storageclass.yaml.j2 b/bootstrap/templates/kubernetes/apps/storage/csi-driver-smb/app/storageclass.yaml.j2
index 0198991b..c344922c 100644
--- a/bootstrap/templates/kubernetes/apps/storage/csi-driver-smb/app/storageclass.yaml.j2
+++ b/bootstrap/templates/kubernetes/apps/storage/csi-driver-smb/app/storageclass.yaml.j2
@@ -9,7 +9,7 @@ parameters:
   source: "#{ item.source }#"
   csi.storage.k8s.io/node-stage-secret-name: "#{ item.secret_name|default(item.name + '-secret') }#"
   csi.storage.k8s.io/node-stage-secret-namespace: "#{ item.secret_namespace|default('storage') }#"
-reclaimPolicy: Retain
+reclaimPolicy: Delete
 volumeBindingMode: Immediate
 mountOptions:
   - "dir_mode=#{ item.dir_mode|default('0777') }#"
diff --git a/bootstrap/templates/kubernetes/flux/apps.yaml.j2 b/bootstrap/templates/kubernetes/flux/apps.yaml.j2
index d557f828..2284be62 100644
--- a/bootstrap/templates/kubernetes/flux/apps.yaml.j2
+++ b/bootstrap/templates/kubernetes/flux/apps.yaml.j2
@@ -23,8 +23,10 @@ spec:
         name: cluster-secrets
       - kind: ConfigMap
         name: cluster-settings-user
+        optional: true
       - kind: Secret
         name: cluster-secrets-user
+        optional: true
   patches:
     - patch: |-
         apiVersion: kustomize.toolkit.fluxcd.io/v1
@@ -44,8 +46,10 @@ spec:
                 name: cluster-secrets
               - kind: ConfigMap
                 name: cluster-settings-user
+                optional: true
               - kind: Secret
                 name: cluster-secrets-user
+                optional: true
       target:
         group: kustomize.toolkit.fluxcd.io
         kind: Kustomization
diff --git a/bootstrap/templates/kubernetes/flux/vars/cluster-secrets-user.sops.yaml.j2 b/bootstrap/templates/kubernetes/flux/vars/cluster-secrets-user.sops.yaml.j2
deleted file mode 100644
index 281accfb..00000000
--- a/bootstrap/templates/kubernetes/flux/vars/cluster-secrets-user.sops.yaml.j2
+++ /dev/null
@@ -1,8 +0,0 @@
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: cluster-secrets-user
-  namespace: flux-system
-stringData:
-  SECRET_PLACEHOLDER: "secret-value"
diff --git a/bootstrap/templates/kubernetes/flux/vars/cluster-settings-user.yaml.j2 b/bootstrap/templates/kubernetes/flux/vars/cluster-settings-user.yaml.j2
deleted file mode 100644
index 7b817616..00000000
--- a/bootstrap/templates/kubernetes/flux/vars/cluster-settings-user.yaml.j2
+++ /dev/null
@@ -1,8 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cluster-settings-user
-  namespace: flux-system
-data:
-  SETTINGS_PLACEHOLDER: "settings-value"
diff --git a/bootstrap/templates/kubernetes/flux/vars/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/flux/vars/kustomization.yaml.j2
index dd93387a..8db2fe91 100644
--- a/bootstrap/templates/kubernetes/flux/vars/kustomization.yaml.j2
+++ b/bootstrap/templates/kubernetes/flux/vars/kustomization.yaml.j2
@@ -2,6 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./cluster-settings.yaml
-  - ./cluster-settings-user.yaml
   - ./cluster-secrets.sops.yaml
-  - ./cluster-secrets-user.sops.yaml