From 8e846a7e95b3e05d25e8a22b8467ad56ba885c5b Mon Sep 17 00:00:00 2001
From: Tejas Parikh <tejas@tejasparikh.com>
Date: Tue, 12 Jan 2021 15:49:28 -0500
Subject: [PATCH] Refactor Kustomize templates

This PR removes the fullstack kustomize template and simplifies the base deploy of controller. Kustomize will now only deploy controller resources.
---
 deploy/base/kustomization.yaml                  | 13 -------------
 deploy/fullstack/controller/kustomization.yaml  | 12 ------------
 deploy/fullstack/controller/ns.yaml             |  5 -----
 deploy/fullstack/kustomization.yaml             |  7 -------
 deploy/fullstack/provisioner/kustomization.yaml | 11 -----------
 deploy/fullstack/provisioner/ns.yaml            |  5 -----
 kustomization.yaml                              | 14 ++++++++++++++
 {deploy/base => resources}/deployment.yaml      |  1 +
 {deploy/base => resources}/rbac.yaml            |  0
 {deploy/base => resources}/sa.yaml              |  0
 10 files changed, 15 insertions(+), 53 deletions(-)
 delete mode 100644 deploy/base/kustomization.yaml
 delete mode 100644 deploy/fullstack/controller/kustomization.yaml
 delete mode 100644 deploy/fullstack/controller/ns.yaml
 delete mode 100644 deploy/fullstack/kustomization.yaml
 delete mode 100644 deploy/fullstack/provisioner/kustomization.yaml
 delete mode 100644 deploy/fullstack/provisioner/ns.yaml
 create mode 100644 kustomization.yaml
 rename {deploy/base => resources}/deployment.yaml (96%)
 rename {deploy/base => resources}/rbac.yaml (100%)
 rename {deploy/base => resources}/sa.yaml (100%)

diff --git a/deploy/base/kustomization.yaml b/deploy/base/kustomization.yaml
deleted file mode 100644
index 100cd95..0000000
--- a/deploy/base/kustomization.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-bases:
-# CRDs
-- github.com/kubernetes-sigs/container-object-storage-interface-api/crds
-
-resources:
-# Controller
-- sa.yaml
-- rbac.yaml
-- deployment.yaml
diff --git a/deploy/fullstack/controller/kustomization.yaml b/deploy/fullstack/controller/kustomization.yaml
deleted file mode 100644
index 9a10331..0000000
--- a/deploy/fullstack/controller/kustomization.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-namespace: objectstorage-system
-
-bases:
-- ../../base/
-
-resources:
-# Namespace
-- ns.yaml
diff --git a/deploy/fullstack/controller/ns.yaml b/deploy/fullstack/controller/ns.yaml
deleted file mode 100644
index c31ae9c..0000000
--- a/deploy/fullstack/controller/ns.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: objectstorage-system
diff --git a/deploy/fullstack/kustomization.yaml b/deploy/fullstack/kustomization.yaml
deleted file mode 100644
index 787fc8d..0000000
--- a/deploy/fullstack/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-bases:
-- ./controller
-- ./provisioner
diff --git a/deploy/fullstack/provisioner/kustomization.yaml b/deploy/fullstack/provisioner/kustomization.yaml
deleted file mode 100644
index 81f1f2e..0000000
--- a/deploy/fullstack/provisioner/kustomization.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-namespace: objectstorage-provisioner-ns
-
-resources:
-# Namespace
-- ns.yaml
-# Sidecar
-- https://raw.githubusercontent.com/container-object-storage-interface/cosi-provisioner-sidecar/master/examples/object-storage-sidecar.yaml
diff --git a/deploy/fullstack/provisioner/ns.yaml b/deploy/fullstack/provisioner/ns.yaml
deleted file mode 100644
index 04eb2ff..0000000
--- a/deploy/fullstack/provisioner/ns.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: objectstorage-provisioner-ns
diff --git a/kustomization.yaml b/kustomization.yaml
new file mode 100644
index 0000000..1cb50a7
--- /dev/null
+++ b/kustomization.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+commonLabels:
+  app.kubernetes.io/part-of: container-object-storage-interface
+  app.kubernetes.io/component: controller
+  app.kubernetes.io/version: main
+  app.kubernetes.io/name: container-object-storage-interface-controller
+
+resources:
+- resources/sa.yaml
+- resources/rbac.yaml
+- resources/deployment.yaml
diff --git a/deploy/base/deployment.yaml b/resources/deployment.yaml
similarity index 96%
rename from deploy/base/deployment.yaml
rename to resources/deployment.yaml
index 30c0922..ac8fc2a 100644
--- a/deploy/base/deployment.yaml
+++ b/resources/deployment.yaml
@@ -18,6 +18,7 @@ spec:
     matchLabels:
       app.kubernetes.io/part-of: container-object-storage-interface
       app.kubernetes.io/component: controller
+      app.kubernetes.io/version: main
       app.kubernetes.io/name: container-object-storage-interface-controller
   template:
     metadata:
diff --git a/deploy/base/rbac.yaml b/resources/rbac.yaml
similarity index 100%
rename from deploy/base/rbac.yaml
rename to resources/rbac.yaml
diff --git a/deploy/base/sa.yaml b/resources/sa.yaml
similarity index 100%
rename from deploy/base/sa.yaml
rename to resources/sa.yaml