From b0ed194db488b9f4389f709d1d48ab39f42a862b Mon Sep 17 00:00:00 2001
From: Sergei <romanov_serg@protonmail.com>
Date: Tue, 29 Oct 2024 22:48:08 +0100
Subject: [PATCH] Improve files structure

---
 Makefile                                       | 16 ++++++++++++++++
 crd-scheme.yaml => deployments/crd-scheme.yaml |  1 -
 k8s.yaml => deployments/deployment.yaml        |  0
 rbac.yaml => deployments/rbac.yaml             |  0
 crd2.yaml => tests/crd-group.yaml              |  4 ++--
 crd.yaml => tests/crd-route.yaml               |  0
 6 files changed, 18 insertions(+), 3 deletions(-)
 rename crd-scheme.yaml => deployments/crd-scheme.yaml (99%)
 rename k8s.yaml => deployments/deployment.yaml (100%)
 rename rbac.yaml => deployments/rbac.yaml (100%)
 rename crd2.yaml => tests/crd-group.yaml (70%)
 rename crd.yaml => tests/crd-route.yaml (100%)

diff --git a/Makefile b/Makefile
index 57e6b16..b8a0399 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,22 @@
+tests/routes:
+	kubectl apply -f tests/crd-route.yaml
+
+tests/groups:
+	kubectl apply -f tests/crd-group.yaml
+
+update-crd:
+	kubectl apply -f deployments/crd-scheme.yaml
+
+update-ver:
+	sudo docker build -t 1doce8/netbird-operator:latest .
+	sudo docker push 1doce8/netbird-operator
+	kubectl delete -f k8s.yaml
+	kubectl apply -f k8s.yaml
+
 build:
 	sudo docker build -t 1doce8/netbird-operator:latest .
 	sudo docker push 1doce8/netbird-operator
+
 redeploy:
 	kubectl delete -f k8s.yaml
 	kubectl apply -f k8s.yaml
diff --git a/crd-scheme.yaml b/deployments/crd-scheme.yaml
similarity index 99%
rename from crd-scheme.yaml
rename to deployments/crd-scheme.yaml
index b3b9077..c055277 100644
--- a/crd-scheme.yaml
+++ b/deployments/crd-scheme.yaml
@@ -116,7 +116,6 @@ spec:
   group: gitops.netbird.io
   names:
     kind: Groups
-    # listKind: NetbirdGroupList
     plural: groups
     singular: group
   scope: Namespaced
diff --git a/k8s.yaml b/deployments/deployment.yaml
similarity index 100%
rename from k8s.yaml
rename to deployments/deployment.yaml
diff --git a/rbac.yaml b/deployments/rbac.yaml
similarity index 100%
rename from rbac.yaml
rename to deployments/rbac.yaml
diff --git a/crd2.yaml b/tests/crd-group.yaml
similarity index 70%
rename from crd2.yaml
rename to tests/crd-group.yaml
index 7188466..46a1133 100644
--- a/crd2.yaml
+++ b/tests/crd-group.yaml
@@ -4,5 +4,5 @@ metadata:
   name: test-group
   namespace: netbird-system
 spec:
-  name: "Test"
-  description: "Test"
\ No newline at end of file
+  name: "Test-Group"
+  description: "Test Group"
\ No newline at end of file
diff --git a/crd.yaml b/tests/crd-route.yaml
similarity index 100%
rename from crd.yaml
rename to tests/crd-route.yaml