Restructure the manifest files

opendatahub-io · Jun 14, 2024 · 7c392ba · 7c392ba
1 parent 48a6201
commit 7c392ba
Show file tree

Hide file tree

Showing 106 changed files with 56 additions and 146 deletions.
diff --git a/docs/architecture.md b/docs/architecture.md
@@ -1,4 +1,4 @@
-[Dashboard Deployment `containers`]: ../manifests/base/deployment.yaml
+[Dashboard Deployment `containers`]: ../manifests/common/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
@@ -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/base/cluster-role.yaml) to your user as we do with the service account [binding](../manifests/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/common/base/cluster-role.yaml) to your user as we do with the service account [binding](../manifests/common/base/cluster-role-binding.yaml).
 
 ```bash
 npm run start

diff --git a/docs/release-steps.md b/docs/release-steps.md
@@ -1,4 +1,4 @@
-[base/kustomization.yaml]: ../manifests/base/kustomization.yaml
+[base/kustomization.yaml]: ../manifests/common/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/README.md b/manifests/README.md
@@ -1,18 +1,16 @@
-# Dashboard
+# Manifests
 
-The Open Data Hub Dashboard component installs a UI which 
+They run on Kustomize. There are 3 types of deployments.
 
-- Shows what's installed
-- Show's what's available for installation
-- Links to component UIs
-- Links to component documentation
+- Open Data Hub (`./odh`)
+- Red Hat OpenShift AI (`./rhoai`)
+  - RHOAI Managed (`./rhoai/addon`)
+  - RHOAI Self Managed (`./rhoai/onprem`)
 
-For more information, visit the project [GitHub repo](https://github.com/opendatahub-io/odh-dashboard).
+The `common` & `./rhoai/shared` are two locations where the bases are found. Base folder has the resources or overrides (for RHOAI) to deploy the dashboard. 
 
-### Folders
-1. base: contains all the necessary yaml files to install the dashboard
+## Installation
 
-##### Installation
 Use the `kustomize` tool to process the manifest for the `oc apply` command.
 
 ```

