From 2df55e08285d4a9f85e3db55f16a73f00dcf3706 Mon Sep 17 00:00:00 2001
From: Gerardo Gomez <gerardo@katulu.io>
Date: Wed, 13 Jul 2022 11:15:08 +0200
Subject: [PATCH] refactor(jupyter-notebook): split manifests in base and istio
 overlay

---
 components/kubeflow-notebooks/kustomization.yaml.tpl      | 2 +-
 .../kustomize/{ => base}/deployment.yaml                  | 0
 .../kustomize/{ => base}/kustomization.yaml               | 1 -
 .../kubeflow-notebooks/kustomize/{ => base}/pv-claim.yaml | 0
 .../kustomize/{ => base}/rolebinding.yaml                 | 0
 .../kubeflow-notebooks/kustomize/{ => base}/service.yaml  | 0
 .../kustomize/{ => base}/serviceaccount.yaml              | 0
 .../kustomize/overlays/istio/kustomization.yaml           | 8 ++++++++
 .../kustomize/{ => overlays/istio}/virtualservice.yaml    | 0
 9 files changed, 9 insertions(+), 2 deletions(-)
 rename components/kubeflow-notebooks/kustomize/{ => base}/deployment.yaml (100%)
 rename components/kubeflow-notebooks/kustomize/{ => base}/kustomization.yaml (89%)
 rename components/kubeflow-notebooks/kustomize/{ => base}/pv-claim.yaml (100%)
 rename components/kubeflow-notebooks/kustomize/{ => base}/rolebinding.yaml (100%)
 rename components/kubeflow-notebooks/kustomize/{ => base}/service.yaml (100%)
 rename components/kubeflow-notebooks/kustomize/{ => base}/serviceaccount.yaml (100%)
 create mode 100644 components/kubeflow-notebooks/kustomize/overlays/istio/kustomization.yaml
 rename components/kubeflow-notebooks/kustomize/{ => overlays/istio}/virtualservice.yaml (100%)

diff --git a/components/kubeflow-notebooks/kustomization.yaml.tpl b/components/kubeflow-notebooks/kustomization.yaml.tpl
index a3c609a..73bbc5e 100644
--- a/components/kubeflow-notebooks/kustomization.yaml.tpl
+++ b/components/kubeflow-notebooks/kustomization.yaml.tpl
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: katulu-fl
 resources:
-- kustomize
+- kustomize/overlays/istio
 commonLabels:
   app: jupyter-notebook
   app.kubernetes.io/component: jupyter-notebook
diff --git a/components/kubeflow-notebooks/kustomize/deployment.yaml b/components/kubeflow-notebooks/kustomize/base/deployment.yaml
similarity index 100%
rename from components/kubeflow-notebooks/kustomize/deployment.yaml
rename to components/kubeflow-notebooks/kustomize/base/deployment.yaml
diff --git a/components/kubeflow-notebooks/kustomize/kustomization.yaml b/components/kubeflow-notebooks/kustomize/base/kustomization.yaml
similarity index 89%
rename from components/kubeflow-notebooks/kustomize/kustomization.yaml
rename to components/kubeflow-notebooks/kustomize/base/kustomization.yaml
index 9c6a846..3a8ffc3 100644
--- a/components/kubeflow-notebooks/kustomize/kustomization.yaml
+++ b/components/kubeflow-notebooks/kustomize/base/kustomization.yaml
@@ -9,4 +9,3 @@ resources:
   - pv-claim.yaml
   - deployment.yaml
   - service.yaml
-  - virtualservice.yaml
diff --git a/components/kubeflow-notebooks/kustomize/pv-claim.yaml b/components/kubeflow-notebooks/kustomize/base/pv-claim.yaml
similarity index 100%
rename from components/kubeflow-notebooks/kustomize/pv-claim.yaml
rename to components/kubeflow-notebooks/kustomize/base/pv-claim.yaml
diff --git a/components/kubeflow-notebooks/kustomize/rolebinding.yaml b/components/kubeflow-notebooks/kustomize/base/rolebinding.yaml
similarity index 100%
rename from components/kubeflow-notebooks/kustomize/rolebinding.yaml
rename to components/kubeflow-notebooks/kustomize/base/rolebinding.yaml
diff --git a/components/kubeflow-notebooks/kustomize/service.yaml b/components/kubeflow-notebooks/kustomize/base/service.yaml
similarity index 100%
rename from components/kubeflow-notebooks/kustomize/service.yaml
rename to components/kubeflow-notebooks/kustomize/base/service.yaml
diff --git a/components/kubeflow-notebooks/kustomize/serviceaccount.yaml b/components/kubeflow-notebooks/kustomize/base/serviceaccount.yaml
similarity index 100%
rename from components/kubeflow-notebooks/kustomize/serviceaccount.yaml
rename to components/kubeflow-notebooks/kustomize/base/serviceaccount.yaml
diff --git a/components/kubeflow-notebooks/kustomize/overlays/istio/kustomization.yaml b/components/kubeflow-notebooks/kustomize/overlays/istio/kustomization.yaml
new file mode 100644
index 0000000..6094326
--- /dev/null
+++ b/components/kubeflow-notebooks/kustomize/overlays/istio/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: katulu-fl
+
+resources:
+  - ../../base
+  - virtualservice.yaml
diff --git a/components/kubeflow-notebooks/kustomize/virtualservice.yaml b/components/kubeflow-notebooks/kustomize/overlays/istio/virtualservice.yaml
similarity index 100%
rename from components/kubeflow-notebooks/kustomize/virtualservice.yaml
rename to components/kubeflow-notebooks/kustomize/overlays/istio/virtualservice.yaml