refactor+fixes (#166)

bootstrap/ic-shared-llm/job-enable-modelcar.yaml → bootstrap/ic-rhoai-configuration/job-enable-modelcar.yaml

@@ -1,12 +1,13 @@
+---
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: patch-inferenceservice-config
-  namespace: ic-shared-llm
-annotations:
-  argocd.argoproj.io/sync-wave: "1"
-  argocd.argoproj.io/hook: Sync
-  argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
+  namespace: rhods-notebooks
+  annotations:
+    argocd.argoproj.io/sync-wave: "2"
+    argocd.argoproj.io/hook: Sync
+    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
 spec:
   backoffLimit: 4
   template:

bootstrap/ic-rhoai-configuration/kustomization.yaml

@@ -9,10 +9,13 @@ resources:
   # wave 0
   - gp3-remove-default.yaml
   - ceph-rbd-set-default.yaml
+  - odf-config-nvidia.yaml
   - namespace-notebooks.yaml
   # wave 1
+  - rbac-job-enable-modelcar.yaml
   - workbench-imagestream.yaml
   - odhdashboardconfig.yaml
   - accelerator-profile.yaml
   # wave 2
+  - job-enable-modelcar.yaml
   - images-puller.yaml

bootstrap/ic-shared-llm/rbac-job-enable-modelcar.yaml → bootstrap/ic-rhoai-configuration/rbac-job-enable-modelcar.yaml

@@ -3,17 +3,17 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: modelcar-enable-sa
-  namespace: ic-shared-llm
+  namespace: rhods-notebooks
   annotations:
-    argocd.argoproj.io/sync-wave: "0"
+    argocd.argoproj.io/sync-wave: "1"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: modelcar-enable-patch-role
   namespace: redhat-ods-applications
   annotations:
-    argocd.argoproj.io/sync-wave: "0"
+    argocd.argoproj.io/sync-wave: "1"
 rules:
 - apiGroups: ["redhat.com"]
   resources: ["dsci"]
@@ -31,11 +31,11 @@ metadata:
   name: modelcar-enable-patch-rolebinding
   namespace: redhat-ods-applications
   annotations:
-    argocd.argoproj.io/sync-wave: "0"
+    argocd.argoproj.io/sync-wave: "1"
 subjects:
 - kind: ServiceAccount
   name: modelcar-enable-sa
-  namespace: ic-shared-llm 
+  namespace: rhods-notebooks 
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -46,7 +46,7 @@ kind: ClusterRole
 metadata:
   name: modelcar-dsc-read
   annotations:
-    argocd.argoproj.io/sync-wave: "0"
+    argocd.argoproj.io/sync-wave: "1"
 rules:
 - apiGroups: ["dscinitialization.opendatahub.io"]
   resources: ["dscinitializations"]
@@ -57,11 +57,11 @@ kind: ClusterRoleBinding
 metadata:
   name: modelcar-dsc-read-binding
   annotations:
-    argocd.argoproj.io/sync-wave: "0"
+    argocd.argoproj.io/sync-wave: "1"
 subjects:
 - kind: ServiceAccount
   name: modelcar-enable-sa
-  namespace: ic-shared-llm 
+  namespace: rhods-notebooks 
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

bootstrap/ic-shared-llm/kustomization.yaml

@@ -8,16 +8,10 @@ commonLabels:
 resources:
 # wave 0
 - namespace.yaml
-- fix-odf-config.yaml
-- rbac-job-enable-modelcar.yaml
 # wave 1
-- job-enable-modelcar.yaml
+- serving-runtime-vllm-granite-modelcar.yaml
 # wave 2
-- service-runtime-vllm-granite-modelcar.yaml
-- pvc-hftgi.yaml
 - inference-service-granite-modelcar.yaml
+- pvc-hftgi.yaml
 - deployment-hftgi.yaml
 - service-hftgi.yaml
-
-components:
-- health-check-inferenceservice

bootstrap/ic-shared-llm/service-runtime-vllm-granite-modelcar.yaml → bootstrap/ic-shared-llm/serving-runtime-vllm-granite-modelcar.yaml

@@ -9,7 +9,7 @@ metadata:
     opendatahub.io/template-display-name: vLLM ServingRuntime for KServe
     opendatahub.io/template-name: vllm-runtime
     openshift.io/display-name: vllm
-    argocd.argoproj.io/sync-wave: "2"
+    argocd.argoproj.io/sync-wave: "1"
   name: vllm
   namespace: ic-shared-llm
   labels:

bootstrap/ic-user-projects/project-manager.yaml

@@ -14,11 +14,15 @@ kind: ServiceAccount
 metadata:
   name: project-creator
   namespace: ic-user-projects
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: project-creator-binding
+  annotations:
+  argocd.argoproj.io/sync-wave: "0"
 subjects:
 - kind: ServiceAccount
   name: project-creator
@@ -32,6 +36,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: route-reader
+  annotations:
+  argocd.argoproj.io/sync-wave: "0"
 rules:
 - apiGroups: ["route.openshift.io"]
   resources: ["routes"]