diff --git a/...r/create-jupyter-notebook-quickstart.yaml → ...r/create-jupyter-notebook-quickstart.yaml b/...r/create-jupyter-notebook-quickstart.yaml → ...r/create-jupyter-notebook-quickstart.yaml
diff --git a/...pyter/deploy-python-model-quickstart.yaml → ...pyter/deploy-python-model-quickstart.yaml b/...pyter/deploy-python-model-quickstart.yaml → ...pyter/deploy-python-model-quickstart.yaml
diff --git a/manifests/apps/jupyter/jupyter-app.yaml → ...ests/common/apps/jupyter/jupyter-app.yaml b/manifests/apps/jupyter/jupyter-app.yaml → ...ests/common/apps/jupyter/jupyter-app.yaml
diff --git a/manifests/apps/jupyter/jupyter-docs.yaml → ...sts/common/apps/jupyter/jupyter-docs.yaml b/manifests/apps/jupyter/jupyter-docs.yaml → ...sts/common/apps/jupyter/jupyter-docs.yaml
diff --git a/manifests/apps/jupyter/kustomization.yaml → ...ts/common/apps/jupyter/kustomization.yaml b/manifests/apps/jupyter/kustomization.yaml → ...ts/common/apps/jupyter/kustomization.yaml
diff --git a/manifests/apps/kustomization.yaml → manifests/common/apps/kustomization.yaml b/manifests/apps/kustomization.yaml → manifests/common/apps/kustomization.yaml
diff --git a/...se/auth-delegator.clusterrolebinding.yaml → ...se/auth-delegator.clusterrolebinding.yaml b/...se/auth-delegator.clusterrolebinding.yaml → ...se/auth-delegator.clusterrolebinding.yaml
diff --git a/...base/cluster-monitoring-role-binding.yaml → ...base/cluster-monitoring-role-binding.yaml b/...base/cluster-monitoring-role-binding.yaml → ...base/cluster-monitoring-role-binding.yaml
diff --git a/manifests/base/cluster-role-binding.yaml → ...sts/common/base/cluster-role-binding.yaml b/manifests/base/cluster-role-binding.yaml → ...sts/common/base/cluster-role-binding.yaml
diff --git a/manifests/base/cluster-role.yaml → manifests/common/base/cluster-role.yaml b/manifests/base/cluster-role.yaml → manifests/common/base/cluster-role.yaml
diff --git a/manifests/base/deployment.yaml → manifests/common/base/deployment.yaml b/manifests/base/deployment.yaml → manifests/common/base/deployment.yaml
diff --git a/manifests/base/fetch-accelerators.rbac.yaml → .../common/base/fetch-accelerators.rbac.yaml b/manifests/base/fetch-accelerators.rbac.yaml → .../common/base/fetch-accelerators.rbac.yaml
diff --git a/...ts/base/fetch-builds-and-images.rbac.yaml → ...on/base/fetch-builds-and-images.rbac.yaml b/...ts/base/fetch-builds-and-images.rbac.yaml → ...on/base/fetch-builds-and-images.rbac.yaml
diff --git a/...base/image-puller.clusterrolebinding.yaml → ...base/image-puller.clusterrolebinding.yaml b/...base/image-puller.clusterrolebinding.yaml → ...base/image-puller.clusterrolebinding.yaml
diff --git a/manifests/base/kustomization.yaml → manifests/common/base/kustomization.yaml b/manifests/base/kustomization.yaml → manifests/common/base/kustomization.yaml
diff --git a/...ests/base/model-serving-role-binding.yaml → ...mmon/base/model-serving-role-binding.yaml b/...ests/base/model-serving-role-binding.yaml → ...mmon/base/model-serving-role-binding.yaml
diff --git a/manifests/base/model-serving-role.yaml → ...fests/common/base/model-serving-role.yaml b/manifests/base/model-serving-role.yaml → ...fests/common/base/model-serving-role.yaml
diff --git a/manifests/base/oauth.secret.yaml → manifests/common/base/oauth.secret.yaml b/manifests/base/oauth.secret.yaml → manifests/common/base/oauth.secret.yaml
diff --git a/manifests/base/role-binding.yaml → manifests/common/base/role-binding.yaml b/manifests/base/role-binding.yaml → manifests/common/base/role-binding.yaml
diff --git a/manifests/base/role.yaml → manifests/common/base/role.yaml b/manifests/base/role.yaml → manifests/common/base/role.yaml
diff --git a/manifests/base/routes.yaml → manifests/common/base/routes.yaml b/manifests/base/routes.yaml → manifests/common/base/routes.yaml
diff --git a/manifests/base/service-account.yaml → manifests/common/base/service-account.yaml b/manifests/base/service-account.yaml → manifests/common/base/service-account.yaml
diff --git a/manifests/base/service.yaml → manifests/common/base/service.yaml b/manifests/base/service.yaml → manifests/common/base/service.yaml
diff --git a/...celeratorprofiles.opendatahub.io.crd.yaml → ...celeratorprofiles.opendatahub.io.crd.yaml b/...celeratorprofiles.opendatahub.io.crd.yaml → ...celeratorprofiles.opendatahub.io.crd.yaml
diff --git a/manifests/crd/kustomization.yaml → manifests/common/crd/kustomization.yaml b/manifests/crd/kustomization.yaml → manifests/common/crd/kustomization.yaml
diff --git a/...cations.dashboard.opendatahub.io.crd.yaml → ...cations.dashboard.opendatahub.io.crd.yaml b/...cations.dashboard.opendatahub.io.crd.yaml → ...cations.dashboard.opendatahub.io.crd.yaml
diff --git a/...hdashboardconfigs.opendatahub.io.crd.yaml → ...hdashboardconfigs.opendatahub.io.crd.yaml b/...hdashboardconfigs.opendatahub.io.crd.yaml → ...hdashboardconfigs.opendatahub.io.crd.yaml
diff --git a/...cuments.dashboard.opendatahub.io.crd.yaml → ...cuments.dashboard.opendatahub.io.crd.yaml b/...cuments.dashboard.opendatahub.io.crd.yaml → ...cuments.dashboard.opendatahub.io.crd.yaml
diff --git a/...quickstarts.console.openshift.io.crd.yaml → ...quickstarts.console.openshift.io.crd.yaml b/...quickstarts.console.openshift.io.crd.yaml → ...quickstarts.console.openshift.io.crd.yaml
diff --git a/manifests/common/kustomization.yaml b/manifests/common/kustomization.yaml
@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+commonLabels:
+  app: odh-dashboard
+  app.kubernetes.io/part-of: odh-dashboard
+resources:
+  - ./apps
+  - ./base
+  - ./crd
diff --git a/manifests/consolelink/consolelink.yaml → manifests/odh/consolelink/consolelink.yaml b/manifests/consolelink/consolelink.yaml → manifests/odh/consolelink/consolelink.yaml
diff --git a/manifests/consolelink/kustomization.yaml → manifests/odh/consolelink/kustomization.yaml b/manifests/consolelink/kustomization.yaml → manifests/odh/consolelink/kustomization.yaml
diff --git a/manifests/odh/kustomization.yaml b/manifests/odh/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+commonLabels:
+  app: odh-dashboard
+  app.kubernetes.io/part-of: odh-dashboard
+resources:
+  - ../common
+  - ./consolelink
diff --git a/manifests/overlays/dev/kustomization.yaml b/manifests/overlays/dev/kustomization.yaml
diff --git a/manifests/overlays/incubation/deployment.yaml b/manifests/overlays/incubation/deployment.yaml
diff --git a/manifests/overlays/incubation/kustomization.yaml b/manifests/overlays/incubation/kustomization.yaml
diff --git a/manifests/overlays/odhdashboardconfig/odh-dashboard-config.yaml b/manifests/overlays/odhdashboardconfig/odh-dashboard-config.yaml
diff --git a/manifests/overlays/odhdashboardconfig/odh-enabled-applications-config.configmap.yaml b/manifests/overlays/odhdashboardconfig/odh-enabled-applications-config.configmap.yaml
diff --git a/manifests/overlays/performance/deployment.yaml b/manifests/overlays/performance/deployment.yaml
diff --git a/manifests/overlays/performance/kustomization.yaml b/manifests/overlays/performance/kustomization.yaml
diff --git a/...erlays/apps/apps-addon/kustomization.yaml → ...fests/rhoai/addon/apps/kustomization.yaml b/...erlays/apps/apps-addon/kustomization.yaml → ...fests/rhoai/addon/apps/kustomization.yaml
@@ -4,7 +4,6 @@ commonLabels:
   app: odh-dashboard
   app.kubernetes.io/part-of: odh-dashboard
 resources:
