From 9d41bc02885c2254dd9346991df534146b95a050 Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Wed, 27 Nov 2024 09:09:38 +0100 Subject: [PATCH] fix: previous commit - lint in yaml - wrong file name - update component name in newly added README - revert DSC CR name back to "default" to not break existing users Signed-off-by: Wen Zhou --- rhods-operator/instance/base/datasciencecluster.yaml | 2 +- .../instance/components/auth-with-authorino/README.md | 2 +- .../patch-datasciencecluster.yaml | 2 +- .../instance/components/components-modelregistry/README.md | 2 +- .../components-modelregistry/patch-datasciencecluster.yaml | 2 +- .../components-serving/patch-datasciencecluster.yaml | 2 +- .../components-training/patch-datasciencecluster.yaml | 2 +- .../instance/components/components-trustyai/README.md | 2 +- .../components-trustyai/patch-datasciencecluster.yaml | 2 +- .../instance/overlays/eus-2.16-nvidia-gpu/kustomization.yaml | 2 +- rhods-operator/instance/overlays/eus-2.16/kustomization.yaml | 4 +--- .../eus-2.16/{patch-cert.yaml.yaml => patch-cert.yaml} | 2 +- 12 files changed, 12 insertions(+), 14 deletions(-) rename rhods-operator/instance/overlays/eus-2.16/{patch-cert.yaml.yaml => patch-cert.yaml} (72%) diff --git a/rhods-operator/instance/base/datasciencecluster.yaml b/rhods-operator/instance/base/datasciencecluster.yaml index 8aa95b45..31cbac71 100644 --- a/rhods-operator/instance/base/datasciencecluster.yaml +++ b/rhods-operator/instance/base/datasciencecluster.yaml @@ -1,7 +1,7 @@ kind: DataScienceCluster apiVersion: datasciencecluster.opendatahub.io/v1 metadata: - name: default-dsc + name: default spec: components: codeflare: diff --git a/rhods-operator/instance/components/auth-with-authorino/README.md b/rhods-operator/instance/components/auth-with-authorino/README.md index da6b964d..6f819773 100644 --- a/rhods-operator/instance/components/auth-with-authorino/README.md +++ b/rhods-operator/instance/components/auth-with-authorino/README.md @@ -1,4 +1,4 @@ -# components-distributed-compute +# components-auth-with-authorino ## Purpose This component is designed help configure the the authentication endpoint for RHOAI with KServe using Authorino with ServiceMesh diff --git a/rhods-operator/instance/components/components-distributed-compute/patch-datasciencecluster.yaml b/rhods-operator/instance/components/components-distributed-compute/patch-datasciencecluster.yaml index a0cf0b59..1720e07f 100644 --- a/rhods-operator/instance/components/components-distributed-compute/patch-datasciencecluster.yaml +++ b/rhods-operator/instance/components/components-distributed-compute/patch-datasciencecluster.yaml @@ -1,7 +1,7 @@ kind: DataScienceCluster apiVersion: datasciencecluster.opendatahub.io/v1 metadata: - name: default-dsc + name: default spec: components: codeflare: diff --git a/rhods-operator/instance/components/components-modelregistry/README.md b/rhods-operator/instance/components/components-modelregistry/README.md index 0713436d..2258001f 100644 --- a/rhods-operator/instance/components/components-modelregistry/README.md +++ b/rhods-operator/instance/components/components-modelregistry/README.md @@ -1,4 +1,4 @@ -# components-distributed-compute +# components-modelregistry ## Purpose This component is designed help index and manage models, versions, and artifacts metadata diff --git a/rhods-operator/instance/components/components-modelregistry/patch-datasciencecluster.yaml b/rhods-operator/instance/components/components-modelregistry/patch-datasciencecluster.yaml index d212540c..85fc0425 100644 --- a/rhods-operator/instance/components/components-modelregistry/patch-datasciencecluster.yaml +++ b/rhods-operator/instance/components/components-modelregistry/patch-datasciencecluster.yaml @@ -1,7 +1,7 @@ kind: DataScienceCluster apiVersion: datasciencecluster.opendatahub.io/v1 metadata: - name: default-dsc + name: default spec: components: modelregistry: diff --git a/rhods-operator/instance/components/components-serving/patch-datasciencecluster.yaml b/rhods-operator/instance/components/components-serving/patch-datasciencecluster.yaml index 5a2b1ecf..2ba5c9c4 100644 --- a/rhods-operator/instance/components/components-serving/patch-datasciencecluster.yaml +++ b/rhods-operator/instance/components/components-serving/patch-datasciencecluster.yaml @@ -1,7 +1,7 @@ kind: DataScienceCluster apiVersion: datasciencecluster.opendatahub.io/v1 metadata: - name: default-dsc + name: default spec: components: kserve: diff --git a/rhods-operator/instance/components/components-training/patch-datasciencecluster.yaml b/rhods-operator/instance/components/components-training/patch-datasciencecluster.yaml index 54feb45c..322183bf 100644 --- a/rhods-operator/instance/components/components-training/patch-datasciencecluster.yaml +++ b/rhods-operator/instance/components/components-training/patch-datasciencecluster.yaml @@ -1,7 +1,7 @@ kind: DataScienceCluster apiVersion: datasciencecluster.opendatahub.io/v1 metadata: - name: default-dsc + name: default spec: components: datasciencepipelines: diff --git a/rhods-operator/instance/components/components-trustyai/README.md b/rhods-operator/instance/components/components-trustyai/README.md index 369e2e53..18180ca5 100644 --- a/rhods-operator/instance/components/components-trustyai/README.md +++ b/rhods-operator/instance/components/components-trustyai/README.md @@ -1,4 +1,4 @@ -# components-distributed-compute +# components-trustyai ## Purpose This component is designed help XAI explanations of predictive models. diff --git a/rhods-operator/instance/components/components-trustyai/patch-datasciencecluster.yaml b/rhods-operator/instance/components/components-trustyai/patch-datasciencecluster.yaml index a195ec25..1cc54f3c 100644 --- a/rhods-operator/instance/components/components-trustyai/patch-datasciencecluster.yaml +++ b/rhods-operator/instance/components/components-trustyai/patch-datasciencecluster.yaml @@ -1,7 +1,7 @@ kind: DataScienceCluster apiVersion: datasciencecluster.opendatahub.io/v1 metadata: - name: default-dsc + name: default spec: components: trustyai: diff --git a/rhods-operator/instance/overlays/eus-2.16-nvidia-gpu/kustomization.yaml b/rhods-operator/instance/overlays/eus-2.16-nvidia-gpu/kustomization.yaml index 9fabe81d..86b34a8b 100644 --- a/rhods-operator/instance/overlays/eus-2.16-nvidia-gpu/kustomization.yaml +++ b/rhods-operator/instance/overlays/eus-2.16-nvidia-gpu/kustomization.yaml @@ -17,4 +17,4 @@ components: - ../../components/make-kubeadmin-cluster-admin - ../../components/model-server-pod-sizes - ../../components/rhoai-dashboard-access - - ../../components/auth-with-authorino \ No newline at end of file + - ../../components/auth-with-authorino diff --git a/rhods-operator/instance/overlays/eus-2.16/kustomization.yaml b/rhods-operator/instance/overlays/eus-2.16/kustomization.yaml index ced62622..b091eb7c 100644 --- a/rhods-operator/instance/overlays/eus-2.16/kustomization.yaml +++ b/rhods-operator/instance/overlays/eus-2.16/kustomization.yaml @@ -18,10 +18,8 @@ components: - ../../components/rhoai-dashboard-access - ../../components/auth-with-authorino - - patches: - target: kind: DataScienceCluster - name: default-dsc + name: default path: patch-cert.yaml diff --git a/rhods-operator/instance/overlays/eus-2.16/patch-cert.yaml.yaml b/rhods-operator/instance/overlays/eus-2.16/patch-cert.yaml similarity index 72% rename from rhods-operator/instance/overlays/eus-2.16/patch-cert.yaml.yaml rename to rhods-operator/instance/overlays/eus-2.16/patch-cert.yaml index 012ca783..d37cb4af 100644 --- a/rhods-operator/instance/overlays/eus-2.16/patch-cert.yaml.yaml +++ b/rhods-operator/instance/overlays/eus-2.16/patch-cert.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/components/kserve/serving/ingressGateway/certificate/type - value: OpenshiftDefaultIngress \ No newline at end of file + value: OpenshiftDefaultIngress