From 9546953b97894f3e6caac63e971834824fcf5313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Tailland?= <stephane.tailland@ibm.com>
Date: Thu, 20 Aug 2026 14:37:08 +0200
Subject: [PATCH] Flux refactoring

---
 dev/externalsecret.yaml                      | 25 ++++++++++++++++++++
 dev/flux-kustomization.yaml                  |  4 ++--
 gitrepository.yaml => dev/gitrepository.yaml |  2 +-
 {dev/kong => kong}/kongplugin.yaml           |  0
 {dev/kong => kong}/kustomization.yaml        |  0
 {dev/kong => kong}/pluginbindings.yaml       |  0
 {dev/kong => kong}/routes.yaml               |  0
 {dev/kong => kong}/service.yaml              |  0
 8 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 dev/externalsecret.yaml
 rename gitrepository.yaml => dev/gitrepository.yaml (91%)
 rename {dev/kong => kong}/kongplugin.yaml (100%)
 rename {dev/kong => kong}/kustomization.yaml (100%)
 rename {dev/kong => kong}/pluginbindings.yaml (100%)
 rename {dev/kong => kong}/routes.yaml (100%)
 rename {dev/kong => kong}/service.yaml (100%)

diff --git a/dev/externalsecret.yaml b/dev/externalsecret.yaml
new file mode 100644
index 0000000..dc4767f
--- /dev/null
+++ b/dev/externalsecret.yaml
@@ -0,0 +1,25 @@
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: catalog-api-git-auth
+  namespace: catalog
+spec:
+  refreshInterval: 1h
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault-kong-v2
+  target:
+    name: catalog-api-git-auth
+  data:
+    - secretKey: identity
+      remoteRef:
+        key: kong-v2/catalog-api/git-deploy-key
+        property: identity
+    - secretKey: identity.pub
+      remoteRef:
+        key: kong-v2/catalog-api/git-deploy-key
+        property: identity.pub
+    - secretKey: known_hosts
+      remoteRef:
+        key: kong-v2/catalog-api/git-deploy-key
+        property: known_hosts
diff --git a/dev/flux-kustomization.yaml b/dev/flux-kustomization.yaml
index 495561f..26dbf37 100644
--- a/dev/flux-kustomization.yaml
+++ b/dev/flux-kustomization.yaml
@@ -7,8 +7,8 @@ spec:
   interval: 10m
   sourceRef:
     kind: GitRepository
-    name: catalog-api
-  path: ./dev/kong
+    name: catalog-api-dev
+  path: ./kong
   prune: true
   dependsOn:
     - name: catalog-dev-api-gateway
diff --git a/gitrepository.yaml b/dev/gitrepository.yaml
similarity index 91%
rename from gitrepository.yaml
rename to dev/gitrepository.yaml
index d826fc2..8cef0bf 100644
--- a/gitrepository.yaml
+++ b/dev/gitrepository.yaml
@@ -1,7 +1,7 @@
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: GitRepository
 metadata:
-  name: catalog-api
+  name: catalog-api-dev
   namespace: catalog
 spec:
   interval: 5m
diff --git a/dev/kong/kongplugin.yaml b/kong/kongplugin.yaml
similarity index 100%
rename from dev/kong/kongplugin.yaml
rename to kong/kongplugin.yaml
diff --git a/dev/kong/kustomization.yaml b/kong/kustomization.yaml
similarity index 100%
rename from dev/kong/kustomization.yaml
rename to kong/kustomization.yaml
diff --git a/dev/kong/pluginbindings.yaml b/kong/pluginbindings.yaml
similarity index 100%
rename from dev/kong/pluginbindings.yaml
rename to kong/pluginbindings.yaml
diff --git a/dev/kong/routes.yaml b/kong/routes.yaml
similarity index 100%
rename from dev/kong/routes.yaml
rename to kong/routes.yaml
diff --git a/dev/kong/service.yaml b/kong/service.yaml
similarity index 100%
rename from dev/kong/service.yaml
rename to kong/service.yaml