From 640a58fa4a0333a1529ff44eedaf694e5a5ee9ac Mon Sep 17 00:00:00 2001
From: Cory Latschkowski <koree@redhat.com>
Date: Fri, 1 Nov 2024 16:17:31 -0500
Subject: [PATCH] update: notebooks

---
 .../rhoai-custom-images/base/kustomization.yaml        |  3 ---
 .../components/builder-rb/kustomization.yaml           | 10 ++++++++++
 .../builder-rb/rolebinding.yaml}                       |  1 -
 .../components/namespace/kustomization.yaml            |  5 +++++
 .../{base => components/namespace}/namespace.yaml      |  0
 .../components/rbac/kustomization.yaml                 | 10 ++++++++++
 .../rbac/rolebinding.yaml}                             |  0
 .../overlays/default/kustomization.yaml                |  5 +++++
 8 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 components/app-configs/rhoai-custom-images/components/builder-rb/kustomization.yaml
 rename components/app-configs/rhoai-custom-images/{base/custom-notebooks-rb.yaml => components/builder-rb/rolebinding.yaml} (99%)
 create mode 100644 components/app-configs/rhoai-custom-images/components/namespace/kustomization.yaml
 rename components/app-configs/rhoai-custom-images/{base => components/namespace}/namespace.yaml (100%)
 create mode 100644 components/app-configs/rhoai-custom-images/components/rbac/kustomization.yaml
 rename components/app-configs/rhoai-custom-images/{base/namespace-rb.yaml => components/rbac/rolebinding.yaml} (100%)

diff --git a/components/app-configs/rhoai-custom-images/base/kustomization.yaml b/components/app-configs/rhoai-custom-images/base/kustomization.yaml
index 0ffe31a0..afa93529 100644
--- a/components/app-configs/rhoai-custom-images/base/kustomization.yaml
+++ b/components/app-configs/rhoai-custom-images/base/kustomization.yaml
@@ -19,6 +19,3 @@ resources:
   - ./lightgbm
   - ./opencv
   - ./rstudio
-  - custom-notebooks-rb.yaml
-  - namespace.yaml
-  - namespace-rb.yaml
diff --git a/components/app-configs/rhoai-custom-images/components/builder-rb/kustomization.yaml b/components/app-configs/rhoai-custom-images/components/builder-rb/kustomization.yaml
new file mode 100644
index 00000000..6ef7ea3b
--- /dev/null
+++ b/components/app-configs/rhoai-custom-images/components/builder-rb/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - rolebinding.yaml
+
+# patches:
+#   - path: patch-admin-group.yaml
+#     target:
+#       kind: Group
diff --git a/components/app-configs/rhoai-custom-images/base/custom-notebooks-rb.yaml b/components/app-configs/rhoai-custom-images/components/builder-rb/rolebinding.yaml
similarity index 99%
rename from components/app-configs/rhoai-custom-images/base/custom-notebooks-rb.yaml
rename to components/app-configs/rhoai-custom-images/components/builder-rb/rolebinding.yaml
index d24b9fa3..ecea5133 100644
--- a/components/app-configs/rhoai-custom-images/base/custom-notebooks-rb.yaml
+++ b/components/app-configs/rhoai-custom-images/components/builder-rb/rolebinding.yaml
@@ -12,7 +12,6 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: 'system:image-pusher'
-
 # ---
 # kind: RoleBinding
 # apiVersion: rbac.authorization.k8s.io/v1
diff --git a/components/app-configs/rhoai-custom-images/components/namespace/kustomization.yaml b/components/app-configs/rhoai-custom-images/components/namespace/kustomization.yaml
new file mode 100644
index 00000000..e1fa3359
--- /dev/null
+++ b/components/app-configs/rhoai-custom-images/components/namespace/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - namespace.yaml
diff --git a/components/app-configs/rhoai-custom-images/base/namespace.yaml b/components/app-configs/rhoai-custom-images/components/namespace/namespace.yaml
similarity index 100%
rename from components/app-configs/rhoai-custom-images/base/namespace.yaml
rename to components/app-configs/rhoai-custom-images/components/namespace/namespace.yaml
diff --git a/components/app-configs/rhoai-custom-images/components/rbac/kustomization.yaml b/components/app-configs/rhoai-custom-images/components/rbac/kustomization.yaml
new file mode 100644
index 00000000..6ef7ea3b
--- /dev/null
+++ b/components/app-configs/rhoai-custom-images/components/rbac/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - rolebinding.yaml
+
+# patches:
+#   - path: patch-admin-group.yaml
+#     target:
+#       kind: Group
diff --git a/components/app-configs/rhoai-custom-images/base/namespace-rb.yaml b/components/app-configs/rhoai-custom-images/components/rbac/rolebinding.yaml
similarity index 100%
rename from components/app-configs/rhoai-custom-images/base/namespace-rb.yaml
rename to components/app-configs/rhoai-custom-images/components/rbac/rolebinding.yaml
diff --git a/components/app-configs/rhoai-custom-images/overlays/default/kustomization.yaml b/components/app-configs/rhoai-custom-images/overlays/default/kustomization.yaml
index 65d6e145..c356e2d1 100644
--- a/components/app-configs/rhoai-custom-images/overlays/default/kustomization.yaml
+++ b/components/app-configs/rhoai-custom-images/overlays/default/kustomization.yaml
@@ -1,6 +1,11 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
+components:
+- ../../components/builder-rb
+- ../../components/namespace
+- ../../components/rbac
+
 resources:
   - ../../base