update: notebooks

components/app-configs/rhoai-custom-images/base/kustomization.yaml

@@ -1,6 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
+namespace: custom-notebooks
+
 commonAnnotations:
   opendatahub.io/notebook-image-creator: ai-catalog
 
@@ -12,8 +14,6 @@ labels:
     # note: byon = bring your own notebook?
     app.kubernetes.io/created-by: byon
 
-namespace: custom-notebooks
-
 resources:
   - ./code-server
   - ./lightgbm

components/app-configs/rhoai-custom-images/base/opencv/buildconfig.yaml

@@ -7,7 +7,8 @@ spec:
     type: Git
     git:
       uri: https://github.com/redhat-na-ssa/demo-ai-gitops-catalog.git
-    contextDir: components/app-configs/custom-notebook-images/base/opencv
+      ref: main
+    contextDir: components/app-configs/rhoai-custom-images/base/opencv
   strategy:
     type: Docker
     dockerStrategy:

components/app-configs/rhoai-custom-images/components/rbac/kustomization.yaml

@@ -2,4 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 
 resources:
-  - rolebinding.yaml
+- rb-notebooks.yaml
+- rb-ods-apps.yaml

components/app-configs/rhoai-custom-images/components/rbac/rolebinding.yaml → components/app-configs/rhoai-custom-images/components/rbac/rb-notebooks.yaml

@@ -1,17 +1,4 @@
 ---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: custom-notebooks-admin
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: admin
-subjects:
-- apiGroup: rbac.authorization.k8s.io
-  kind: Group
-  name: workshop-admins
----
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

components/app-configs/rhoai-custom-images/components/rbac/rb-ods-apps.yaml

@@ -0,0 +1,14 @@
+---
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: custom-notebooks-pusher
+  namespace: redhat-ods-applications
+subjects:
+  - kind: ServiceAccount
+    name: builder
+    namespace: custom-notebooks
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: 'system:image-pusher'

components/app-configs/rhoai-custom-images/components/builder-rb/kustomization.yaml → components/app-configs/rhoai-custom-images/components/workshop/kustomization.yaml

@@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 
 resources:
-  - rolebinding.yaml
+- rolebinding.yaml

components/app-configs/rhoai-custom-images/components/workshop/rolebinding.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: custom-notebooks-admin
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: admin
+subjects:
+- apiGroup: rbac.authorization.k8s.io
+  kind: Group
+  name: workshop-admins

components/app-configs/rhoai-custom-images/overlays/default/kustomization.yaml

@@ -2,7 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 components:
-- ../../components/builder-rb
 - ../../components/namespace
 - ../../components/rbac
 
@@ -34,7 +33,6 @@ patches:
   - target:
       group: build.openshift.io
       kind: BuildConfig
-      # name: opencv-notebook-graphviz
     patch: |-
       - op: replace
         path: /spec/strategy/dockerStrategy/from/namespace