From 8a719d3f0ada597a4a52ce1081bdbf342139c2d5 Mon Sep 17 00:00:00 2001
From: Michael McAuley <52299065+Michael-McAuley-SSC@users.noreply.github.com>
Date: Mon, 25 Mar 2024 11:33:45 -0600
Subject: [PATCH] fix:  changed <x-fleet-id> and <namespace> to as they were
 causing render issues in git gui (#909)

---
 .../gke-cluster-autopilot/gkehub-featuremembership-acm.yaml   | 2 +-
 .../gke/configconnector/gke-cluster-autopilot/setters.yaml    | 2 +-
 .../kubernetes/namespace-defaults/cd/gitops-config-sync.yaml  | 4 ++--
 solutions/gke/kubernetes/namespace-defaults/setters.yaml      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/solutions/gke/configconnector/gke-cluster-autopilot/gkehub-featuremembership-acm.yaml b/solutions/gke/configconnector/gke-cluster-autopilot/gkehub-featuremembership-acm.yaml
index 22843ad31..78e654e52 100644
--- a/solutions/gke/configconnector/gke-cluster-autopilot/gkehub-featuremembership-acm.yaml
+++ b/solutions/gke/configconnector/gke-cluster-autopilot/gkehub-featuremembership-acm.yaml
@@ -37,7 +37,7 @@ spec:
       git:
         syncRepo: "https://AZDO-ORG@dev.azure.com/AZDO-ORG/AZDO-PROJECT/_git/REPO-NAME" # kpt-set: ${repo-url}
         syncBranch: "main" # kpt-set: ${repo-branch}
-        policyDir: csync/tier3/kubernetes/<fleet-id>/deploy/<env> # kpt-set: ${repo-dir}
+        policyDir: csync/tier3/kubernetes/_X-FLEET-ID/deploy/<env> # kpt-set: ${repo-dir}
         syncWaitSecs: "20"
         syncRev: "HEAD"
         secretType: "token"
diff --git a/solutions/gke/configconnector/gke-cluster-autopilot/setters.yaml b/solutions/gke/configconnector/gke-cluster-autopilot/setters.yaml
index b972fa1e1..2f8db5684 100644
--- a/solutions/gke/configconnector/gke-cluster-autopilot/setters.yaml
+++ b/solutions/gke/configconnector/gke-cluster-autopilot/setters.yaml
@@ -153,7 +153,7 @@ data:
   #
   # the directory to observe for YAML manifests
   # customization: required
-  repo-dir: csync/tier3/kubernetes/<fleet-id>/deploy/<env>
+  repo-dir: csync/tier3/kubernetes/_X-FLEET-ID/deploy/<env>
   #
   ##########################
   # End of Configurations
diff --git a/solutions/gke/kubernetes/namespace-defaults/cd/gitops-config-sync.yaml b/solutions/gke/kubernetes/namespace-defaults/cd/gitops-config-sync.yaml
index 7c1237223..c03eacb40 100644
--- a/solutions/gke/kubernetes/namespace-defaults/cd/gitops-config-sync.yaml
+++ b/solutions/gke/kubernetes/namespace-defaults/cd/gitops-config-sync.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #########
-# Root Sync to observe folder csync/tier4/kubernetes/<fleet-id>/deploy/env/<namespace>
+# Root Sync to observe folder csync/tier4/kubernetes/_X-FLEET-ID/deploy/env/_NAMESPACE
 # CM-5(1) - Files are read from the folder and applied to the infrastructure in automated way
 apiVersion: configsync.gke.io/v1beta1
 kind: RootSync
@@ -31,7 +31,7 @@ spec:
   git:
     repo: https://repo-url # kpt-set: ${repo-url}
     branch: main # kpt-set: ${repo-branch}
-    dir: csync/tier4/kubernetes/<fleet-id>/deploy/env/<namespace> # kpt-set: ${repo-dir}
+    dir: csync/tier4/kubernetes/_X-FLEET-ID/deploy/env/_NAMESPACE # kpt-set: ${repo-dir}
     revision: HEAD
     auth: token
     secretRef:
diff --git a/solutions/gke/kubernetes/namespace-defaults/setters.yaml b/solutions/gke/kubernetes/namespace-defaults/setters.yaml
index 3e7007cd0..f2b66e330 100644
--- a/solutions/gke/kubernetes/namespace-defaults/setters.yaml
+++ b/solutions/gke/kubernetes/namespace-defaults/setters.yaml
@@ -74,7 +74,7 @@ data:
   #
   # the directory to observe for YAML manifests
   # customization: required
-  repo-dir: csync/tier4/kubernetes/<fleet-id>/deploy/env/<namespace>
+  repo-dir: csync/tier4/kubernetes/_X-FLEET-ID/deploy/env/_NAMESPACE
   #
   ##########################
   # End of Configurations