rename: things

redhat-na-ssa · May 31, 2024 · 3984723 · 3984723
1 parent 0beb333
commit 3984723
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 10 deletions.
diff --git a/components/configs/kustomized/minio/base/data-connector-rb.yaml b/components/configs/kustomized/minio/base/data-connector-rb.yaml
@@ -15,7 +15,10 @@ subjects:
   namespace: ds-group
 - kind: ServiceAccount
   name: data-connection-setup
-  namespace: ds-kserve-project
+  namespace: ds-kserve
+- kind: ServiceAccount
+  name: data-connection-setup
+  namespace: ds-modelmesh
 - kind: ServiceAccount
   name: data-connection-setup
   namespace: openshift-adp
diff --git a/...onents/configs/kustomized/rhoai-data-connector/overlays/kserve-project/kustomization.yaml b/...onents/configs/kustomized/rhoai-data-connector/overlays/kserve-project/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-namespace: ds-kserve-project
+namespace: ds-kserve
 
 resources:
   - ../../base
@@ -14,4 +14,4 @@ patches:
     patch: |-
       - op: add
         path: /subjects/0/namespace
-        value: ds-kserve-project
+        value: ds-kserve
diff --git a/...nts/configs/kustomized/rhoai-data-connector/overlays/modelmesh-project/kustomization.yaml b/...nts/configs/kustomized/rhoai-data-connector/overlays/modelmesh-project/kustomization.yaml
@@ -0,0 +1,17 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: ds-modelmesh
+
+resources:
+  - ../../base
+
+patches:
+  - target:
+      group: rbac.authorization.k8s.io
+      version: v1
+      kind: RoleBinding
+    patch: |-
+      - op: add
+        path: /subjects/0/namespace
+        value: ds-modelmesh
diff --git a/components/configs/kustomized/rhoai-kserve-instances/kustomization.yaml b/components/configs/kustomized/rhoai-kserve-instances/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-namespace: ds-kserve-project
+namespace: ds-kserve
 
 resources:
 - caikit-tgis

diff --git a/...esh-instances/upload-model-fraud-job.yaml → ...mesh-instances/base/job-upload-model.yaml b/...esh-instances/upload-model-fraud-job.yaml → ...mesh-instances/base/job-upload-model.yaml
@@ -23,7 +23,7 @@ subjects:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: add-model-job
+  name: job-upload-model
   annotations:
     argocd.argoproj.io/sync-wave: "2"
 spec:

diff --git a/components/configs/kustomized/rhoai-modelmesh-instances/base/kustomization.yaml b/components/configs/kustomized/rhoai-modelmesh-instances/base/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- openvino
+- triton
+- job-upload-model.yaml
diff --git a/...esh-instances/openvino/kustomization.yaml → ...nstances/base/openvino/kustomization.yaml b/...esh-instances/openvino/kustomization.yaml → ...nstances/base/openvino/kustomization.yaml
diff --git a/...i-modelmesh-instances/openvino/model.yaml → ...elmesh-instances/base/openvino/model.yaml b/...i-modelmesh-instances/openvino/model.yaml → ...elmesh-instances/base/openvino/model.yaml
diff --git a/...-modelmesh-instances/openvino/server.yaml → ...lmesh-instances/base/openvino/server.yaml b/...-modelmesh-instances/openvino/server.yaml → ...lmesh-instances/base/openvino/server.yaml
diff --git a/...lmesh-instances/triton/kustomization.yaml → ...-instances/base/triton/kustomization.yaml b/...lmesh-instances/triton/kustomization.yaml → ...-instances/base/triton/kustomization.yaml
diff --git a/...odelmesh-instances/triton/model-onnx.yaml → ...esh-instances/base/triton/model-onnx.yaml b/...odelmesh-instances/triton/model-onnx.yaml → ...esh-instances/base/triton/model-onnx.yaml
diff --git a/...-modelmesh-instances/triton/model-tf.yaml → ...lmesh-instances/base/triton/model-tf.yaml b/...-modelmesh-instances/triton/model-tf.yaml → ...lmesh-instances/base/triton/model-tf.yaml
diff --git a/...ai-modelmesh-instances/triton/server.yaml → ...delmesh-instances/base/triton/server.yaml b/...ai-modelmesh-instances/triton/server.yaml → ...delmesh-instances/base/triton/server.yaml
diff --git a/...ai-modelmesh-instances/kustomization.yaml → ...overlays/group-project/kustomization.yaml b/...ai-modelmesh-instances/kustomization.yaml → ...overlays/group-project/kustomization.yaml
@@ -4,6 +4,4 @@ kind: Kustomization
 namespace: ds-group
 
 resources:
-- openvino
-- triton
-- upload-model-fraud-job.yaml
+- ../../base
diff --git a/...onfigs/kustomized/rhoai-modelmesh-instances/overlays/modelmesh-project/kustomization.yaml b/...onfigs/kustomized/rhoai-modelmesh-instances/overlays/modelmesh-project/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: ds-modelmesh
+
+resources:
+- ../../base
diff --git a/demos/rhoai-extended/kustomization.yaml b/demos/rhoai-extended/kustomization.yaml
@@ -8,8 +8,9 @@ resources:
   - ../../components/configs/kustomized/minio/overlays/with-namespace
   - ../../components/configs/kustomized/rhoai-config
   - ../../components/configs/kustomized/rhoai-data-connector/overlays/group-project
-  # - ../../components/configs/kustomized/rhoai-data-connector/overlays/kserve-project
-  # - ../../components/configs/kustomized/rhoai-modelmesh-instances
+  - ../../components/configs/kustomized/rhoai-data-connector/overlays/kserve-project
+  - ../../components/configs/kustomized/rhoai-data-connector/overlays/modelmesh-project
+  - ../../components/configs/kustomized/rhoai-modelmesh-instances/overlays/modelmesh-project
   # - ../../components/configs/kustomized/rhoai-modelmesh-runtimes
   # - ../../components/configs/kustomized/rhoai-kserve-instances
   - ../../components/configs/kustomized/rhoai-notebook/overlays/group-project