From 4c31b99e816a3c44e9f1f73f1660e961f706ed5c Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Fri, 1 Nov 2024 10:45:00 -0500 Subject: [PATCH] update: rhoai --- .../notebook-pod-sizes-default/README.md | 22 +++++++++ .../kustomization.yaml | 0 .../patch-rhoai-dashboard.yaml | 38 +++++++++++++++ .../README.md | 0 .../kustomization.yaml | 10 ++++ .../patch-rhoai-dashboard.yaml | 24 ++++++++++ .../patch-rhoai-dashboard.yaml | 47 ------------------- .../instance/overlays/all/kustomization.yaml | 2 +- .../overlays/workshop/kustomization.yaml | 22 +++++++++ 9 files changed, 117 insertions(+), 48 deletions(-) create mode 100644 components/operators/rhods-operator/instance/components/notebook-pod-sizes-default/README.md rename components/operators/rhods-operator/instance/components/{notebook-pod-sizes => notebook-pod-sizes-default}/kustomization.yaml (100%) create mode 100644 components/operators/rhods-operator/instance/components/notebook-pod-sizes-default/patch-rhoai-dashboard.yaml rename components/operators/rhods-operator/instance/components/{notebook-pod-sizes => notebook-pod-sizes-workshop}/README.md (100%) create mode 100644 components/operators/rhods-operator/instance/components/notebook-pod-sizes-workshop/kustomization.yaml create mode 100644 components/operators/rhods-operator/instance/components/notebook-pod-sizes-workshop/patch-rhoai-dashboard.yaml delete mode 100644 components/operators/rhods-operator/instance/components/notebook-pod-sizes/patch-rhoai-dashboard.yaml create mode 100644 components/operators/rhods-operator/instance/overlays/workshop/kustomization.yaml diff --git a/components/operators/rhods-operator/instance/components/notebook-pod-sizes-default/README.md b/components/operators/rhods-operator/instance/components/notebook-pod-sizes-default/README.md new file mode 100644 index 00000000..73a7dfee --- /dev/null +++ b/components/operators/rhods-operator/instance/components/notebook-pod-sizes-default/README.md @@ -0,0 +1,22 @@ +# notebook-pod-sizes + +## Purpose + +This component is designed help admins configure the default sizes users can select from when creating a new workbenches. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +```yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/notebook-pod-sizes +``` + +You can customize the pod sizes by updating the [patch-rhoai-dashboard.yaml](./patch-rhoai-dashboard.yaml) file. diff --git a/components/operators/rhods-operator/instance/components/notebook-pod-sizes/kustomization.yaml b/components/operators/rhods-operator/instance/components/notebook-pod-sizes-default/kustomization.yaml similarity index 100% rename from components/operators/rhods-operator/instance/components/notebook-pod-sizes/kustomization.yaml rename to components/operators/rhods-operator/instance/components/notebook-pod-sizes-default/kustomization.yaml diff --git a/components/operators/rhods-operator/instance/components/notebook-pod-sizes-default/patch-rhoai-dashboard.yaml b/components/operators/rhods-operator/instance/components/notebook-pod-sizes-default/patch-rhoai-dashboard.yaml new file mode 100644 index 00000000..914f00a6 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/notebook-pod-sizes-default/patch-rhoai-dashboard.yaml @@ -0,0 +1,38 @@ +apiVersion: opendatahub.io/v1alpha +kind: OdhDashboardConfig +metadata: + name: odh-dashboard-config +spec: + notebookSizes: + - name: Small + resources: + limits: + cpu: '2' + memory: 8Gi + requests: + cpu: '1' + memory: 8Gi + - name: Medium + resources: + limits: + cpu: '6' + memory: 24Gi + requests: + cpu: '3' + memory: 24Gi + - name: Large + resources: + limits: + cpu: '14' + memory: 56Gi + requests: + cpu: '7' + memory: 56Gi + - name: X Large + resources: + limits: + cpu: '30' + memory: 120Gi + requests: + cpu: '15' + memory: 120Gi diff --git a/components/operators/rhods-operator/instance/components/notebook-pod-sizes/README.md b/components/operators/rhods-operator/instance/components/notebook-pod-sizes-workshop/README.md similarity index 100% rename from components/operators/rhods-operator/instance/components/notebook-pod-sizes/README.md rename to components/operators/rhods-operator/instance/components/notebook-pod-sizes-workshop/README.md diff --git a/components/operators/rhods-operator/instance/components/notebook-pod-sizes-workshop/kustomization.yaml b/components/operators/rhods-operator/instance/components/notebook-pod-sizes-workshop/kustomization.yaml new file mode 100644 index 00000000..e5836471 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/notebook-pod-sizes-workshop/kustomization.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +commonAnnotations: + argocd.argoproj.io/sync-options: ServerSideApply=true + +patches: + - path: patch-rhoai-dashboard.yaml + target: + kind: OdhDashboardConfig diff --git a/components/operators/rhods-operator/instance/components/notebook-pod-sizes-workshop/patch-rhoai-dashboard.yaml b/components/operators/rhods-operator/instance/components/notebook-pod-sizes-workshop/patch-rhoai-dashboard.yaml new file mode 100644 index 00000000..8e025147 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/notebook-pod-sizes-workshop/patch-rhoai-dashboard.yaml @@ -0,0 +1,24 @@ +apiVersion: opendatahub.io/v1alpha +kind: OdhDashboardConfig +metadata: + name: odh-dashboard-config +spec: + notebookSizes: + # kludge: everyone picks the largest, why offer more than one? + - name: Demo / Workshop + resources: + limits: + cpu: '6' + memory: 24Gi + requests: + cpu: '3' + memory: 24Gi + - name: Small + resources: + limits: + cpu: '2' + memory: 8Gi + requests: + cpu: '1' + memory: 8Gi + diff --git a/components/operators/rhods-operator/instance/components/notebook-pod-sizes/patch-rhoai-dashboard.yaml b/components/operators/rhods-operator/instance/components/notebook-pod-sizes/patch-rhoai-dashboard.yaml deleted file mode 100644 index 4e932c04..00000000 --- a/components/operators/rhods-operator/instance/components/notebook-pod-sizes/patch-rhoai-dashboard.yaml +++ /dev/null @@ -1,47 +0,0 @@ -apiVersion: opendatahub.io/v1alpha -kind: OdhDashboardConfig -metadata: - name: odh-dashboard-config -spec: - notebookSizes: - # kludge: everyone picks the largest, why offer more than one? - - name: Demo / Workshop - resources: - limits: - cpu: '6' - memory: 24Gi - requests: - cpu: '3' - memory: 24Gi - - name: Small - resources: - limits: - cpu: '2' - memory: 8Gi - requests: - cpu: '1' - memory: 8Gi - # - name: Medium - # resources: - # limits: - # cpu: '6' - # memory: 24Gi - # requests: - # cpu: '3' - # memory: 24Gi - # - name: Large - # resources: - # limits: - # cpu: '14' - # memory: 56Gi - # requests: - # cpu: '7' - # memory: 56Gi - # - name: X Large - # resources: - # limits: - # cpu: '30' - # memory: 120Gi - # requests: - # cpu: '15' - # memory: 120Gi diff --git a/components/operators/rhods-operator/instance/overlays/all/kustomization.yaml b/components/operators/rhods-operator/instance/overlays/all/kustomization.yaml index 31d12b4e..0926cfa9 100644 --- a/components/operators/rhods-operator/instance/overlays/all/kustomization.yaml +++ b/components/operators/rhods-operator/instance/overlays/all/kustomization.yaml @@ -16,7 +16,7 @@ components: - ../../components/fix-dashboard-magic - ../../components/fix-kubeadmin-cluster-admin - ../../components/idle-notebook-culling - - ../../components/model-server-pod-sizes + - ../../components/model-server-pod-sizes-default - ../../components/notebook-pod-sizes - ../../components/nvidia-gpu-accelerator-profile - ../../components/runtime-template-triton diff --git a/components/operators/rhods-operator/instance/overlays/workshop/kustomization.yaml b/components/operators/rhods-operator/instance/overlays/workshop/kustomization.yaml new file mode 100644 index 00000000..11875c4b --- /dev/null +++ b/components/operators/rhods-operator/instance/overlays/workshop/kustomization.yaml @@ -0,0 +1,22 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/auth-with-authorino + - ../../components/components-distributed-compute + - ../../components/components-serving + - ../../components/components-training + - ../../components/config-access-everyone + # - ../../components/config-access-group + - ../../components/default-notebook-pvc-size + - ../../components/disable-telemetry + - ../../components/fix-dashboard-magic + - ../../components/fix-kubeadmin-cluster-admin + - ../../components/idle-notebook-culling + - ../../components/model-server-pod-sizes + - ../../components/notebook-pod-sizes-workshop + - ../../components/nvidia-gpu-accelerator-profile + - ../../components/runtime-template-triton