-  - ../base
   - ./nvidia
   - ./rhoam
   - ./starburst
diff --git a/...idia/gpu-enabled-notebook-quickstart.yaml → ...idia/gpu-enabled-notebook-quickstart.yaml b/...idia/gpu-enabled-notebook-quickstart.yaml → ...idia/gpu-enabled-notebook-quickstart.yaml
diff --git a/...pps/apps-addon/nvidia/gpu-quickstart.yaml → ...oai/addon/apps/nvidia/gpu-quickstart.yaml b/...pps/apps-addon/nvidia/gpu-quickstart.yaml → ...oai/addon/apps/nvidia/gpu-quickstart.yaml
diff --git a/...apps/apps-addon/nvidia/kustomization.yaml → ...hoai/addon/apps/nvidia/kustomization.yaml b/...apps/apps-addon/nvidia/kustomization.yaml → ...hoai/addon/apps/nvidia/kustomization.yaml
diff --git a/...ys/apps/apps-addon/nvidia/nvidia-app.yaml → ...s/rhoai/addon/apps/nvidia/nvidia-app.yaml b/...ys/apps/apps-addon/nvidia/nvidia-app.yaml → ...s/rhoai/addon/apps/nvidia/nvidia-app.yaml
diff --git a/.../rhoam/deploy-model-rhoam-quickstart.yaml → .../rhoam/deploy-model-rhoam-quickstart.yaml b/.../rhoam/deploy-model-rhoam-quickstart.yaml → .../rhoam/deploy-model-rhoam-quickstart.yaml
diff --git a/.../apps/apps-addon/rhoam/kustomization.yaml → ...rhoai/addon/apps/rhoam/kustomization.yaml b/.../apps/apps-addon/rhoam/kustomization.yaml → ...rhoai/addon/apps/rhoam/kustomization.yaml
diff --git a/...lays/apps/apps-addon/rhoam/rhoam-app.yaml → ...sts/rhoai/addon/apps/rhoam/rhoam-app.yaml b/...lays/apps/apps-addon/rhoam/rhoam-app.yaml → ...sts/rhoai/addon/apps/rhoam/rhoam-app.yaml
diff --git a/...s/apps-addon/starburst/kustomization.yaml → ...i/addon/apps/starburst/kustomization.yaml b/...s/apps-addon/starburst/kustomization.yaml → ...i/addon/apps/starburst/kustomization.yaml
diff --git a/...s/apps-addon/starburst/starburst-app.yaml → ...i/addon/apps/starburst/starburst-app.yaml b/...s/apps-addon/starburst/starburst-app.yaml → ...i/addon/apps/starburst/starburst-app.yaml
diff --git a/...tarburst/starburst-galaxy-quickstart.yaml → ...tarburst/starburst-galaxy-quickstart.yaml b/...tarburst/starburst-galaxy-quickstart.yaml → ...tarburst/starburst-galaxy-quickstart.yaml
diff --git a/manifests/rhoai/addon/kustomization.yaml b/manifests/rhoai/addon/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+commonLabels:
+  app: odh-dashboard
+  app.kubernetes.io/part-of: odh-dashboard
+resources:
+  - ../shared
+  - ./apps
diff --git a/...rlays/apps/apps-onprem/kustomization.yaml → ...ests/rhoai/onprem/apps/kustomization.yaml b/...rlays/apps/apps-onprem/kustomization.yaml → ...ests/rhoai/onprem/apps/kustomization.yaml
@@ -4,5 +4,4 @@ commonLabels:
   app: odh-dashboard
   app.kubernetes.io/part-of: odh-dashboard
 resources:
