From 01881907bb2d60fa8348e80ad86e1618872b4215 Mon Sep 17 00:00:00 2001
From: SeanOMik <seanomik@gmail.com>
Date: Wed, 18 Sep 2024 19:33:50 -0400
Subject: [PATCH] fix: use correct kustomize file paths

---
 .../{operator => }/cr/kustomization.yaml      |  0
 kubernetes/thin/apps/kubevirt/ks.yaml         | 30 ++++++++++
 .../thin/apps/kubevirt/operator/ks.yaml       | 60 -------------------
 .../operator/{app => }/kustomization.yaml     |  0
 4 files changed, 30 insertions(+), 60 deletions(-)
 rename kubernetes/thin/apps/kubevirt/{operator => }/cr/kustomization.yaml (100%)
 delete mode 100644 kubernetes/thin/apps/kubevirt/operator/ks.yaml
 rename kubernetes/thin/apps/kubevirt/operator/{app => }/kustomization.yaml (100%)

diff --git a/kubernetes/thin/apps/kubevirt/operator/cr/kustomization.yaml b/kubernetes/thin/apps/kubevirt/cr/kustomization.yaml
similarity index 100%
rename from kubernetes/thin/apps/kubevirt/operator/cr/kustomization.yaml
rename to kubernetes/thin/apps/kubevirt/cr/kustomization.yaml
diff --git a/kubernetes/thin/apps/kubevirt/ks.yaml b/kubernetes/thin/apps/kubevirt/ks.yaml
index a4b0510..41dda7d 100644
--- a/kubernetes/thin/apps/kubevirt/ks.yaml
+++ b/kubernetes/thin/apps/kubevirt/ks.yaml
@@ -28,3 +28,33 @@ spec:
         name: cluster-settings
       - kind: Secret
         name: cluster-secrets
+---
+# 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: kubevirt-operator-cr
+  namespace: flux-system
+spec:
+  timeout: 5m
+  interval: 10m
+  path: ./kubernetes/thin/apps/kubevirt/cr
+  prune: true
+  targetNamespace: kubevirt
+  sourceRef:
+    kind: GitRepository
+    name: home-cluster
+  decryption:
+    provider: sops
+    secretRef:
+      name: sops-gpg
+  dependsOn:
+  - name: kubevirt-operator
+    namespace: flux-system
+  postBuild:
+    substitute: {}
+    substituteFrom:
+      - kind: ConfigMap
+        name: cluster-settings
+      - kind: Secret
+        name: cluster-secrets
\ No newline at end of file
diff --git a/kubernetes/thin/apps/kubevirt/operator/ks.yaml b/kubernetes/thin/apps/kubevirt/operator/ks.yaml
deleted file mode 100644
index 963f952..0000000
--- a/kubernetes/thin/apps/kubevirt/operator/ks.yaml
+++ /dev/null
@@ -1,60 +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: kubevirt-operator
-  namespace: flux-system
-spec:
-  timeout: 5m
-  interval: 10m
-  path: ./kubernetes/thin/apps/kubevirt/operator/app
-  prune: true
-  targetNamespace: kubevirt
-  sourceRef:
-    kind: GitRepository
-    name: home-cluster
-  decryption:
-    provider: sops
-    secretRef:
-      name: sops-gpg
-  dependsOn:
-  - name: openebs
-    namespace: flux-system
-  postBuild:
-    substitute: {}
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-      - kind: Secret
-        name: cluster-secrets
----
-# 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: kubevirt-operator-cr
-  namespace: flux-system
-spec:
-  timeout: 5m
-  interval: 10m
-  path: ./kubernetes/thin/apps/kubevirt/operator/cr
-  prune: true
-  targetNamespace: kubevirt
-  sourceRef:
-    kind: GitRepository
-    name: home-cluster
-  decryption:
-    provider: sops
-    secretRef:
-      name: sops-gpg
-  dependsOn:
-  - name: kubevirt-operator
-    namespace: flux-system
-  postBuild:
-    substitute: {}
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-      - kind: Secret
-        name: cluster-secrets
\ No newline at end of file
diff --git a/kubernetes/thin/apps/kubevirt/operator/app/kustomization.yaml b/kubernetes/thin/apps/kubevirt/operator/kustomization.yaml
similarity index 100%
rename from kubernetes/thin/apps/kubevirt/operator/app/kustomization.yaml
rename to kubernetes/thin/apps/kubevirt/operator/kustomization.yaml