From 00ad9eb789dfcc1a559d6dc8c8074fd91b26f900 Mon Sep 17 00:00:00 2001 From: Andrew Ballantyne Date: Wed, 19 Jun 2024 12:43:38 -0400 Subject: [PATCH] rework manifest files and add testing steps --- docs/architecture.md | 2 +- docs/dev-setup.md | 2 +- docs/release-steps.md | 2 +- manifests/.gitignore | 4 ++ manifests/README.md | 53 ++++++++++++++----- manifests/common/README.md | 4 +- .../common/apps/jupyter/kustomization.yaml | 3 -- manifests/common/apps/kustomization.yaml | 3 -- manifests/common/crd/kustomization.yaml | 5 +- manifests/common/kustomization.yaml | 7 +-- manifests/odh/README.md | 6 +-- manifests/odh/kustomization.yaml | 2 + manifests/overrides/README.md | 5 ++ .../auth-delegator.clusterrolebinding.yaml | 0 .../base/cluster-monitoring-role-binding.yaml | 0 .../base/cluster-role-binding.yaml | 0 .../base/cluster-role.yaml | 0 .../base/deployment.yaml | 0 .../base/fetch-accelerators.rbac.yaml | 0 .../base/fetch-builds-and-images.rbac.yaml | 0 .../base/image-puller.clusterrolebinding.yaml | 0 .../base/kustomization.yaml | 3 -- .../base/model-serving-role-binding.yaml | 0 .../base/model-serving-role.yaml | 0 .../base/oauth.secret.yaml | 0 .../base/role-binding.yaml | 0 .../{common => overrides}/base/role.yaml | 0 .../{common => overrides}/base/routes.yaml | 0 .../base/service-account.yaml | 0 .../{common => overrides}/base/service.yaml | 0 .../consolelink/consolelink.yaml | 0 .../consolelink/kustomization.yaml | 0 manifests/rhoai/README.md | 4 +- manifests/rhoai/addon/README.md | 7 +++ manifests/rhoai/addon/apps/kustomization.yaml | 3 -- .../addon/apps/nvidia/kustomization.yaml | 3 -- .../rhoai/addon/apps/rhoam/kustomization.yaml | 3 -- .../addon/apps/starburst/kustomization.yaml | 3 -- manifests/rhoai/addon/kustomization.yaml | 4 +- manifests/rhoai/onprem/README.md | 7 +++ .../rhoai/onprem/apps/kustomization.yaml | 3 -- .../starburst-enterprise/kustomization.yaml | 3 -- manifests/rhoai/onprem/kustomization.yaml | 5 +- manifests/rhoai/shared/README.md | 3 ++ .../shared/apps/aikit/kustomization.yaml | 3 -- .../apps/anaconda-ce/kustomization.yaml | 3 -- .../shared/apps/elastic/kustomization.yaml | 3 -- .../rhoai/shared/apps/kustomization.yaml | 3 -- .../shared/apps/openvino/kustomization.yaml | 3 -- .../shared/apps/pachyderm/kustomization.yaml | 3 -- .../shared/apps/rhoai/kustomization.yaml | 3 -- .../shared/apps/watson-x/kustomization.yaml | 3 -- .../rhoai/shared/base/kustomization.yaml | 4 +- .../shared/consolelink/kustomization.yaml | 3 +- manifests/rhoai/shared/kustomization.yaml | 3 -- 55 files changed, 88 insertions(+), 95 deletions(-) create mode 100644 manifests/.gitignore create mode 100644 manifests/overrides/README.md rename manifests/{common => overrides}/base/auth-delegator.clusterrolebinding.yaml (100%) rename manifests/{common => overrides}/base/cluster-monitoring-role-binding.yaml (100%) rename manifests/{common => overrides}/base/cluster-role-binding.yaml (100%) rename manifests/{common => overrides}/base/cluster-role.yaml (100%) rename manifests/{common => overrides}/base/deployment.yaml (100%) rename manifests/{common => overrides}/base/fetch-accelerators.rbac.yaml (100%) rename manifests/{common => overrides}/base/fetch-builds-and-images.rbac.yaml (100%) rename manifests/{common => overrides}/base/image-puller.clusterrolebinding.yaml (100%) rename manifests/{common => overrides}/base/kustomization.yaml (90%) rename manifests/{common => overrides}/base/model-serving-role-binding.yaml (100%) rename manifests/{common => overrides}/base/model-serving-role.yaml (100%) rename manifests/{common => overrides}/base/oauth.secret.yaml (100%) rename manifests/{common => overrides}/base/role-binding.yaml (100%) rename manifests/{common => overrides}/base/role.yaml (100%) rename manifests/{common => overrides}/base/routes.yaml (100%) rename manifests/{common => overrides}/base/service-account.yaml (100%) rename manifests/{common => overrides}/base/service.yaml (100%) rename manifests/{common => overrides}/consolelink/consolelink.yaml (100%) rename manifests/{common => overrides}/consolelink/kustomization.yaml (100%) create mode 100644 manifests/rhoai/addon/README.md create mode 100644 manifests/rhoai/onprem/README.md create mode 100644 manifests/rhoai/shared/README.md diff --git a/docs/architecture.md b/docs/architecture.md index f142f4b1b3..1cf44fd2b1 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -1,4 +1,4 @@ -[Dashboard Deployment `containers`]: ../manifests/common/base/deployment.yaml +[Dashboard Deployment `containers`]: ../manifests/overrides/base/deployment.yaml [OpenShift OAuth Proxy repo]: https://github.com/openshift/oauth-proxy [OpenShift SDK]: https://github.com/openshift/dynamic-plugin-sdk [SDK tidbits]: SDK.md diff --git a/docs/dev-setup.md b/docs/dev-setup.md index c736ba940b..cbf7296e48 100644 --- a/docs/dev-setup.md +++ b/docs/dev-setup.md @@ -38,7 +38,7 @@ This is the default context for running a local UI. Make sure you build the pro > Note: You must be logged-in with `oc` before you can start the backend. Details for that are in the the [contribution guidelines](../CONTRIBUTING.md#give-your-dev-env-access). -> Note: The CLI logged-in user will need to be a `cluster-admin` level user on the cluster to mimic the Dashboard Service Account level of permissions. You could also bind the [cluster role](../manifests/common/base/cluster-role.yaml) to your user as we do with the service account [binding](../manifests/common/base/cluster-role-binding.yaml). +> Note: The CLI logged-in user will need to be a `cluster-admin` level user on the cluster to mimic the Dashboard Service Account level of permissions. You could also bind the [cluster role](../manifests/overrides/base/cluster-role.yaml) to your user as we do with the service account [binding](../manifests/overrides/base/cluster-role-binding.yaml). ```bash npm run start diff --git a/docs/release-steps.md b/docs/release-steps.md index db108542d2..fad6ed7647 100644 --- a/docs/release-steps.md +++ b/docs/release-steps.md @@ -1,4 +1,4 @@ -[base/kustomization.yaml]: ../manifests/common/base/kustomization.yaml +[base/kustomization.yaml]: ../manifests/overrides/base/kustomization.yaml [quay repo]: https://quay.io/repository/opendatahub/odh-dashboard?tab=tags [drafting a new release]: https://github.com/opendatahub-io/odh-dashboard/releases/new [semver]: https://semver.org/ diff --git a/manifests/.gitignore b/manifests/.gitignore new file mode 100644 index 0000000000..bf403f4dc4 --- /dev/null +++ b/manifests/.gitignore @@ -0,0 +1,4 @@ +# Ignore the testing files that are described in the README.md +before-*-test.yaml +after-*-test.yaml +output-*.diff diff --git a/manifests/README.md b/manifests/README.md index 0f9da4823a..a7ee0c3d75 100644 --- a/manifests/README.md +++ b/manifests/README.md @@ -2,25 +2,54 @@ The Dashboard manifests run on Kustomize. There are 3 types of deployments for the Dashboard component. -- Open Data Hub (`./odh`) +- Open Data Hub ([`./odh`](./odh)) - Red Hat OpenShift AI - - RHOAI Managed (`./rhoai/addon`) - - RHOAI Self Managed (`./rhoai/onprem`) + - RHOAI Managed ([`./rhoai/addon`](./rhoai/addon)) + - RHOAI Self Managed ([`./rhoai/onprem`](./rhoai/onprem)) -## Adding new Manifests +## Adding/Modifying Manifests -Starting at the deployment type folders (see above) there will be a `kustomization.yaml` file -- consider this an "index file". Each reference in these "index files" reference other "index files" in other folders until they reach a folder that contains specific manifest yamls. Maintain this structure for cleanness. +Rules for keeping the manifest files in a sane order: -The operator will start from one of the deployment type folders, so we are in control of all the references from there. Keep sane references & be sure to read the README files in each of the root folders for guidelines. +1. When adding a new type of thing, always make it have its own folder; be sure to add the reference to the parent folder's `kustomziation.yaml` (if applicable) +2. When adding to a preexisting folder, be sure to add it to the root `kustomization.yaml` in that folder +3. Do not reference "a file" (has an extension) inside another folder. Reference other folders, which will pick up the `kustomization.yaml` inside that folder; those `kustomization.yaml` files should reference sibling files +4. Folders matter -- see the README in each for more details -## Installation +## Installation (ODH) -Use the `kustomize` tool to process the manifest for the `oc apply` command. +You can use the `kustomize` tool to process the manifest for the `oc apply` command. -``` -# Parse the base manifest to deploy ODH Dashboard WITHOUT the required configs for groups -cd manifests/common/base +```markdown # Set the namespace in the manifest where you want to deploy the dashboard kustomize edit set namespace -kustomize build . | oc apply -f - +kustomize build common | oc apply -f - +kustomize build overrides/base | oc apply -f - +``` + +## Testing Changes + +One way to test changes locally is to generate the full structure before your changes, and then again after your changes. + +Before: +```markdown +# Generate the files before your changes for a baseline +kustomize build rhoai/addon > before-rhoai-addon-test.yaml +kustomize build rhoai/onprem > before-rhoai-onprem-test.yaml +kustomize build odh > before-odh-test.yaml +``` + +After: +```markdown +# Generate the files after your changes +kustomize build rhoai/addon > after-rhoai-addon-test.yaml +kustomize build rhoai/onprem > after-rhoai-onprem-test.yaml +kustomize build odh > after-odh-test.yaml + +# Generate the diff between the two +git diff --no-index before-rhoai-addon-test.yaml after-rhoai-addon-test.yaml > output-rhoai-addon.diff +git diff --no-index before-rhoai-onprem-test.yaml after-rhoai-onprem-test.yaml > output-rhoai-onprem.diff +git diff --no-index before-odh-test.yaml after-odh-test.yaml > output-odh.diff ``` + +Viewing the diffs will help you understand what changed. diff --git a/manifests/common/README.md b/manifests/common/README.md index a38d8245de..8d875e5c97 100644 --- a/manifests/common/README.md +++ b/manifests/common/README.md @@ -2,4 +2,6 @@ These are manifests that are shared in both ODH & RHOAI deployments. -See `../odh` & `../rhoai` if there are specific deployment manifests needed. +These files are not intended to be the base of overriding or changing in any way. These should be immutable between both RHOAI and ODH deployments. + +> **Note:** See the [`../overrides`](../overrides/README.md) folder for those that can be overridden diff --git a/manifests/common/apps/jupyter/kustomization.yaml b/manifests/common/apps/jupyter/kustomization.yaml index b316884b04..bd432cfd1c 100644 --- a/manifests/common/apps/jupyter/kustomization.yaml +++ b/manifests/common/apps/jupyter/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - create-jupyter-notebook-quickstart.yaml - deploy-python-model-quickstart.yaml diff --git a/manifests/common/apps/kustomization.yaml b/manifests/common/apps/kustomization.yaml index 0539650276..ddd7ba842e 100644 --- a/manifests/common/apps/kustomization.yaml +++ b/manifests/common/apps/kustomization.yaml @@ -1,7 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - ./jupyter diff --git a/manifests/common/crd/kustomization.yaml b/manifests/common/crd/kustomization.yaml index 3d8497d804..ba8313ec34 100644 --- a/manifests/common/crd/kustomization.yaml +++ b/manifests/common/crd/kustomization.yaml @@ -1,11 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - odhdashboardconfigs.opendatahub.io.crd.yaml - odhquickstarts.console.openshift.io.crd.yaml - odhdocuments.dashboard.opendatahub.io.crd.yaml - odhapplications.dashboard.opendatahub.io.crd.yaml -- acceleratorprofiles.opendatahub.io.crd.yaml \ No newline at end of file +- acceleratorprofiles.opendatahub.io.crd.yaml diff --git a/manifests/common/kustomization.yaml b/manifests/common/kustomization.yaml index 9e81d16519..1ed46d1a44 100644 --- a/manifests/common/kustomization.yaml +++ b/manifests/common/kustomization.yaml @@ -1,10 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - - ./apps - - ./base - - ./consolelink - ./crd + - ./apps diff --git a/manifests/odh/README.md b/manifests/odh/README.md index 2885c8f9f9..37dd833c60 100644 --- a/manifests/odh/README.md +++ b/manifests/odh/README.md @@ -1,5 +1,3 @@ -# ODH Manifests +# ODH Deployment -These are manifests that are only for ODH. - -RHOAI manifests should not reference these. If they need to reference something in here, they should be put into common folder instead. +This is the starting location for ODH manifests. diff --git a/manifests/odh/kustomization.yaml b/manifests/odh/kustomization.yaml index ec0c01942f..c015ac580d 100644 --- a/manifests/odh/kustomization.yaml +++ b/manifests/odh/kustomization.yaml @@ -5,3 +5,5 @@ commonLabels: app.kubernetes.io/part-of: odh-dashboard resources: - ../common + - ../overrides/base + - ../overrides/consolelink diff --git a/manifests/overrides/README.md b/manifests/overrides/README.md new file mode 100644 index 0000000000..570f8b8849 --- /dev/null +++ b/manifests/overrides/README.md @@ -0,0 +1,5 @@ +# Overridable Manifests + +These are manifest files that are intended to be used as-is or to be overridden. + +> **Note:** There should be note root `kustomization.yaml` as each folder should be treated as a specific target for inclusion or overrides. diff --git a/manifests/common/base/auth-delegator.clusterrolebinding.yaml b/manifests/overrides/base/auth-delegator.clusterrolebinding.yaml similarity index 100% rename from manifests/common/base/auth-delegator.clusterrolebinding.yaml rename to manifests/overrides/base/auth-delegator.clusterrolebinding.yaml diff --git a/manifests/common/base/cluster-monitoring-role-binding.yaml b/manifests/overrides/base/cluster-monitoring-role-binding.yaml similarity index 100% rename from manifests/common/base/cluster-monitoring-role-binding.yaml rename to manifests/overrides/base/cluster-monitoring-role-binding.yaml diff --git a/manifests/common/base/cluster-role-binding.yaml b/manifests/overrides/base/cluster-role-binding.yaml similarity index 100% rename from manifests/common/base/cluster-role-binding.yaml rename to manifests/overrides/base/cluster-role-binding.yaml diff --git a/manifests/common/base/cluster-role.yaml b/manifests/overrides/base/cluster-role.yaml similarity index 100% rename from manifests/common/base/cluster-role.yaml rename to manifests/overrides/base/cluster-role.yaml diff --git a/manifests/common/base/deployment.yaml b/manifests/overrides/base/deployment.yaml similarity index 100% rename from manifests/common/base/deployment.yaml rename to manifests/overrides/base/deployment.yaml diff --git a/manifests/common/base/fetch-accelerators.rbac.yaml b/manifests/overrides/base/fetch-accelerators.rbac.yaml similarity index 100% rename from manifests/common/base/fetch-accelerators.rbac.yaml rename to manifests/overrides/base/fetch-accelerators.rbac.yaml diff --git a/manifests/common/base/fetch-builds-and-images.rbac.yaml b/manifests/overrides/base/fetch-builds-and-images.rbac.yaml similarity index 100% rename from manifests/common/base/fetch-builds-and-images.rbac.yaml rename to manifests/overrides/base/fetch-builds-and-images.rbac.yaml diff --git a/manifests/common/base/image-puller.clusterrolebinding.yaml b/manifests/overrides/base/image-puller.clusterrolebinding.yaml similarity index 100% rename from manifests/common/base/image-puller.clusterrolebinding.yaml rename to manifests/overrides/base/image-puller.clusterrolebinding.yaml diff --git a/manifests/common/base/kustomization.yaml b/manifests/overrides/base/kustomization.yaml similarity index 90% rename from manifests/common/base/kustomization.yaml rename to manifests/overrides/base/kustomization.yaml index 52e4f1a016..0ad1b6d0e4 100644 --- a/manifests/common/base/kustomization.yaml +++ b/manifests/overrides/base/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - role.yaml - cluster-role.yaml diff --git a/manifests/common/base/model-serving-role-binding.yaml b/manifests/overrides/base/model-serving-role-binding.yaml similarity index 100% rename from manifests/common/base/model-serving-role-binding.yaml rename to manifests/overrides/base/model-serving-role-binding.yaml diff --git a/manifests/common/base/model-serving-role.yaml b/manifests/overrides/base/model-serving-role.yaml similarity index 100% rename from manifests/common/base/model-serving-role.yaml rename to manifests/overrides/base/model-serving-role.yaml diff --git a/manifests/common/base/oauth.secret.yaml b/manifests/overrides/base/oauth.secret.yaml similarity index 100% rename from manifests/common/base/oauth.secret.yaml rename to manifests/overrides/base/oauth.secret.yaml diff --git a/manifests/common/base/role-binding.yaml b/manifests/overrides/base/role-binding.yaml similarity index 100% rename from manifests/common/base/role-binding.yaml rename to manifests/overrides/base/role-binding.yaml diff --git a/manifests/common/base/role.yaml b/manifests/overrides/base/role.yaml similarity index 100% rename from manifests/common/base/role.yaml rename to manifests/overrides/base/role.yaml diff --git a/manifests/common/base/routes.yaml b/manifests/overrides/base/routes.yaml similarity index 100% rename from manifests/common/base/routes.yaml rename to manifests/overrides/base/routes.yaml diff --git a/manifests/common/base/service-account.yaml b/manifests/overrides/base/service-account.yaml similarity index 100% rename from manifests/common/base/service-account.yaml rename to manifests/overrides/base/service-account.yaml diff --git a/manifests/common/base/service.yaml b/manifests/overrides/base/service.yaml similarity index 100% rename from manifests/common/base/service.yaml rename to manifests/overrides/base/service.yaml diff --git a/manifests/common/consolelink/consolelink.yaml b/manifests/overrides/consolelink/consolelink.yaml similarity index 100% rename from manifests/common/consolelink/consolelink.yaml rename to manifests/overrides/consolelink/consolelink.yaml diff --git a/manifests/common/consolelink/kustomization.yaml b/manifests/overrides/consolelink/kustomization.yaml similarity index 100% rename from manifests/common/consolelink/kustomization.yaml rename to manifests/overrides/consolelink/kustomization.yaml diff --git a/manifests/rhoai/README.md b/manifests/rhoai/README.md index 5434a18e96..6515ecd803 100644 --- a/manifests/rhoai/README.md +++ b/manifests/rhoai/README.md @@ -1,5 +1,3 @@ # RHOAI Manifests -These manifests are only for RHOAI. Overrides can be performed on the manifest files in common. - -Use the `./shared` folder to place anything that is shared between RHOAI deployments. +These manifests are only for RHOAI. Overrides can be performed on the manifest files in `../overrides`. diff --git a/manifests/rhoai/addon/README.md b/manifests/rhoai/addon/README.md new file mode 100644 index 0000000000..a082f96c8b --- /dev/null +++ b/manifests/rhoai/addon/README.md @@ -0,0 +1,7 @@ +# RHOAI Addon Deployment + +This is the starting location for RHOAI addon manifests. + +Only add items to this folder that are exclusively addon manifests. + +> **Note:** See [`../shared`](../shared/README.md) for common items between RHOAI deployments. diff --git a/manifests/rhoai/addon/apps/kustomization.yaml b/manifests/rhoai/addon/apps/kustomization.yaml index 16b3c29051..49582fd4da 100644 --- a/manifests/rhoai/addon/apps/kustomization.yaml +++ b/manifests/rhoai/addon/apps/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - ./nvidia - ./rhoam diff --git a/manifests/rhoai/addon/apps/nvidia/kustomization.yaml b/manifests/rhoai/addon/apps/nvidia/kustomization.yaml index 736243866e..24138ad818 100644 --- a/manifests/rhoai/addon/apps/nvidia/kustomization.yaml +++ b/manifests/rhoai/addon/apps/nvidia/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - nvidia-app.yaml - gpu-quickstart.yaml diff --git a/manifests/rhoai/addon/apps/rhoam/kustomization.yaml b/manifests/rhoai/addon/apps/rhoam/kustomization.yaml index 2e885aecde..542fad61c9 100644 --- a/manifests/rhoai/addon/apps/rhoam/kustomization.yaml +++ b/manifests/rhoai/addon/apps/rhoam/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - rhoam-app.yaml - deploy-model-rhoam-quickstart.yaml diff --git a/manifests/rhoai/addon/apps/starburst/kustomization.yaml b/manifests/rhoai/addon/apps/starburst/kustomization.yaml index 74986913b9..534c89db72 100644 --- a/manifests/rhoai/addon/apps/starburst/kustomization.yaml +++ b/manifests/rhoai/addon/apps/starburst/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - starburst-app.yaml - starburst-galaxy-quickstart.yaml diff --git a/manifests/rhoai/addon/kustomization.yaml b/manifests/rhoai/addon/kustomization.yaml index f4a567cfff..5bb1f41949 100644 --- a/manifests/rhoai/addon/kustomization.yaml +++ b/manifests/rhoai/addon/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard + app: rhods-dashboard + app.kubernetes.io/part-of: rhods-dashboard resources: - ../shared - ./apps diff --git a/manifests/rhoai/onprem/README.md b/manifests/rhoai/onprem/README.md new file mode 100644 index 0000000000..96a25fc57b --- /dev/null +++ b/manifests/rhoai/onprem/README.md @@ -0,0 +1,7 @@ +# RHOAI OnPrem Deployment + +This is the starting location for RHOAI onprem manifests. + +Only add items to this folder that are exclusively onprem manifests. + +> **Note:** See [`../shared`](../shared/README.md) for common items between RHOAI deployments. diff --git a/manifests/rhoai/onprem/apps/kustomization.yaml b/manifests/rhoai/onprem/apps/kustomization.yaml index cf8c19d151..7b7fd5939f 100644 --- a/manifests/rhoai/onprem/apps/kustomization.yaml +++ b/manifests/rhoai/onprem/apps/kustomization.yaml @@ -1,7 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - ./starburst-enterprise diff --git a/manifests/rhoai/onprem/apps/starburst-enterprise/kustomization.yaml b/manifests/rhoai/onprem/apps/starburst-enterprise/kustomization.yaml index 93d5ffc53f..14e3a63209 100644 --- a/manifests/rhoai/onprem/apps/starburst-enterprise/kustomization.yaml +++ b/manifests/rhoai/onprem/apps/starburst-enterprise/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - query-starburstenterprise-quickstart.yaml - starburstenterprise-app.yaml diff --git a/manifests/rhoai/onprem/kustomization.yaml b/manifests/rhoai/onprem/kustomization.yaml index eae1c125e0..5bb1f41949 100644 --- a/manifests/rhoai/onprem/kustomization.yaml +++ b/manifests/rhoai/onprem/kustomization.yaml @@ -1,7 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard + app: rhods-dashboard + app.kubernetes.io/part-of: rhods-dashboard resources: - ../shared + - ./apps diff --git a/manifests/rhoai/shared/README.md b/manifests/rhoai/shared/README.md new file mode 100644 index 0000000000..3ff74aa349 --- /dev/null +++ b/manifests/rhoai/shared/README.md @@ -0,0 +1,3 @@ +# RHOAI Shared Manifests + +These are all the manifests that are shared between all of the RHOAI deployments. diff --git a/manifests/rhoai/shared/apps/aikit/kustomization.yaml b/manifests/rhoai/shared/apps/aikit/kustomization.yaml index d2ed5d7632..2aa3393b07 100644 --- a/manifests/rhoai/shared/apps/aikit/kustomization.yaml +++ b/manifests/rhoai/shared/apps/aikit/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - oneapi-aikit-notebook-quickstart.yaml - aikit-app.yaml diff --git a/manifests/rhoai/shared/apps/anaconda-ce/kustomization.yaml b/manifests/rhoai/shared/apps/anaconda-ce/kustomization.yaml index d756d7b4a4..ea8f8062a9 100644 --- a/manifests/rhoai/shared/apps/anaconda-ce/kustomization.yaml +++ b/manifests/rhoai/shared/apps/anaconda-ce/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - anaconda-ce-app.yaml - anaconda-ce-create-jupyter-notebook-quickstart.yaml diff --git a/manifests/rhoai/shared/apps/elastic/kustomization.yaml b/manifests/rhoai/shared/apps/elastic/kustomization.yaml index 5b1d520879..77c72de0a4 100644 --- a/manifests/rhoai/shared/apps/elastic/kustomization.yaml +++ b/manifests/rhoai/shared/apps/elastic/kustomization.yaml @@ -1,7 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - elastic-app.yaml diff --git a/manifests/rhoai/shared/apps/kustomization.yaml b/manifests/rhoai/shared/apps/kustomization.yaml index e3c7cdabee..a783c6d066 100644 --- a/manifests/rhoai/shared/apps/kustomization.yaml +++ b/manifests/rhoai/shared/apps/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - ./aikit - ./anaconda-ce diff --git a/manifests/rhoai/shared/apps/openvino/kustomization.yaml b/manifests/rhoai/shared/apps/openvino/kustomization.yaml index 2aac1b3fe4..fe1e16c964 100644 --- a/manifests/rhoai/shared/apps/openvino/kustomization.yaml +++ b/manifests/rhoai/shared/apps/openvino/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - openvino-app.yaml - openvino-docs.yaml diff --git a/manifests/rhoai/shared/apps/pachyderm/kustomization.yaml b/manifests/rhoai/shared/apps/pachyderm/kustomization.yaml index 5a641e275f..a8fb3af6c5 100644 --- a/manifests/rhoai/shared/apps/pachyderm/kustomization.yaml +++ b/manifests/rhoai/shared/apps/pachyderm/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - pachyderm-app.yaml - pachyderm-docs.yaml diff --git a/manifests/rhoai/shared/apps/rhoai/kustomization.yaml b/manifests/rhoai/shared/apps/rhoai/kustomization.yaml index 09ea374288..dfd185c81e 100644 --- a/manifests/rhoai/shared/apps/rhoai/kustomization.yaml +++ b/manifests/rhoai/shared/apps/rhoai/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - rhoai-app.yaml - rhoai-docs.yaml diff --git a/manifests/rhoai/shared/apps/watson-x/kustomization.yaml b/manifests/rhoai/shared/apps/watson-x/kustomization.yaml index cebc5ea8f0..d33ee262b8 100644 --- a/manifests/rhoai/shared/apps/watson-x/kustomization.yaml +++ b/manifests/rhoai/shared/apps/watson-x/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - watson-x-docs.yaml - watson-x-app.yaml diff --git a/manifests/rhoai/shared/base/kustomization.yaml b/manifests/rhoai/shared/base/kustomization.yaml index b9e7c52230..ef89f295e6 100644 --- a/manifests/rhoai/shared/base/kustomization.yaml +++ b/manifests/rhoai/shared/base/kustomization.yaml @@ -1,9 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: rhods-dashboard - app.kubernetes.io/part-of: rhods-dashboard resources: + - ../../../overrides/base - anaconda-ce-validator-cron.yaml patchesJson6902: - path: service-account.yaml diff --git a/manifests/rhoai/shared/consolelink/kustomization.yaml b/manifests/rhoai/shared/consolelink/kustomization.yaml index 85cfcd7365..d2d9b1ee16 100644 --- a/manifests/rhoai/shared/consolelink/kustomization.yaml +++ b/manifests/rhoai/shared/consolelink/kustomization.yaml @@ -4,10 +4,11 @@ commonLabels: app: rhods-dashboard app.kubernetes.io/part-of: rhods-dashboard resources: - - ../../../common/consolelink + - ../../../overrides/consolelink patchesJson6902: - path: consolelink.yaml target: + group: console.openshift.io version: v1 kind: ConsoleLink name: odhlink diff --git a/manifests/rhoai/shared/kustomization.yaml b/manifests/rhoai/shared/kustomization.yaml index 44c308901e..d22a15bb89 100644 --- a/manifests/rhoai/shared/kustomization.yaml +++ b/manifests/rhoai/shared/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: odh-dashboard - app.kubernetes.io/part-of: odh-dashboard resources: - ../../common - ./apps