-  - ../base
   - ./starburst-enterprise
diff --git a/...m/starburst-enterprise/kustomization.yaml → ...s/starburst-enterprise/kustomization.yaml b/...m/starburst-enterprise/kustomization.yaml → ...s/starburst-enterprise/kustomization.yaml
diff --git a/...query-starburstenterprise-quickstart.yaml → ...query-starburstenterprise-quickstart.yaml b/...query-starburstenterprise-quickstart.yaml → ...query-starburstenterprise-quickstart.yaml
diff --git a/...t-enterprise/starburstenterprise-app.yaml → ...t-enterprise/starburstenterprise-app.yaml b/...t-enterprise/starburstenterprise-app.yaml → ...t-enterprise/starburstenterprise-app.yaml
diff --git a/...-enterprise/starburstenterprise-docs.yaml → ...-enterprise/starburstenterprise-docs.yaml b/...-enterprise/starburstenterprise-docs.yaml → ...-enterprise/starburstenterprise-docs.yaml
diff --git a/manifests/rhoai/onprem/kustomization.yaml b/manifests/rhoai/onprem/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+commonLabels:
+  app: odh-dashboard
+  app.kubernetes.io/part-of: odh-dashboard
+resources:
+  - ../shared
diff --git a/...s/overlays/apps/base/aikit/aikit-app.yaml → ...ts/rhoai/shared/apps/aikit/aikit-app.yaml b/...s/overlays/apps/base/aikit/aikit-app.yaml → ...ts/rhoai/shared/apps/aikit/aikit-app.yaml
diff --git a/...erlays/apps/base/aikit/kustomization.yaml → ...hoai/shared/apps/aikit/kustomization.yaml b/...erlays/apps/base/aikit/kustomization.yaml → ...hoai/shared/apps/aikit/kustomization.yaml
diff --git a/...kit/oneapi-aikit-notebook-quickstart.yaml → ...kit/oneapi-aikit-notebook-quickstart.yaml b/...kit/oneapi-aikit-notebook-quickstart.yaml → ...kit/oneapi-aikit-notebook-quickstart.yaml
diff --git a/...pps/base/anaconda-ce/anaconda-ce-app.yaml → ...red/apps/anaconda-ce/anaconda-ce-app.yaml b/...pps/base/anaconda-ce/anaconda-ce-app.yaml → ...red/apps/anaconda-ce/anaconda-ce-app.yaml
diff --git a/...e-create-jupyter-notebook-quickstart.yaml → ...e-create-jupyter-notebook-quickstart.yaml b/...e-create-jupyter-notebook-quickstart.yaml → ...e-create-jupyter-notebook-quickstart.yaml
diff --git a/...ps/base/anaconda-ce/anaconda-ce-docs.yaml → ...ed/apps/anaconda-ce/anaconda-ce-docs.yaml b/...ps/base/anaconda-ce/anaconda-ce-docs.yaml → ...ed/apps/anaconda-ce/anaconda-ce-docs.yaml
diff --git a/.../apps/base/anaconda-ce/kustomization.yaml → ...hared/apps/anaconda-ce/kustomization.yaml b/.../apps/base/anaconda-ce/kustomization.yaml → ...hared/apps/anaconda-ce/kustomization.yaml
diff --git a/...erlays/apps/base/elastic/elastic-app.yaml → ...hoai/shared/apps/elastic/elastic-app.yaml b/...erlays/apps/base/elastic/elastic-app.yaml → ...hoai/shared/apps/elastic/elastic-app.yaml
diff --git a/...lays/apps/base/elastic/kustomization.yaml → ...ai/shared/apps/elastic/kustomization.yaml b/...lays/apps/base/elastic/kustomization.yaml → ...ai/shared/apps/elastic/kustomization.yaml
diff --git a/...sts/overlays/apps/base/kustomization.yaml → ...ests/rhoai/shared/apps/kustomization.yaml b/...sts/overlays/apps/base/kustomization.yaml → ...ests/rhoai/shared/apps/kustomization.yaml
@@ -4,7 +4,6 @@ commonLabels:
   app: odh-dashboard
   app.kubernetes.io/part-of: odh-dashboard
 resources:
