From 6012583dff250527b1a2560a0c94959aba64cd61 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 16 Oct 2021 15:41:04 +0200
Subject: [PATCH] flux: Use kustmizations as recommended by flux

This fixes the way flux is deployed to always automatically setup the
commit owner verification.
---
 clusters/k8s01/flux-system/gotk-patches.yaml  | 10 ++++++++++
 clusters/k8s01/flux-system/kustomization.yaml |  2 ++
 2 files changed, 12 insertions(+)
 create mode 100644 clusters/k8s01/flux-system/gotk-patches.yaml

diff --git a/clusters/k8s01/flux-system/gotk-patches.yaml b/clusters/k8s01/flux-system/gotk-patches.yaml
new file mode 100644
index 000000000..520a1f31a
--- /dev/null
+++ b/clusters/k8s01/flux-system/gotk-patches.yaml
@@ -0,0 +1,10 @@
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: GitRepository
+metadata:
+  name: flux-system
+  namespace: flux-system
+spec:
+  verify:
+    mode: head
+    secretRef:
+      name: pgp-public-keys
diff --git a/clusters/k8s01/flux-system/kustomization.yaml b/clusters/k8s01/flux-system/kustomization.yaml
index 07dec686f..a8359e143 100644
--- a/clusters/k8s01/flux-system/kustomization.yaml
+++ b/clusters/k8s01/flux-system/kustomization.yaml
@@ -5,3 +5,5 @@ resources:
 - gotk-sync.yaml
 - gpg-keys.yaml
 - receiver.yaml
+patchesStrategicMerge:
+  - gotk-patches.yaml
-- 
GitLab