From 8f7f94ab24afd48d41c0208c6e4a9145955d5e56 Mon Sep 17 00:00:00 2001
From: Kyle Sullivan <141261s@acadiau.ca>
Date: Fri, 20 May 2022 15:42:54 -0300
Subject: [PATCH] Add flux image update secrets

---
 .../auto-image-update/bases/creds/kustomization.yaml  | 11 +++++++++++
 .../auto-image-update/bases/kustomization.yaml        |  1 +
 .../gke => bases}/tracker-git-repo-secret-patch.yaml  |  0
 .../auto-image-update/overlays/gke/kustomization.yaml |  2 --
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 k8s/clusters/auto-image-update/bases/creds/kustomization.yaml
 rename k8s/clusters/auto-image-update/{overlays/gke => bases}/tracker-git-repo-secret-patch.yaml (100%)

diff --git a/k8s/clusters/auto-image-update/bases/creds/kustomization.yaml b/k8s/clusters/auto-image-update/bases/creds/kustomization.yaml
new file mode 100644
index 0000000000..6f42419362
--- /dev/null
+++ b/k8s/clusters/auto-image-update/bases/creds/kustomization.yaml
@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+secretGenerator:
+- files:
+  - identity
+  - identity.pub
+  - known_hosts
+  name: flux-credentials
+  namespace: flux-system
+generatorOptions:
+  disableNameSuffixHash: true
diff --git a/k8s/clusters/auto-image-update/bases/kustomization.yaml b/k8s/clusters/auto-image-update/bases/kustomization.yaml
index 551c1ab77c..c2e636e1fc 100644
--- a/k8s/clusters/auto-image-update/bases/kustomization.yaml
+++ b/k8s/clusters/auto-image-update/bases/kustomization.yaml
@@ -4,3 +4,4 @@ resources:
   - ../../git-repo
   - image-repo-policies
   - image-update-automation.yaml
+  - tracker-git-repo-secret-patch.yaml
diff --git a/k8s/clusters/auto-image-update/overlays/gke/tracker-git-repo-secret-patch.yaml b/k8s/clusters/auto-image-update/bases/tracker-git-repo-secret-patch.yaml
similarity index 100%
rename from k8s/clusters/auto-image-update/overlays/gke/tracker-git-repo-secret-patch.yaml
rename to k8s/clusters/auto-image-update/bases/tracker-git-repo-secret-patch.yaml
diff --git a/k8s/clusters/auto-image-update/overlays/gke/kustomization.yaml b/k8s/clusters/auto-image-update/overlays/gke/kustomization.yaml
index 83aedc93bc..c104a05e32 100644
--- a/k8s/clusters/auto-image-update/overlays/gke/kustomization.yaml
+++ b/k8s/clusters/auto-image-update/overlays/gke/kustomization.yaml
@@ -2,5 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../bases
-patchesStrategicMerge:
-  - tracker-git-repo-secret-patch.yaml