From cecaa96a20180ec67161c25f73f2816196b05903 Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Tue, 4 Jun 2024 17:03:51 -0500 Subject: [PATCH 1/2] refactor: workshop --- .../components/aws-gpu-machineset/job.sh | 4 +- workshop/base/kustomization.yaml | 54 ++++++--------- workshop/base/link-github.yaml | 2 +- .../00-prereqs/kustomization.yaml | 68 +++++++++++++++++++ .../01-setup}/exclude-acc-profile.yaml | 0 .../kludge-parasol/01-setup}/exclude-cm.yaml | 0 .../01-setup}/exclude-sc-ceph-rbd.yaml | 0 .../01-setup}/exclude-sc-gp3.yaml | 0 .../01-setup}/kustomization.yaml | 10 --- .../wip/kludge-parasol/README.md | 8 +-- .../wip/kludge-parasol/instance/dspa.yaml | 0 .../instance/job-data-connector.yaml | 0 .../kludge-parasol/instance/job-elyra.yaml | 0 .../wip/kludge-parasol/instance/job-rbac.yaml | 0 .../wip/kludge-parasol/instance/job-repo.yaml | 0 .../instance/kustomization.yaml | 0 .../wip/kludge-parasol/instance/notebook.yaml | 0 .../kludge-parasol/instance/ns-rb-admin.yaml | 0 .../kludge-parasol/instance/ns-rb-view.yaml | 0 .../wip/kludge-parasol/instance/ns.yaml | 0 .../wip/kludge-parasol/instance/pvc.yaml | 0 .../wip/kludge-parasol/instance/quota.yaml | 0 .../wip/kludge-parasol/setup_users.sh | 0 .../image-puller-app/kustomization.yaml | 0 .../image-puller-pipelines/kustomization.yaml | 0 .../image-puller-workbench/kustomization.yaml | 0 .../xx-image-cache}/kustomization.yaml | 0 .../xx-image-cache}/namespace.yaml | 0 28 files changed, 96 insertions(+), 50 deletions(-) create mode 100644 workshop/wip/kludge-parasol/00-prereqs/kustomization.yaml rename {demos/wip/kludge-parasol => workshop/wip/kludge-parasol/01-setup}/exclude-acc-profile.yaml (100%) rename {demos/wip/kludge-parasol => workshop/wip/kludge-parasol/01-setup}/exclude-cm.yaml (100%) rename {demos/wip/kludge-parasol => workshop/wip/kludge-parasol/01-setup}/exclude-sc-ceph-rbd.yaml (100%) rename {demos/wip/kludge-parasol => workshop/wip/kludge-parasol/01-setup}/exclude-sc-gp3.yaml (100%) rename {demos/wip/kludge-parasol => workshop/wip/kludge-parasol/01-setup}/kustomization.yaml (82%) rename {demos => workshop}/wip/kludge-parasol/README.md (83%) rename {demos => workshop}/wip/kludge-parasol/instance/dspa.yaml (100%) rename {demos => workshop}/wip/kludge-parasol/instance/job-data-connector.yaml (100%) rename {demos => workshop}/wip/kludge-parasol/instance/job-elyra.yaml (100%) rename {demos => workshop}/wip/kludge-parasol/instance/job-rbac.yaml (100%) rename {demos => workshop}/wip/kludge-parasol/instance/job-repo.yaml (100%) rename {demos => workshop}/wip/kludge-parasol/instance/kustomization.yaml (100%) rename {demos => workshop}/wip/kludge-parasol/instance/notebook.yaml (100%) rename {demos => workshop}/wip/kludge-parasol/instance/ns-rb-admin.yaml (100%) rename {demos => workshop}/wip/kludge-parasol/instance/ns-rb-view.yaml (100%) rename {demos => workshop}/wip/kludge-parasol/instance/ns.yaml (100%) rename {demos => workshop}/wip/kludge-parasol/instance/pvc.yaml (100%) rename {demos => workshop}/wip/kludge-parasol/instance/quota.yaml (100%) rename {demos => workshop}/wip/kludge-parasol/setup_users.sh (100%) rename {demos/wip/kludge-parasol/image-cache => workshop/wip/kludge-parasol/xx-image-cache}/image-puller-app/kustomization.yaml (100%) rename {demos/wip/kludge-parasol/image-cache => workshop/wip/kludge-parasol/xx-image-cache}/image-puller-pipelines/kustomization.yaml (100%) rename {demos/wip/kludge-parasol/image-cache => workshop/wip/kludge-parasol/xx-image-cache}/image-puller-workbench/kustomization.yaml (100%) rename {demos/wip/kludge-parasol/image-cache => workshop/wip/kludge-parasol/xx-image-cache}/kustomization.yaml (100%) rename {demos/wip/kludge-parasol/image-cache => workshop/wip/kludge-parasol/xx-image-cache}/namespace.yaml (100%) diff --git a/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/job.sh b/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/job.sh index 462373f5..bf3d5bff 100755 --- a/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/job.sh +++ b/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/job.sh @@ -3,6 +3,8 @@ # shellcheck disable=SC1091 . /scripts/ocp.sh +INSTANCE_TYPE=${INSTANCE_TYPE:-g4dn.4xlarge} + ocp_aws_cluster || exit 0 -ocp_aws_create_gpu_machineset +ocp_aws_create_gpu_machineset "${INSTANCE_TYPE}" ocp_create_machineset_autoscale diff --git a/workshop/base/kustomization.yaml b/workshop/base/kustomization.yaml index 8140166f..be4479e7 100644 --- a/workshop/base/kustomization.yaml +++ b/workshop/base/kustomization.yaml @@ -2,43 +2,31 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -# - ../../components/configs/kustomized/custom-notebook-images/overlays/rhoai -# - ../../components/configs/kustomized/minio/overlays/with-namespace-known-password -# - ../../components/configs/kustomized/rhoai-config -# - ../../components/configs/kustomized/rhoai-config-patches -# - ../../components/configs/kustomized/rhoai-data-connector/overlays/group-project -# - ../../components/configs/kustomized/rhoai-data-connector/overlays/kserve-project -# - ../../components/configs/kustomized/rhoai-notebook -# - ../../components/configs/kustomized/rhoai-pipelines -# - ../../components/configs/kustomized/rhoai-projects -# - ../../components/operators/openshift-pipelines-operator-rh/operator/overlays/latest -# - ../../components/operators/rhods-operator/operator/overlays/fast -# - ../../components/operators/rhods-operator/instance/overlays/2.6 -# - ../../components/operators/serverless-operator/operator/overlays/stable -# - ../../components/operators/servicemeshoperator/operator/overlays/stable +- ../../demos/base/rhoai +- ../../components/configs/kustomized/rhoai-config -# - ../../components/configs/cluster/rbac/overlays/workshop -# - ../../components/configs/cluster/login/overlays/htpasswd +- ../../components/configs/cluster/rbac/overlays/workshop +- ../../components/configs/cluster/login/overlays/htpasswd -# - ../../demos/base/all -# - ../../demos/base/nvidia-gpu-autoscale +- ../../demos/base/all +- ../../demos/base/nvidia-gpu-autoscale - htpasswd-secret.yaml - link-github.yaml - minio-rb-view.yaml -# patches: -# - path: dashboard-config-cr.yaml -# - target: -# kind: ConsoleNotification -# name: banner-demo -# patch: |- -# - op: replace -# path: /spec/text -# value: 'WORKSHOP: Fraud Detection w/ Red Hat OpenShift AI' -# - path: patch-idp.yaml -# target: -# group: config.openshift.io -# kind: OAuth -# name: cluster -# version: v1 +patches: + - path: dashboard-config-cr.yaml + - target: + kind: ConsoleNotification + name: banner-demo + patch: |- + - op: replace + path: /spec/text + value: 'WORKSHOP: Fraud Detection w/ Red Hat OpenShift AI' + - path: patch-idp.yaml + target: + group: config.openshift.io + kind: OAuth + name: cluster + version: v1 diff --git a/workshop/base/link-github.yaml b/workshop/base/link-github.yaml index ab4469ca..8c9266a3 100644 --- a/workshop/base/link-github.yaml +++ b/workshop/base/link-github.yaml @@ -8,4 +8,4 @@ spec: text: GitHub - Fraud Detection applicationMenu: section: Git Repos - imageURL: https://img.icons8.com/fluency/512/github.png \ No newline at end of file + imageURL: /static/assets/github.svg \ No newline at end of file diff --git a/workshop/wip/kludge-parasol/00-prereqs/kustomization.yaml b/workshop/wip/kludge-parasol/00-prereqs/kustomization.yaml new file mode 100644 index 00000000..bd3b7205 --- /dev/null +++ b/workshop/wip/kludge-parasol/00-prereqs/kustomization.yaml @@ -0,0 +1,68 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../../../demos/rhoai-nvidia-gpu-autoscale + - ../../../../components/configs/kustomized/rhoai-config + # - ../../../../components/operators/kiali-ossm/operator/overlays/stable + # - ../../../../components/operators/jaeger-product/operator/overlays/stable + # - ../../../../components/operators/elasticsearch-operator/operator/overlays/stable + +patches: + - target: + kind: ConsoleNotification + name: banner-demo + patch: |- + - op: replace + path: /spec/text + value: 'DEMO: Red Hat OpenShift AI (RHOAI) - Parasol Insurance Workshop' + - target: + kind: Subscription + name: rhods-operator + patch: |- + - op: replace + path: /spec/channel + value: stable + - op: replace + path: /spec/installPlanApproval + value: Manual + - op: add + path: /spec/startingCSV + value: rhods-operator.2.8.1 + - target: + kind: Subscription + name: gpu-operator-certified + patch: |- + - op: replace + path: /spec/channel + value: v23.6 + # - op: replace + # path: /spec/installPlanApproval + # value: Manual + - op: add + path: /spec/startingCSV + value: gpu-operator-certified.v23.6.0 + - target: + kind: Job + name: job-aws-gpu-machineset + patch: |- + - op: add + path: /spec/template/spec/containers/0/env/- + value: + name: INSTANCE_TYPE + value: g5.2xlarge + # - target: + # kind: ConfigMap + # name: job-aws-gpu-machineset + # patch: |- + # - op: replace + # path: /data/job.sh + # value: | + # #!/bin/bash + + # # shellcheck disable=SC1091 + # . /scripts/ocp.sh + + # ocp_aws_cluster || exit 0 + # ocp_aws_create_gpu_machineset g5.2xlarge + # ocp_create_machineset_autoscale diff --git a/demos/wip/kludge-parasol/exclude-acc-profile.yaml b/workshop/wip/kludge-parasol/01-setup/exclude-acc-profile.yaml similarity index 100% rename from demos/wip/kludge-parasol/exclude-acc-profile.yaml rename to workshop/wip/kludge-parasol/01-setup/exclude-acc-profile.yaml diff --git a/demos/wip/kludge-parasol/exclude-cm.yaml b/workshop/wip/kludge-parasol/01-setup/exclude-cm.yaml similarity index 100% rename from demos/wip/kludge-parasol/exclude-cm.yaml rename to workshop/wip/kludge-parasol/01-setup/exclude-cm.yaml diff --git a/demos/wip/kludge-parasol/exclude-sc-ceph-rbd.yaml b/workshop/wip/kludge-parasol/01-setup/exclude-sc-ceph-rbd.yaml similarity index 100% rename from demos/wip/kludge-parasol/exclude-sc-ceph-rbd.yaml rename to workshop/wip/kludge-parasol/01-setup/exclude-sc-ceph-rbd.yaml diff --git a/demos/wip/kludge-parasol/exclude-sc-gp3.yaml b/workshop/wip/kludge-parasol/01-setup/exclude-sc-gp3.yaml similarity index 100% rename from demos/wip/kludge-parasol/exclude-sc-gp3.yaml rename to workshop/wip/kludge-parasol/01-setup/exclude-sc-gp3.yaml diff --git a/demos/wip/kludge-parasol/kustomization.yaml b/workshop/wip/kludge-parasol/01-setup/kustomization.yaml similarity index 82% rename from demos/wip/kludge-parasol/kustomization.yaml rename to workshop/wip/kludge-parasol/01-setup/kustomization.yaml index e2d667c8..27971682 100644 --- a/demos/wip/kludge-parasol/kustomization.yaml +++ b/workshop/wip/kludge-parasol/01-setup/kustomization.yaml @@ -2,9 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # - ../../rhoai-nvidia-gpu-autoscale - # - ../../../components/configs/kustomized/rhoai-config - - https://github.com/rh-aiservices-bu/parasol-insurance/bootstrap/ic-rhoai-configuration?ref=dev - https://github.com/rh-aiservices-bu/parasol-insurance/bootstrap/ic-shared-app?ref=dev - https://github.com/rh-aiservices-bu/parasol-insurance/bootstrap/ic-shared-database?ref=dev @@ -15,13 +12,6 @@ resources: - https://github.com/rh-aiservices-bu/parasol-insurance/bootstrap/ic-user-projects?ref=dev patches: - - target: - kind: ConsoleNotification - name: banner-demo - patch: |- - - op: replace - path: /spec/text - value: 'DEMO: Red Hat OpenShift AI (RHOAI) - Parasol Insurance Workshop' - target: kind: PersistentVolumeClaim namespace: ic-shared-llm diff --git a/demos/wip/kludge-parasol/README.md b/workshop/wip/kludge-parasol/README.md similarity index 83% rename from demos/wip/kludge-parasol/README.md rename to workshop/wip/kludge-parasol/README.md index c134a338..91efdd68 100644 --- a/demos/wip/kludge-parasol/README.md +++ b/workshop/wip/kludge-parasol/README.md @@ -19,11 +19,9 @@ The scripting is also difficult to follow and repair - lots of glue code # setup base cluster apply_firmly clusters/default # setup base rhoai -apply_firmly demos/rhoai-nvidia-gpu-autoscale - -# setup demo things -apply_firmly components/configs/kustomized/rhoai-config -apply_firmly demos/wip/kludge-parasol +apply_firmly demos/wip/kludge-parasol/00-prereqs +# setup demo +apply_firmly demos/wip/kludge-parasol/01-setup ``` ## Links diff --git a/demos/wip/kludge-parasol/instance/dspa.yaml b/workshop/wip/kludge-parasol/instance/dspa.yaml similarity index 100% rename from demos/wip/kludge-parasol/instance/dspa.yaml rename to workshop/wip/kludge-parasol/instance/dspa.yaml diff --git a/demos/wip/kludge-parasol/instance/job-data-connector.yaml b/workshop/wip/kludge-parasol/instance/job-data-connector.yaml similarity index 100% rename from demos/wip/kludge-parasol/instance/job-data-connector.yaml rename to workshop/wip/kludge-parasol/instance/job-data-connector.yaml diff --git a/demos/wip/kludge-parasol/instance/job-elyra.yaml b/workshop/wip/kludge-parasol/instance/job-elyra.yaml similarity index 100% rename from demos/wip/kludge-parasol/instance/job-elyra.yaml rename to workshop/wip/kludge-parasol/instance/job-elyra.yaml diff --git a/demos/wip/kludge-parasol/instance/job-rbac.yaml b/workshop/wip/kludge-parasol/instance/job-rbac.yaml similarity index 100% rename from demos/wip/kludge-parasol/instance/job-rbac.yaml rename to workshop/wip/kludge-parasol/instance/job-rbac.yaml diff --git a/demos/wip/kludge-parasol/instance/job-repo.yaml b/workshop/wip/kludge-parasol/instance/job-repo.yaml similarity index 100% rename from demos/wip/kludge-parasol/instance/job-repo.yaml rename to workshop/wip/kludge-parasol/instance/job-repo.yaml diff --git a/demos/wip/kludge-parasol/instance/kustomization.yaml b/workshop/wip/kludge-parasol/instance/kustomization.yaml similarity index 100% rename from demos/wip/kludge-parasol/instance/kustomization.yaml rename to workshop/wip/kludge-parasol/instance/kustomization.yaml diff --git a/demos/wip/kludge-parasol/instance/notebook.yaml b/workshop/wip/kludge-parasol/instance/notebook.yaml similarity index 100% rename from demos/wip/kludge-parasol/instance/notebook.yaml rename to workshop/wip/kludge-parasol/instance/notebook.yaml diff --git a/demos/wip/kludge-parasol/instance/ns-rb-admin.yaml b/workshop/wip/kludge-parasol/instance/ns-rb-admin.yaml similarity index 100% rename from demos/wip/kludge-parasol/instance/ns-rb-admin.yaml rename to workshop/wip/kludge-parasol/instance/ns-rb-admin.yaml diff --git a/demos/wip/kludge-parasol/instance/ns-rb-view.yaml b/workshop/wip/kludge-parasol/instance/ns-rb-view.yaml similarity index 100% rename from demos/wip/kludge-parasol/instance/ns-rb-view.yaml rename to workshop/wip/kludge-parasol/instance/ns-rb-view.yaml diff --git a/demos/wip/kludge-parasol/instance/ns.yaml b/workshop/wip/kludge-parasol/instance/ns.yaml similarity index 100% rename from demos/wip/kludge-parasol/instance/ns.yaml rename to workshop/wip/kludge-parasol/instance/ns.yaml diff --git a/demos/wip/kludge-parasol/instance/pvc.yaml b/workshop/wip/kludge-parasol/instance/pvc.yaml similarity index 100% rename from demos/wip/kludge-parasol/instance/pvc.yaml rename to workshop/wip/kludge-parasol/instance/pvc.yaml diff --git a/demos/wip/kludge-parasol/instance/quota.yaml b/workshop/wip/kludge-parasol/instance/quota.yaml similarity index 100% rename from demos/wip/kludge-parasol/instance/quota.yaml rename to workshop/wip/kludge-parasol/instance/quota.yaml diff --git a/demos/wip/kludge-parasol/setup_users.sh b/workshop/wip/kludge-parasol/setup_users.sh similarity index 100% rename from demos/wip/kludge-parasol/setup_users.sh rename to workshop/wip/kludge-parasol/setup_users.sh diff --git a/demos/wip/kludge-parasol/image-cache/image-puller-app/kustomization.yaml b/workshop/wip/kludge-parasol/xx-image-cache/image-puller-app/kustomization.yaml similarity index 100% rename from demos/wip/kludge-parasol/image-cache/image-puller-app/kustomization.yaml rename to workshop/wip/kludge-parasol/xx-image-cache/image-puller-app/kustomization.yaml diff --git a/demos/wip/kludge-parasol/image-cache/image-puller-pipelines/kustomization.yaml b/workshop/wip/kludge-parasol/xx-image-cache/image-puller-pipelines/kustomization.yaml similarity index 100% rename from demos/wip/kludge-parasol/image-cache/image-puller-pipelines/kustomization.yaml rename to workshop/wip/kludge-parasol/xx-image-cache/image-puller-pipelines/kustomization.yaml diff --git a/demos/wip/kludge-parasol/image-cache/image-puller-workbench/kustomization.yaml b/workshop/wip/kludge-parasol/xx-image-cache/image-puller-workbench/kustomization.yaml similarity index 100% rename from demos/wip/kludge-parasol/image-cache/image-puller-workbench/kustomization.yaml rename to workshop/wip/kludge-parasol/xx-image-cache/image-puller-workbench/kustomization.yaml diff --git a/demos/wip/kludge-parasol/image-cache/kustomization.yaml b/workshop/wip/kludge-parasol/xx-image-cache/kustomization.yaml similarity index 100% rename from demos/wip/kludge-parasol/image-cache/kustomization.yaml rename to workshop/wip/kludge-parasol/xx-image-cache/kustomization.yaml diff --git a/demos/wip/kludge-parasol/image-cache/namespace.yaml b/workshop/wip/kludge-parasol/xx-image-cache/namespace.yaml similarity index 100% rename from demos/wip/kludge-parasol/image-cache/namespace.yaml rename to workshop/wip/kludge-parasol/xx-image-cache/namespace.yaml From 3cfc6cd8a15aad7b6904c38543f22c976543f5f0 Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Tue, 4 Jun 2024 17:04:26 -0500 Subject: [PATCH 2/2] fix: lint --- .wordlist-md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.wordlist-md b/.wordlist-md index 55855119..a80899f5 100644 --- a/.wordlist-md +++ b/.wordlist-md @@ -252,6 +252,7 @@ libvirt lifecycle linkedin linux +llm localhost machineset managementState @@ -283,6 +284,7 @@ odo ok olm oneAPI +openai opendatahub openldap openshift @@ -297,6 +299,7 @@ popd postgres pre prem +prereqs priorityclass prometheus provisioner @@ -365,6 +368,7 @@ untar untardir useable vSphere +vllm vscode vsphere weaviate @@ -373,6 +377,3 @@ wip workspaces www yaml -llm -vllm -openai \ No newline at end of file