-  - ../../../apps
   - ./aikit
   - ./anaconda-ce
   - ./elastic

diff --git a/...ays/apps/base/openvino/kustomization.yaml → ...i/shared/apps/openvino/kustomization.yaml b/...ays/apps/base/openvino/kustomization.yaml → ...i/shared/apps/openvino/kustomization.yaml
diff --git a/...lays/apps/base/openvino/openvino-app.yaml → ...ai/shared/apps/openvino/openvino-app.yaml b/...lays/apps/base/openvino/openvino-app.yaml → ...ai/shared/apps/openvino/openvino-app.yaml
diff --git a/...ays/apps/base/openvino/openvino-docs.yaml → ...i/shared/apps/openvino/openvino-docs.yaml b/...ays/apps/base/openvino/openvino-docs.yaml → ...i/shared/apps/openvino/openvino-docs.yaml
diff --git a/...openvino/openvino-inference-notebook.yaml → ...openvino/openvino-inference-notebook.yaml b/...openvino/openvino-inference-notebook.yaml → ...openvino/openvino-inference-notebook.yaml
diff --git a/...ys/apps/base/pachyderm/kustomization.yaml → .../shared/apps/pachyderm/kustomization.yaml b/...ys/apps/base/pachyderm/kustomization.yaml → .../shared/apps/pachyderm/kustomization.yaml
diff --git a/...ys/apps/base/pachyderm/pachyderm-app.yaml → .../shared/apps/pachyderm/pachyderm-app.yaml b/...ys/apps/base/pachyderm/pachyderm-app.yaml → .../shared/apps/pachyderm/pachyderm-app.yaml
diff --git a/...pachyderm-beginner-tutorial-notebook.yaml → ...pachyderm-beginner-tutorial-notebook.yaml b/...pachyderm-beginner-tutorial-notebook.yaml → ...pachyderm-beginner-tutorial-notebook.yaml
diff --git a/...s/apps/base/pachyderm/pachyderm-docs.yaml → ...shared/apps/pachyderm/pachyderm-docs.yaml b/...s/apps/base/pachyderm/pachyderm-docs.yaml → ...shared/apps/pachyderm/pachyderm-docs.yaml
diff --git a/...erlays/apps/base/rhoai/kustomization.yaml → ...hoai/shared/apps/rhoai/kustomization.yaml b/...erlays/apps/base/rhoai/kustomization.yaml → ...hoai/shared/apps/rhoai/kustomization.yaml
diff --git a/...s/overlays/apps/base/rhoai/rhoai-app.yaml → ...ts/rhoai/shared/apps/rhoai/rhoai-app.yaml b/...s/overlays/apps/base/rhoai/rhoai-app.yaml → ...ts/rhoai/shared/apps/rhoai/rhoai-app.yaml
diff --git a/.../overlays/apps/base/rhoai/rhoai-docs.yaml → ...s/rhoai/shared/apps/rhoai/rhoai-docs.yaml b/.../overlays/apps/base/rhoai/rhoai-docs.yaml → ...s/rhoai/shared/apps/rhoai/rhoai-docs.yaml
diff --git a/...ays/apps/base/watson-x/kustomization.yaml → ...i/shared/apps/watson-x/kustomization.yaml b/...ays/apps/base/watson-x/kustomization.yaml → ...i/shared/apps/watson-x/kustomization.yaml
diff --git a/...lays/apps/base/watson-x/watson-x-app.yaml → ...ai/shared/apps/watson-x/watson-x-app.yaml b/...lays/apps/base/watson-x/watson-x-app.yaml → ...ai/shared/apps/watson-x/watson-x-app.yaml
diff --git a/...ays/apps/base/watson-x/watson-x-docs.yaml → ...i/shared/apps/watson-x/watson-x-docs.yaml b/...ays/apps/base/watson-x/watson-x-docs.yaml → ...i/shared/apps/watson-x/watson-x-docs.yaml
diff --git a/...ays/rhoai/anaconda-ce-validator-cron.yaml → ...ared/base/anaconda-ce-validator-cron.yaml b/...ays/rhoai/anaconda-ce-validator-cron.yaml → ...ared/base/anaconda-ce-validator-cron.yaml
diff --git a/...ai/auth-delegator.clusterrolebinding.yaml → ...se/auth-delegator.clusterrolebinding.yaml b/...ai/auth-delegator.clusterrolebinding.yaml → ...se/auth-delegator.clusterrolebinding.yaml
diff --git a/...hoai/cluster-monitoring-role-binding.yaml → ...base/cluster-monitoring-role-binding.yaml b/...hoai/cluster-monitoring-role-binding.yaml → ...base/cluster-monitoring-role-binding.yaml
diff --git a/.../overlays/rhoai/cluster-role-binding.yaml → ...oai/shared/base/cluster-role-binding.yaml b/.../overlays/rhoai/cluster-role-binding.yaml → ...oai/shared/base/cluster-role-binding.yaml
diff --git a/manifests/overlays/rhoai/cluster-role.yaml → ...fests/rhoai/shared/base/cluster-role.yaml b/manifests/overlays/rhoai/cluster-role.yaml → ...fests/rhoai/shared/base/cluster-role.yaml
diff --git a/manifests/overlays/rhoai/deployment.yaml → manifests/rhoai/shared/base/deployment.yaml b/manifests/overlays/rhoai/deployment.yaml → manifests/rhoai/shared/base/deployment.yaml
diff --git a/manifests/overlays/rhoai/kustomization.yaml → ...ests/rhoai/shared/base/kustomization.yaml b/manifests/overlays/rhoai/kustomization.yaml → ...ests/rhoai/shared/base/kustomization.yaml
diff --git a/manifests/overlays/rhoai/oauth.secret.yaml → ...fests/rhoai/shared/base/oauth.secret.yaml b/manifests/overlays/rhoai/oauth.secret.yaml → ...fests/rhoai/shared/base/oauth.secret.yaml
diff --git a/manifests/overlays/rhoai/params.env → manifests/rhoai/shared/base/params.env b/manifests/overlays/rhoai/params.env → manifests/rhoai/shared/base/params.env
diff --git a/manifests/overlays/rhoai/params.yaml → manifests/rhoai/shared/base/params.yaml b/manifests/overlays/rhoai/params.yaml → manifests/rhoai/shared/base/params.yaml
diff --git a/manifests/overlays/rhoai/role-binding.yaml → ...fests/rhoai/shared/base/role-binding.yaml b/manifests/overlays/rhoai/role-binding.yaml → ...fests/rhoai/shared/base/role-binding.yaml
diff --git a/manifests/overlays/rhoai/role.yaml → manifests/rhoai/shared/base/role.yaml b/manifests/overlays/rhoai/role.yaml → manifests/rhoai/shared/base/role.yaml
diff --git a/manifests/overlays/rhoai/routes.yaml → manifests/rhoai/shared/base/routes.yaml b/manifests/overlays/rhoai/routes.yaml → manifests/rhoai/shared/base/routes.yaml
diff --git a/...fests/overlays/rhoai/service-account.yaml → ...ts/rhoai/shared/base/service-account.yaml b/...fests/overlays/rhoai/service-account.yaml → ...ts/rhoai/shared/base/service-account.yaml
diff --git a/manifests/overlays/rhoai/service.yaml → manifests/rhoai/shared/base/service.yaml b/manifests/overlays/rhoai/service.yaml → manifests/rhoai/shared/base/service.yaml
diff --git a/...sts/overlays/consolelink/consolelink.yaml → ...rhoai/shared/consolelink/consolelink.yaml b/...sts/overlays/consolelink/consolelink.yaml → ...rhoai/shared/consolelink/consolelink.yaml
diff --git a/...s/overlays/consolelink/kustomization.yaml → ...oai/shared/consolelink/kustomization.yaml b/...s/overlays/consolelink/kustomization.yaml → ...oai/shared/consolelink/kustomization.yaml
@@ -4,10 +4,10 @@ commonLabels:
   app: rhods-dashboard
   app.kubernetes.io/part-of: rhods-dashboard
 resources:
-  - ../../consolelink
+  - ../../odh/consolelink
 patchesJson6902:
   - path: consolelink.yaml
     target:
       version: v1
       kind: ConsoleLink
-      name: odhlink
+      name: odhlink
diff --git a/manifests/rhoai/shared/kustomization.yaml b/manifests/rhoai/shared/kustomization.yaml
@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+commonLabels:
+  app: odh-dashboard
+  app.kubernetes.io/part-of: odh-dashboard
+resources:
+  - ../../common
+  - ./apps
+  - ./base
+  - ./consolelink
+  - ./odhdashboardconfig
diff --git a/...ays/odhdashboardconfig/kustomization.yaml → ...red/odhdashboardconfig/kustomization.yaml b/...ays/odhdashboardconfig/kustomization.yaml → ...red/odhdashboardconfig/kustomization.yaml
diff --git a/...dhdashboardconfig/odhdashboardconfig.yaml → ...dhdashboardconfig/odhdashboardconfig.yaml b/...dhdashboardconfig/odhdashboardconfig.yaml → ...dhdashboardconfig/odhdashboardconfig.yaml