From 64312277ca9e74239a40efb572303a5f2bba9550 Mon Sep 17 00:00:00 2001
From: Grace Do <xgrace@gmail.com>
Date: Fri, 21 Jun 2024 15:07:43 -0700
Subject: [PATCH] feat: add gitops repo structure (#2319)

Revert "fix: Revert "feat: add gitops repo structure (#2284)" (#2298)"

This reverts commit ef8d4789cc3b3ca665d064df9890a36bec52f18d.
---
 clusters/README.md                            |  1 +
 .../apps/kommander.yaml                       | 21 +++++++++++++++++++
 .../apps/kommander/kustomization.yaml         |  4 ++++
 .../apps/kustomization.yaml                   |  4 ++++
 .../common/kustomization.yaml                 |  5 +++++
 .../kommander_host-cluster/kustomization.yaml |  5 +++++
 make/release.mk                               |  1 +
 projects/README.md                            |  1 +
 workspaces/README.md                          |  1 +
 9 files changed, 43 insertions(+)
 create mode 100644 clusters/README.md
 create mode 100644 clusters/kommander_host-cluster/apps/kommander.yaml
 create mode 100644 clusters/kommander_host-cluster/apps/kommander/kustomization.yaml
 create mode 100644 clusters/kommander_host-cluster/apps/kustomization.yaml
 create mode 100644 clusters/kommander_host-cluster/common/kustomization.yaml
 create mode 100644 clusters/kommander_host-cluster/kustomization.yaml
 create mode 100644 projects/README.md
 create mode 100644 workspaces/README.md

diff --git a/clusters/README.md b/clusters/README.md
new file mode 100644
index 000000000..7b9004a77
--- /dev/null
+++ b/clusters/README.md
@@ -0,0 +1 @@
+In order for Kommander to present the user with the set of enabled services on a specific attached cluster, a controller on the management cluster will look into the git repository's `/clusters/` directory for that specific cluster, de-reference the `resources` listed in the `kustomization.yaml` file and list them the same way it does for listing all available services outlined above.
diff --git a/clusters/kommander_host-cluster/apps/kommander.yaml b/clusters/kommander_host-cluster/apps/kommander.yaml
new file mode 100644
index 000000000..1862d5eb3
--- /dev/null
+++ b/clusters/kommander_host-cluster/apps/kommander.yaml
@@ -0,0 +1,21 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  creationTimestamp: null
+  name: apps-kommander
+  namespace: kommander
+spec:
+  interval: 6h
+  path: ./clusters/kommander_host-cluster/apps/kommander
+  postBuild:
+    substitute:
+      releaseNamespace: kommander
+      workspaceNamespace: kommander
+  prune: true
+  retryInterval: 1m
+  sourceRef:
+    kind: GitRepository
+    name: management
+    namespace: kommander-flux
+  timeout: 1m
+  wait: true
diff --git a/clusters/kommander_host-cluster/apps/kommander/kustomization.yaml b/clusters/kommander_host-cluster/apps/kommander/kustomization.yaml
new file mode 100644
index 000000000..76505f7f0
--- /dev/null
+++ b/clusters/kommander_host-cluster/apps/kommander/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+buildMetadata:
+- originAnnotations
diff --git a/clusters/kommander_host-cluster/apps/kustomization.yaml b/clusters/kommander_host-cluster/apps/kustomization.yaml
new file mode 100644
index 000000000..f66aae5df
--- /dev/null
+++ b/clusters/kommander_host-cluster/apps/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - kommander.yaml
diff --git a/clusters/kommander_host-cluster/common/kustomization.yaml b/clusters/kommander_host-cluster/common/kustomization.yaml
new file mode 100644
index 000000000..b231b39e8
--- /dev/null
+++ b/clusters/kommander_host-cluster/common/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../../common/base
+- ../../../common/kommander-operator
diff --git a/clusters/kommander_host-cluster/kustomization.yaml b/clusters/kommander_host-cluster/kustomization.yaml
new file mode 100644
index 000000000..19b83ca7b
--- /dev/null
+++ b/clusters/kommander_host-cluster/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - common
+  - apps
diff --git a/make/release.mk b/make/release.mk
index 66bbe4850..4747fc221 100644
--- a/make/release.mk
+++ b/make/release.mk
@@ -12,6 +12,7 @@ release:
 	git archive --format "tar.gz" -o $(ARCHIVE_NAME) \
 								  $(GIT_TAG) -- \
 								  common services charts \
+								  clusters projects workspaces \
 								  ":(exclude)common/helm-repositories/ai-navigator-repos.yaml" \
 								  ":(exclude)services/ai-navigator-app" \
 								  ":(exclude)services/ai-navigator-cluster-info-agent"
diff --git a/projects/README.md b/projects/README.md
new file mode 100644
index 000000000..028486e6e
--- /dev/null
+++ b/projects/README.md
@@ -0,0 +1 @@
+`/projects/` directory contains one directory for each project on the Kommander cluster. Contains `kustomization.yaml`.
diff --git a/workspaces/README.md b/workspaces/README.md
new file mode 100644
index 000000000..c57d344b1
--- /dev/null
+++ b/workspaces/README.md
@@ -0,0 +1 @@
+`/workspaces/` directory contains one directory for each workspace on the Kommander cluster. Contains `kustomization.yaml`.