From e4a027e21d7d1e679cdc964d3e8e696dac6826dd Mon Sep 17 00:00:00 2001
From: Joseph Hanson <joe@veri.dev>
Date: Mon, 23 Sep 2024 01:25:01 -0500
Subject: [PATCH] fix kustomize replace

---
 .../apps/database/emqx/app/kustomization.yaml  | 18 ------------------
 .../database/emqx/cluster/kustomization.yaml   | 17 +++++++++++++++++
 .../emqx/{app => cluster}/resources/emqx.conf  |  0
 3 files changed, 17 insertions(+), 18 deletions(-)
 rename kubernetes/apps/database/emqx/{app => cluster}/resources/emqx.conf (100%)

diff --git a/kubernetes/apps/database/emqx/app/kustomization.yaml b/kubernetes/apps/database/emqx/app/kustomization.yaml
index 6cdb6c69..4eed917b 100644
--- a/kubernetes/apps/database/emqx/app/kustomization.yaml
+++ b/kubernetes/apps/database/emqx/app/kustomization.yaml
@@ -5,21 +5,3 @@ kind: Kustomization
 resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
-configMapGenerator:
-  - name: emqx-conf
-    files:
-      - emqx.conf=./resources/emqx.conf
-replacements:
-  - source:
-      kind: ConfigMap
-      name: emqx-conf
-    targets:
-      - fieldPaths:
-          - spec.config.data
-        options:
-          create: true
-        select:
-          kind: EMQX
-          name: emqx
-generatorOptions:
-  disableNameSuffixHash: true
diff --git a/kubernetes/apps/database/emqx/cluster/kustomization.yaml b/kubernetes/apps/database/emqx/cluster/kustomization.yaml
index 3573018f..c35ed6e2 100644
--- a/kubernetes/apps/database/emqx/cluster/kustomization.yaml
+++ b/kubernetes/apps/database/emqx/cluster/kustomization.yaml
@@ -5,5 +5,22 @@ resources:
   - ./cluster.yaml
   - ./ingress.yaml
   - ./podmonitor.yaml
+configMapGenerator:
+  - name: emqx-conf
+    files:
+      - emqx.conf=./resources/emqx.conf
+replacements:
+  - source:
+      kind: ConfigMap
+      name: emqx-conf
+      fieldPath: data.emqx\.conf
+    targets:
+      - fieldPaths:
+          - spec.config.data
+        options:
+          create: true
+        select:
+          kind: EMQX
+          name: emqx
 generatorOptions:
   disableNameSuffixHash: true
diff --git a/kubernetes/apps/database/emqx/app/resources/emqx.conf b/kubernetes/apps/database/emqx/cluster/resources/emqx.conf
similarity index 100%
rename from kubernetes/apps/database/emqx/app/resources/emqx.conf
rename to kubernetes/apps/database/emqx/cluster/resources/emqx.conf