From ed34e10435d926311218cd1f14693aed7b5c62a1 Mon Sep 17 00:00:00 2001
From: abasitt <abdul.basit@rakuten.com>
Date: Fri, 9 Aug 2024 15:36:55 +0000
Subject: [PATCH] moving httproute to app

---
 .../app/httproute-private.yaml}               |  0
 .../app/httproute.yaml}                       |  0
 .../echo-server/app/kustomization.yaml        |  2 ++
 .../neo/apps/default/gateway-routes/ks.yaml   | 21 -------------------
 .../gateway-routes/routes/kustomization.yaml  |  8 -------
 .../app/httproute.yaml}                       |  0
 .../homeassistant/app/kustomization.yaml      |  1 +
 7 files changed, 3 insertions(+), 29 deletions(-)
 rename kubernetes/neo/apps/default/{gateway-routes/routes/echo-server-private.yaml => echo-server/app/httproute-private.yaml} (100%)
 rename kubernetes/neo/apps/default/{gateway-routes/routes/echo-server.yaml => echo-server/app/httproute.yaml} (100%)
 delete mode 100644 kubernetes/neo/apps/default/gateway-routes/ks.yaml
 delete mode 100644 kubernetes/neo/apps/default/gateway-routes/routes/kustomization.yaml
 rename kubernetes/neo/apps/default/{gateway-routes/routes/homeassistant.yaml => homeassistant/app/httproute.yaml} (100%)

diff --git a/kubernetes/neo/apps/default/gateway-routes/routes/echo-server-private.yaml b/kubernetes/neo/apps/default/echo-server/app/httproute-private.yaml
similarity index 100%
rename from kubernetes/neo/apps/default/gateway-routes/routes/echo-server-private.yaml
rename to kubernetes/neo/apps/default/echo-server/app/httproute-private.yaml
diff --git a/kubernetes/neo/apps/default/gateway-routes/routes/echo-server.yaml b/kubernetes/neo/apps/default/echo-server/app/httproute.yaml
similarity index 100%
rename from kubernetes/neo/apps/default/gateway-routes/routes/echo-server.yaml
rename to kubernetes/neo/apps/default/echo-server/app/httproute.yaml
diff --git a/kubernetes/neo/apps/default/echo-server/app/kustomization.yaml b/kubernetes/neo/apps/default/echo-server/app/kustomization.yaml
index 5b48b4e2..c883d6cd 100644
--- a/kubernetes/neo/apps/default/echo-server/app/kustomization.yaml
+++ b/kubernetes/neo/apps/default/echo-server/app/kustomization.yaml
@@ -5,3 +5,5 @@ kind: Kustomization
 namespace: default
 resources:
   - ./helmrelease.yaml
+  - ./httproute.yaml
+  - ./httproute-private.yaml
diff --git a/kubernetes/neo/apps/default/gateway-routes/ks.yaml b/kubernetes/neo/apps/default/gateway-routes/ks.yaml
deleted file mode 100644
index 36ab0820..00000000
--- a/kubernetes/neo/apps/default/gateway-routes/ks.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: &app default-gateway-routes
-  namespace: flux-system
-spec:
-  targetNamespace: default
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *app
-  path: ./kubernetes/neo/apps/default/gateway-routes/routes
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-kubernetes
-  wait: false
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m
diff --git a/kubernetes/neo/apps/default/gateway-routes/routes/kustomization.yaml b/kubernetes/neo/apps/default/gateway-routes/routes/kustomization.yaml
deleted file mode 100644
index 55602088..00000000
--- a/kubernetes/neo/apps/default/gateway-routes/routes/kustomization.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# yaml-language-server: $schema=https://json.schemastore.org/kustomization
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - echo-server.yaml
-  - echo-server-private.yaml
-  - homeassistant.yaml
diff --git a/kubernetes/neo/apps/default/gateway-routes/routes/homeassistant.yaml b/kubernetes/neo/apps/default/homeassistant/app/httproute.yaml
similarity index 100%
rename from kubernetes/neo/apps/default/gateway-routes/routes/homeassistant.yaml
rename to kubernetes/neo/apps/default/homeassistant/app/httproute.yaml
diff --git a/kubernetes/neo/apps/default/homeassistant/app/kustomization.yaml b/kubernetes/neo/apps/default/homeassistant/app/kustomization.yaml
index 69d54db5..bc0f10a3 100644
--- a/kubernetes/neo/apps/default/homeassistant/app/kustomization.yaml
+++ b/kubernetes/neo/apps/default/homeassistant/app/kustomization.yaml
@@ -6,3 +6,4 @@ namespace: default
 resources:
   - ./external-svc-ep.yaml
   - ./service-entry.yaml
+  - ./httproute.yaml