diff --git a/docs/architecture.md b/docs/architecture.md index 7f9df4b709..f142f4b1b3 100644 --- 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 index eea4d051f8..f8af025d6d 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/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 index 725d09fd74..db108542d2 100644 --- 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 index fef8ae3c45..0f9da4823a 100644 --- a/manifests/README.md +++ b/manifests/README.md @@ -1,32 +1,26 @@ -# Dashboard +# Manifests -The Open Data Hub Dashboard component installs a UI which +The Dashboard manifests run on Kustomize. There are 3 types of deployments for the Dashboard component. -- 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 Managed (`./rhoai/addon`) + - RHOAI Self Managed (`./rhoai/onprem`) -For more information, visit the project [GitHub repo](https://github.com/opendatahub-io/odh-dashboard). +## Adding new Manifests -### Folders -1. base: contains all the necessary yaml files to install the dashboard +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. + +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. + +## Installation -##### Installation 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/base -kustomize edit set namespace # Set the namespace in the manifest where you want to deploy the dashboard -kustomize build . | oc apply -f - -``` - -``` -# Deploy ODH Dashboard with authentication AND the default configs for groups and ODHDashboardConfig -cd manifests/overlays/odhdashboardconfig -kustomize edit set namespace # Set the namespace in the manifest where you want to deploy the dashboard +cd manifests/common/base +# Set the namespace in the manifest where you want to deploy the dashboard +kustomize edit set namespace kustomize build . | oc apply -f - -# You will need to re-run the previous step if you receive the error below -# error: unable to recognize "STDIN": no matches for kind "OdhDashboardConfig" in version "opendatahub.io/v1alpha" ``` diff --git a/manifests/common/README.md b/manifests/common/README.md new file mode 100644 index 0000000000..a38d8245de --- /dev/null +++ b/manifests/common/README.md @@ -0,0 +1,5 @@ +# Common Manifests + +These are manifests that are shared in both ODH & RHOAI deployments. + +See `../odh` & `../rhoai` if there are specific deployment manifests needed. diff --git a/manifests/apps/jupyter/create-jupyter-notebook-quickstart.yaml b/manifests/common/apps/jupyter/create-jupyter-notebook-quickstart.yaml similarity index 100% rename from manifests/apps/jupyter/create-jupyter-notebook-quickstart.yaml rename to manifests/common/apps/jupyter/create-jupyter-notebook-quickstart.yaml diff --git a/manifests/apps/jupyter/deploy-python-model-quickstart.yaml b/manifests/common/apps/jupyter/deploy-python-model-quickstart.yaml similarity index 100% rename from manifests/apps/jupyter/deploy-python-model-quickstart.yaml rename to manifests/common/apps/jupyter/deploy-python-model-quickstart.yaml diff --git a/manifests/apps/jupyter/jupyter-app.yaml b/manifests/common/apps/jupyter/jupyter-app.yaml similarity index 100% rename from manifests/apps/jupyter/jupyter-app.yaml rename to manifests/common/apps/jupyter/jupyter-app.yaml diff --git a/manifests/apps/jupyter/jupyter-docs.yaml b/manifests/common/apps/jupyter/jupyter-docs.yaml similarity index 100% rename from manifests/apps/jupyter/jupyter-docs.yaml rename to manifests/common/apps/jupyter/jupyter-docs.yaml diff --git a/manifests/apps/jupyter/kustomization.yaml b/manifests/common/apps/jupyter/kustomization.yaml similarity index 100% rename from manifests/apps/jupyter/kustomization.yaml rename to manifests/common/apps/jupyter/kustomization.yaml diff --git a/manifests/apps/kustomization.yaml b/manifests/common/apps/kustomization.yaml similarity index 100% rename from manifests/apps/kustomization.yaml rename to manifests/common/apps/kustomization.yaml diff --git a/manifests/base/auth-delegator.clusterrolebinding.yaml b/manifests/common/base/auth-delegator.clusterrolebinding.yaml similarity index 100% rename from manifests/base/auth-delegator.clusterrolebinding.yaml rename to manifests/common/base/auth-delegator.clusterrolebinding.yaml diff --git a/manifests/base/cluster-monitoring-role-binding.yaml b/manifests/common/base/cluster-monitoring-role-binding.yaml similarity index 100% rename from manifests/base/cluster-monitoring-role-binding.yaml rename to manifests/common/base/cluster-monitoring-role-binding.yaml diff --git a/manifests/base/cluster-role-binding.yaml b/manifests/common/base/cluster-role-binding.yaml similarity index 100% rename from manifests/base/cluster-role-binding.yaml rename to manifests/common/base/cluster-role-binding.yaml diff --git a/manifests/base/cluster-role.yaml b/manifests/common/base/cluster-role.yaml similarity index 100% rename from manifests/base/cluster-role.yaml rename to manifests/common/base/cluster-role.yaml diff --git a/manifests/base/deployment.yaml b/manifests/common/base/deployment.yaml similarity index 100% rename from manifests/base/deployment.yaml rename to manifests/common/base/deployment.yaml diff --git a/manifests/base/fetch-accelerators.rbac.yaml b/manifests/common/base/fetch-accelerators.rbac.yaml similarity index 100% rename from manifests/base/fetch-accelerators.rbac.yaml rename to manifests/common/base/fetch-accelerators.rbac.yaml diff --git a/manifests/base/fetch-builds-and-images.rbac.yaml b/manifests/common/base/fetch-builds-and-images.rbac.yaml similarity index 100% rename from manifests/base/fetch-builds-and-images.rbac.yaml rename to manifests/common/base/fetch-builds-and-images.rbac.yaml diff --git a/manifests/base/image-puller.clusterrolebinding.yaml b/manifests/common/base/image-puller.clusterrolebinding.yaml similarity index 100% rename from manifests/base/image-puller.clusterrolebinding.yaml rename to manifests/common/base/image-puller.clusterrolebinding.yaml diff --git a/manifests/base/kustomization.yaml b/manifests/common/base/kustomization.yaml similarity index 100% rename from manifests/base/kustomization.yaml rename to manifests/common/base/kustomization.yaml diff --git a/manifests/base/model-serving-role-binding.yaml b/manifests/common/base/model-serving-role-binding.yaml similarity index 100% rename from manifests/base/model-serving-role-binding.yaml rename to manifests/common/base/model-serving-role-binding.yaml diff --git a/manifests/base/model-serving-role.yaml b/manifests/common/base/model-serving-role.yaml similarity index 100% rename from manifests/base/model-serving-role.yaml rename to manifests/common/base/model-serving-role.yaml diff --git a/manifests/base/oauth.secret.yaml b/manifests/common/base/oauth.secret.yaml similarity index 100% rename from manifests/base/oauth.secret.yaml rename to manifests/common/base/oauth.secret.yaml diff --git a/manifests/base/role-binding.yaml b/manifests/common/base/role-binding.yaml similarity index 100% rename from manifests/base/role-binding.yaml rename to manifests/common/base/role-binding.yaml diff --git a/manifests/base/role.yaml b/manifests/common/base/role.yaml similarity index 100% rename from manifests/base/role.yaml rename to manifests/common/base/role.yaml diff --git a/manifests/base/routes.yaml b/manifests/common/base/routes.yaml similarity index 100% rename from manifests/base/routes.yaml rename to manifests/common/base/routes.yaml diff --git a/manifests/base/service-account.yaml b/manifests/common/base/service-account.yaml similarity index 100% rename from manifests/base/service-account.yaml rename to manifests/common/base/service-account.yaml diff --git a/manifests/base/service.yaml b/manifests/common/base/service.yaml similarity index 100% rename from manifests/base/service.yaml rename to manifests/common/base/service.yaml diff --git a/manifests/consolelink/consolelink.yaml b/manifests/common/consolelink/consolelink.yaml similarity index 100% rename from manifests/consolelink/consolelink.yaml rename to manifests/common/consolelink/consolelink.yaml diff --git a/manifests/consolelink/kustomization.yaml b/manifests/common/consolelink/kustomization.yaml similarity index 100% rename from manifests/consolelink/kustomization.yaml rename to manifests/common/consolelink/kustomization.yaml diff --git a/manifests/crd/acceleratorprofiles.opendatahub.io.crd.yaml b/manifests/common/crd/acceleratorprofiles.opendatahub.io.crd.yaml similarity index 100% rename from manifests/crd/acceleratorprofiles.opendatahub.io.crd.yaml rename to manifests/common/crd/acceleratorprofiles.opendatahub.io.crd.yaml diff --git a/manifests/crd/kustomization.yaml b/manifests/common/crd/kustomization.yaml similarity index 100% rename from manifests/crd/kustomization.yaml rename to manifests/common/crd/kustomization.yaml diff --git a/manifests/crd/odhapplications.dashboard.opendatahub.io.crd.yaml b/manifests/common/crd/odhapplications.dashboard.opendatahub.io.crd.yaml similarity index 100% rename from manifests/crd/odhapplications.dashboard.opendatahub.io.crd.yaml rename to manifests/common/crd/odhapplications.dashboard.opendatahub.io.crd.yaml diff --git a/manifests/crd/odhdashboardconfigs.opendatahub.io.crd.yaml b/manifests/common/crd/odhdashboardconfigs.opendatahub.io.crd.yaml similarity index 100% rename from manifests/crd/odhdashboardconfigs.opendatahub.io.crd.yaml rename to manifests/common/crd/odhdashboardconfigs.opendatahub.io.crd.yaml diff --git a/manifests/crd/odhdocuments.dashboard.opendatahub.io.crd.yaml b/manifests/common/crd/odhdocuments.dashboard.opendatahub.io.crd.yaml similarity index 100% rename from manifests/crd/odhdocuments.dashboard.opendatahub.io.crd.yaml rename to manifests/common/crd/odhdocuments.dashboard.opendatahub.io.crd.yaml diff --git a/manifests/crd/odhquickstarts.console.openshift.io.crd.yaml b/manifests/common/crd/odhquickstarts.console.openshift.io.crd.yaml similarity index 100% rename from manifests/crd/odhquickstarts.console.openshift.io.crd.yaml rename to manifests/common/crd/odhquickstarts.console.openshift.io.crd.yaml diff --git a/manifests/common/kustomization.yaml b/manifests/common/kustomization.yaml new file mode 100644 index 0000000000..9e81d16519 --- /dev/null +++ b/manifests/common/kustomization.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +commonLabels: + app: odh-dashboard + app.kubernetes.io/part-of: odh-dashboard +resources: + - ./apps + - ./base + - ./consolelink + - ./crd diff --git a/manifests/odh/README.md b/manifests/odh/README.md new file mode 100644 index 0000000000..2885c8f9f9 --- /dev/null +++ b/manifests/odh/README.md @@ -0,0 +1,5 @@ +# ODH Manifests + +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. diff --git a/manifests/odh/kustomization.yaml b/manifests/odh/kustomization.yaml new file mode 100644 index 0000000000..ec0c01942f --- /dev/null +++ b/manifests/odh/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: + - ../common diff --git a/manifests/overlays/dev/kustomization.yaml b/manifests/overlays/dev/kustomization.yaml deleted file mode 100644 index b30866572f..0000000000 --- a/manifests/overlays/dev/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ../../base - - ../../crd - - ../../apps diff --git a/manifests/overlays/incubation/deployment.yaml b/manifests/overlays/incubation/deployment.yaml deleted file mode 100644 index 03e80c43c6..0000000000 --- a/manifests/overlays/incubation/deployment.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/template/spec/containers/0/image - value: quay.io/opendatahub/odh-dashboard:nightly \ No newline at end of file diff --git a/manifests/overlays/incubation/kustomization.yaml b/manifests/overlays/incubation/kustomization.yaml deleted file mode 100644 index d4569ff111..0000000000 --- a/manifests/overlays/incubation/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ../../base -patchesJson6902: - - path: deployment.yaml - target: - group: apps - version: v1 - kind: Deployment - name: odh-dashboard diff --git a/manifests/overlays/odhdashboardconfig/odh-dashboard-config.yaml b/manifests/overlays/odhdashboardconfig/odh-dashboard-config.yaml deleted file mode 100644 index 3e682d042e..0000000000 --- a/manifests/overlays/odhdashboardconfig/odh-dashboard-config.yaml +++ /dev/null @@ -1,88 +0,0 @@ -# ODHDashboardConfig to enable the notebook-controller feature and add notebook sizes -apiVersion: opendatahub.io/v1alpha -kind: OdhDashboardConfig -metadata: - creationTimestamp: null - name: odh-dashboard-config -spec: - dashboardConfig: - disableBYONImageStream: false - disableClusterManager: false - disableISVBadges: false - disableInfo: false - disableSupport: false - disableTracking: true - enablement: true - disableHome: true - disableProjects: true - disablePipelines: true - disablePipelineExperiments: true - disableS3Endpoint: true - disableModelServing: true - disableProjectSharing: true - disableCustomServingRuntimes: true - disableBiasMetrics: true - disablePerformanceMetrics: true - disableAcceleratorProfiles: true - disableKServe: false - disableKServeAuth: false - disableKServeMetrics: true - disableModelMesh: false - disableDistributedWorkloads: false - notebookController: - enabled: true - notebookSizes: - - name: Small - resources: - limits: - cpu: '2' - memory: 2Gi - requests: - cpu: '1' - memory: 1Gi - - name: Medium - resources: - limits: - cpu: '4' - memory: 4Gi - requests: - cpu: '2' - memory: 2Gi - - name: Large - resources: - limits: - cpu: '8' - memory: 8Gi - requests: - cpu: '4' - memory: 4Gi - modelServerSizes: - - name: Small - resources: - limits: - cpu: '2' - memory: 8Gi - requests: - cpu: '1' - memory: 4Gi - - name: Medium - resources: - limits: - cpu: '8' - memory: 10Gi - requests: - cpu: '4' - memory: 8Gi - - name: Large - resources: - limits: - cpu: '10' - memory: 20Gi - requests: - cpu: '6' - memory: 16Gi - groupsConfig: - adminGroups: 'odh-admins' - allowedGroups: 'system:authenticated' - templateOrder: [] - templateDisablement: [] diff --git a/manifests/overlays/odhdashboardconfig/odh-enabled-applications-config.configmap.yaml b/manifests/overlays/odhdashboardconfig/odh-enabled-applications-config.configmap.yaml deleted file mode 100644 index e772080481..0000000000 --- a/manifests/overlays/odhdashboardconfig/odh-enabled-applications-config.configmap.yaml +++ /dev/null @@ -1,6 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - name: odh-enabled-applications-config -data: - jupyter: 'true' diff --git a/manifests/overlays/performance/deployment.yaml b/manifests/overlays/performance/deployment.yaml deleted file mode 100644 index 07be32039e..0000000000 --- a/manifests/overlays/performance/deployment.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/replicas - value: 5 diff --git a/manifests/overlays/performance/kustomization.yaml b/manifests/overlays/performance/kustomization.yaml deleted file mode 100644 index d4569ff111..0000000000 --- a/manifests/overlays/performance/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ../../base -patchesJson6902: - - path: deployment.yaml - target: - group: apps - version: v1 - kind: Deployment - name: odh-dashboard diff --git a/manifests/rhoai/README.md b/manifests/rhoai/README.md new file mode 100644 index 0000000000..5434a18e96 --- /dev/null +++ b/manifests/rhoai/README.md @@ -0,0 +1,5 @@ +# 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. diff --git a/manifests/overlays/apps/apps-addon/kustomization.yaml b/manifests/rhoai/addon/apps/kustomization.yaml similarity index 94% rename from manifests/overlays/apps/apps-addon/kustomization.yaml rename to manifests/rhoai/addon/apps/kustomization.yaml index f7341d624d..16b3c29051 100644 --- a/manifests/overlays/apps/apps-addon/kustomization.yaml +++ b/manifests/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/manifests/overlays/apps/apps-addon/nvidia/gpu-enabled-notebook-quickstart.yaml b/manifests/rhoai/addon/apps/nvidia/gpu-enabled-notebook-quickstart.yaml similarity index 100% rename from manifests/overlays/apps/apps-addon/nvidia/gpu-enabled-notebook-quickstart.yaml rename to manifests/rhoai/addon/apps/nvidia/gpu-enabled-notebook-quickstart.yaml diff --git a/manifests/overlays/apps/apps-addon/nvidia/gpu-quickstart.yaml b/manifests/rhoai/addon/apps/nvidia/gpu-quickstart.yaml similarity index 100% rename from manifests/overlays/apps/apps-addon/nvidia/gpu-quickstart.yaml rename to manifests/rhoai/addon/apps/nvidia/gpu-quickstart.yaml diff --git a/manifests/overlays/apps/apps-addon/nvidia/kustomization.yaml b/manifests/rhoai/addon/apps/nvidia/kustomization.yaml similarity index 100% rename from manifests/overlays/apps/apps-addon/nvidia/kustomization.yaml rename to manifests/rhoai/addon/apps/nvidia/kustomization.yaml diff --git a/manifests/overlays/apps/apps-addon/nvidia/nvidia-app.yaml b/manifests/rhoai/addon/apps/nvidia/nvidia-app.yaml similarity index 100% rename from manifests/overlays/apps/apps-addon/nvidia/nvidia-app.yaml rename to manifests/rhoai/addon/apps/nvidia/nvidia-app.yaml diff --git a/manifests/overlays/apps/apps-addon/rhoam/deploy-model-rhoam-quickstart.yaml b/manifests/rhoai/addon/apps/rhoam/deploy-model-rhoam-quickstart.yaml similarity index 100% rename from manifests/overlays/apps/apps-addon/rhoam/deploy-model-rhoam-quickstart.yaml rename to manifests/rhoai/addon/apps/rhoam/deploy-model-rhoam-quickstart.yaml diff --git a/manifests/overlays/apps/apps-addon/rhoam/kustomization.yaml b/manifests/rhoai/addon/apps/rhoam/kustomization.yaml similarity index 100% rename from manifests/overlays/apps/apps-addon/rhoam/kustomization.yaml rename to manifests/rhoai/addon/apps/rhoam/kustomization.yaml diff --git a/manifests/overlays/apps/apps-addon/rhoam/rhoam-app.yaml b/manifests/rhoai/addon/apps/rhoam/rhoam-app.yaml similarity index 100% rename from manifests/overlays/apps/apps-addon/rhoam/rhoam-app.yaml rename to manifests/rhoai/addon/apps/rhoam/rhoam-app.yaml diff --git a/manifests/overlays/apps/apps-addon/starburst/kustomization.yaml b/manifests/rhoai/addon/apps/starburst/kustomization.yaml similarity index 100% rename from manifests/overlays/apps/apps-addon/starburst/kustomization.yaml rename to manifests/rhoai/addon/apps/starburst/kustomization.yaml diff --git a/manifests/overlays/apps/apps-addon/starburst/starburst-app.yaml b/manifests/rhoai/addon/apps/starburst/starburst-app.yaml similarity index 100% rename from manifests/overlays/apps/apps-addon/starburst/starburst-app.yaml rename to manifests/rhoai/addon/apps/starburst/starburst-app.yaml diff --git a/manifests/overlays/apps/apps-addon/starburst/starburst-galaxy-quickstart.yaml b/manifests/rhoai/addon/apps/starburst/starburst-galaxy-quickstart.yaml similarity index 100% rename from manifests/overlays/apps/apps-addon/starburst/starburst-galaxy-quickstart.yaml rename to manifests/rhoai/addon/apps/starburst/starburst-galaxy-quickstart.yaml diff --git a/manifests/rhoai/addon/kustomization.yaml b/manifests/rhoai/addon/kustomization.yaml new file mode 100644 index 0000000000..f4a567cfff --- /dev/null +++ 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/manifests/overlays/apps/apps-onprem/kustomization.yaml b/manifests/rhoai/onprem/apps/kustomization.yaml similarity index 93% rename from manifests/overlays/apps/apps-onprem/kustomization.yaml rename to manifests/rhoai/onprem/apps/kustomization.yaml index 951bd10ac1..cf8c19d151 100644 --- a/manifests/overlays/apps/apps-onprem/kustomization.yaml +++ b/manifests/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/manifests/overlays/apps/apps-onprem/starburst-enterprise/kustomization.yaml b/manifests/rhoai/onprem/apps/starburst-enterprise/kustomization.yaml similarity index 100% rename from manifests/overlays/apps/apps-onprem/starburst-enterprise/kustomization.yaml rename to manifests/rhoai/onprem/apps/starburst-enterprise/kustomization.yaml diff --git a/manifests/overlays/apps/apps-onprem/starburst-enterprise/query-starburstenterprise-quickstart.yaml b/manifests/rhoai/onprem/apps/starburst-enterprise/query-starburstenterprise-quickstart.yaml similarity index 100% rename from manifests/overlays/apps/apps-onprem/starburst-enterprise/query-starburstenterprise-quickstart.yaml rename to manifests/rhoai/onprem/apps/starburst-enterprise/query-starburstenterprise-quickstart.yaml diff --git a/manifests/overlays/apps/apps-onprem/starburst-enterprise/starburstenterprise-app.yaml b/manifests/rhoai/onprem/apps/starburst-enterprise/starburstenterprise-app.yaml similarity index 100% rename from manifests/overlays/apps/apps-onprem/starburst-enterprise/starburstenterprise-app.yaml rename to manifests/rhoai/onprem/apps/starburst-enterprise/starburstenterprise-app.yaml diff --git a/manifests/overlays/apps/apps-onprem/starburst-enterprise/starburstenterprise-docs.yaml b/manifests/rhoai/onprem/apps/starburst-enterprise/starburstenterprise-docs.yaml similarity index 100% rename from manifests/overlays/apps/apps-onprem/starburst-enterprise/starburstenterprise-docs.yaml rename to manifests/rhoai/onprem/apps/starburst-enterprise/starburstenterprise-docs.yaml diff --git a/manifests/rhoai/onprem/kustomization.yaml b/manifests/rhoai/onprem/kustomization.yaml new file mode 100644 index 0000000000..eae1c125e0 --- /dev/null +++ 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/manifests/overlays/apps/base/aikit/aikit-app.yaml b/manifests/rhoai/shared/apps/aikit/aikit-app.yaml similarity index 100% rename from manifests/overlays/apps/base/aikit/aikit-app.yaml rename to manifests/rhoai/shared/apps/aikit/aikit-app.yaml diff --git a/manifests/overlays/apps/base/aikit/kustomization.yaml b/manifests/rhoai/shared/apps/aikit/kustomization.yaml similarity index 100% rename from manifests/overlays/apps/base/aikit/kustomization.yaml rename to manifests/rhoai/shared/apps/aikit/kustomization.yaml diff --git a/manifests/overlays/apps/base/aikit/oneapi-aikit-notebook-quickstart.yaml b/manifests/rhoai/shared/apps/aikit/oneapi-aikit-notebook-quickstart.yaml similarity index 100% rename from manifests/overlays/apps/base/aikit/oneapi-aikit-notebook-quickstart.yaml rename to manifests/rhoai/shared/apps/aikit/oneapi-aikit-notebook-quickstart.yaml diff --git a/manifests/overlays/apps/base/anaconda-ce/anaconda-ce-app.yaml b/manifests/rhoai/shared/apps/anaconda-ce/anaconda-ce-app.yaml similarity index 100% rename from manifests/overlays/apps/base/anaconda-ce/anaconda-ce-app.yaml rename to manifests/rhoai/shared/apps/anaconda-ce/anaconda-ce-app.yaml diff --git a/manifests/overlays/apps/base/anaconda-ce/anaconda-ce-create-jupyter-notebook-quickstart.yaml b/manifests/rhoai/shared/apps/anaconda-ce/anaconda-ce-create-jupyter-notebook-quickstart.yaml similarity index 100% rename from manifests/overlays/apps/base/anaconda-ce/anaconda-ce-create-jupyter-notebook-quickstart.yaml rename to manifests/rhoai/shared/apps/anaconda-ce/anaconda-ce-create-jupyter-notebook-quickstart.yaml diff --git a/manifests/overlays/apps/base/anaconda-ce/anaconda-ce-docs.yaml b/manifests/rhoai/shared/apps/anaconda-ce/anaconda-ce-docs.yaml similarity index 100% rename from manifests/overlays/apps/base/anaconda-ce/anaconda-ce-docs.yaml rename to manifests/rhoai/shared/apps/anaconda-ce/anaconda-ce-docs.yaml diff --git a/manifests/overlays/apps/base/anaconda-ce/kustomization.yaml b/manifests/rhoai/shared/apps/anaconda-ce/kustomization.yaml similarity index 100% rename from manifests/overlays/apps/base/anaconda-ce/kustomization.yaml rename to manifests/rhoai/shared/apps/anaconda-ce/kustomization.yaml diff --git a/manifests/overlays/apps/base/elastic/elastic-app.yaml b/manifests/rhoai/shared/apps/elastic/elastic-app.yaml similarity index 100% rename from manifests/overlays/apps/base/elastic/elastic-app.yaml rename to manifests/rhoai/shared/apps/elastic/elastic-app.yaml diff --git a/manifests/overlays/apps/base/elastic/kustomization.yaml b/manifests/rhoai/shared/apps/elastic/kustomization.yaml similarity index 100% rename from manifests/overlays/apps/base/elastic/kustomization.yaml rename to manifests/rhoai/shared/apps/elastic/kustomization.yaml diff --git a/manifests/overlays/apps/base/kustomization.yaml b/manifests/rhoai/shared/apps/kustomization.yaml similarity index 93% rename from manifests/overlays/apps/base/kustomization.yaml rename to manifests/rhoai/shared/apps/kustomization.yaml index f10478327e..e3c7cdabee 100644 --- a/manifests/overlays/apps/base/kustomization.yaml +++ b/manifests/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/manifests/overlays/apps/base/openvino/kustomization.yaml b/manifests/rhoai/shared/apps/openvino/kustomization.yaml similarity index 100% rename from manifests/overlays/apps/base/openvino/kustomization.yaml rename to manifests/rhoai/shared/apps/openvino/kustomization.yaml diff --git a/manifests/overlays/apps/base/openvino/openvino-app.yaml b/manifests/rhoai/shared/apps/openvino/openvino-app.yaml similarity index 100% rename from manifests/overlays/apps/base/openvino/openvino-app.yaml rename to manifests/rhoai/shared/apps/openvino/openvino-app.yaml diff --git a/manifests/overlays/apps/base/openvino/openvino-docs.yaml b/manifests/rhoai/shared/apps/openvino/openvino-docs.yaml similarity index 100% rename from manifests/overlays/apps/base/openvino/openvino-docs.yaml rename to manifests/rhoai/shared/apps/openvino/openvino-docs.yaml diff --git a/manifests/overlays/apps/base/openvino/openvino-inference-notebook.yaml b/manifests/rhoai/shared/apps/openvino/openvino-inference-notebook.yaml similarity index 100% rename from manifests/overlays/apps/base/openvino/openvino-inference-notebook.yaml rename to manifests/rhoai/shared/apps/openvino/openvino-inference-notebook.yaml diff --git a/manifests/overlays/apps/base/pachyderm/kustomization.yaml b/manifests/rhoai/shared/apps/pachyderm/kustomization.yaml similarity index 100% rename from manifests/overlays/apps/base/pachyderm/kustomization.yaml rename to manifests/rhoai/shared/apps/pachyderm/kustomization.yaml diff --git a/manifests/overlays/apps/base/pachyderm/pachyderm-app.yaml b/manifests/rhoai/shared/apps/pachyderm/pachyderm-app.yaml similarity index 100% rename from manifests/overlays/apps/base/pachyderm/pachyderm-app.yaml rename to manifests/rhoai/shared/apps/pachyderm/pachyderm-app.yaml diff --git a/manifests/overlays/apps/base/pachyderm/pachyderm-beginner-tutorial-notebook.yaml b/manifests/rhoai/shared/apps/pachyderm/pachyderm-beginner-tutorial-notebook.yaml similarity index 100% rename from manifests/overlays/apps/base/pachyderm/pachyderm-beginner-tutorial-notebook.yaml rename to manifests/rhoai/shared/apps/pachyderm/pachyderm-beginner-tutorial-notebook.yaml diff --git a/manifests/overlays/apps/base/pachyderm/pachyderm-docs.yaml b/manifests/rhoai/shared/apps/pachyderm/pachyderm-docs.yaml similarity index 100% rename from manifests/overlays/apps/base/pachyderm/pachyderm-docs.yaml rename to manifests/rhoai/shared/apps/pachyderm/pachyderm-docs.yaml diff --git a/manifests/overlays/apps/base/rhoai/kustomization.yaml b/manifests/rhoai/shared/apps/rhoai/kustomization.yaml similarity index 100% rename from manifests/overlays/apps/base/rhoai/kustomization.yaml rename to manifests/rhoai/shared/apps/rhoai/kustomization.yaml diff --git a/manifests/overlays/apps/base/rhoai/rhoai-app.yaml b/manifests/rhoai/shared/apps/rhoai/rhoai-app.yaml similarity index 100% rename from manifests/overlays/apps/base/rhoai/rhoai-app.yaml rename to manifests/rhoai/shared/apps/rhoai/rhoai-app.yaml diff --git a/manifests/overlays/apps/base/rhoai/rhoai-docs.yaml b/manifests/rhoai/shared/apps/rhoai/rhoai-docs.yaml similarity index 100% rename from manifests/overlays/apps/base/rhoai/rhoai-docs.yaml rename to manifests/rhoai/shared/apps/rhoai/rhoai-docs.yaml diff --git a/manifests/overlays/apps/base/watson-x/kustomization.yaml b/manifests/rhoai/shared/apps/watson-x/kustomization.yaml similarity index 100% rename from manifests/overlays/apps/base/watson-x/kustomization.yaml rename to manifests/rhoai/shared/apps/watson-x/kustomization.yaml diff --git a/manifests/overlays/apps/base/watson-x/watson-x-app.yaml b/manifests/rhoai/shared/apps/watson-x/watson-x-app.yaml similarity index 100% rename from manifests/overlays/apps/base/watson-x/watson-x-app.yaml rename to manifests/rhoai/shared/apps/watson-x/watson-x-app.yaml diff --git a/manifests/overlays/apps/base/watson-x/watson-x-docs.yaml b/manifests/rhoai/shared/apps/watson-x/watson-x-docs.yaml similarity index 100% rename from manifests/overlays/apps/base/watson-x/watson-x-docs.yaml rename to manifests/rhoai/shared/apps/watson-x/watson-x-docs.yaml diff --git a/manifests/overlays/rhoai/anaconda-ce-validator-cron.yaml b/manifests/rhoai/shared/base/anaconda-ce-validator-cron.yaml similarity index 100% rename from manifests/overlays/rhoai/anaconda-ce-validator-cron.yaml rename to manifests/rhoai/shared/base/anaconda-ce-validator-cron.yaml diff --git a/manifests/overlays/rhoai/auth-delegator.clusterrolebinding.yaml b/manifests/rhoai/shared/base/auth-delegator.clusterrolebinding.yaml similarity index 100% rename from manifests/overlays/rhoai/auth-delegator.clusterrolebinding.yaml rename to manifests/rhoai/shared/base/auth-delegator.clusterrolebinding.yaml diff --git a/manifests/overlays/rhoai/cluster-monitoring-role-binding.yaml b/manifests/rhoai/shared/base/cluster-monitoring-role-binding.yaml similarity index 100% rename from manifests/overlays/rhoai/cluster-monitoring-role-binding.yaml rename to manifests/rhoai/shared/base/cluster-monitoring-role-binding.yaml diff --git a/manifests/overlays/rhoai/cluster-role-binding.yaml b/manifests/rhoai/shared/base/cluster-role-binding.yaml similarity index 100% rename from manifests/overlays/rhoai/cluster-role-binding.yaml rename to manifests/rhoai/shared/base/cluster-role-binding.yaml diff --git a/manifests/overlays/rhoai/cluster-role.yaml b/manifests/rhoai/shared/base/cluster-role.yaml similarity index 100% rename from manifests/overlays/rhoai/cluster-role.yaml rename to manifests/rhoai/shared/base/cluster-role.yaml diff --git a/manifests/overlays/rhoai/deployment.yaml b/manifests/rhoai/shared/base/deployment.yaml similarity index 100% rename from manifests/overlays/rhoai/deployment.yaml rename to manifests/rhoai/shared/base/deployment.yaml diff --git a/manifests/overlays/rhoai/kustomization.yaml b/manifests/rhoai/shared/base/kustomization.yaml similarity index 98% rename from manifests/overlays/rhoai/kustomization.yaml rename to manifests/rhoai/shared/base/kustomization.yaml index 494f3549fa..b9e7c52230 100644 --- a/manifests/overlays/rhoai/kustomization.yaml +++ b/manifests/rhoai/shared/base/kustomization.yaml @@ -4,7 +4,6 @@ commonLabels: app: rhods-dashboard app.kubernetes.io/part-of: rhods-dashboard resources: - - ../../base - anaconda-ce-validator-cron.yaml patchesJson6902: - path: service-account.yaml @@ -84,4 +83,4 @@ vars: fieldref: fieldpath: data.odh-dashboard-image configurations: -- params.yaml \ No newline at end of file +- params.yaml diff --git a/manifests/overlays/rhoai/oauth.secret.yaml b/manifests/rhoai/shared/base/oauth.secret.yaml similarity index 100% rename from manifests/overlays/rhoai/oauth.secret.yaml rename to manifests/rhoai/shared/base/oauth.secret.yaml diff --git a/manifests/overlays/rhoai/params.env b/manifests/rhoai/shared/base/params.env similarity index 100% rename from manifests/overlays/rhoai/params.env rename to manifests/rhoai/shared/base/params.env diff --git a/manifests/overlays/rhoai/params.yaml b/manifests/rhoai/shared/base/params.yaml similarity index 100% rename from manifests/overlays/rhoai/params.yaml rename to manifests/rhoai/shared/base/params.yaml diff --git a/manifests/overlays/rhoai/role-binding.yaml b/manifests/rhoai/shared/base/role-binding.yaml similarity index 100% rename from manifests/overlays/rhoai/role-binding.yaml rename to manifests/rhoai/shared/base/role-binding.yaml diff --git a/manifests/overlays/rhoai/role.yaml b/manifests/rhoai/shared/base/role.yaml similarity index 100% rename from manifests/overlays/rhoai/role.yaml rename to manifests/rhoai/shared/base/role.yaml diff --git a/manifests/overlays/rhoai/routes.yaml b/manifests/rhoai/shared/base/routes.yaml similarity index 100% rename from manifests/overlays/rhoai/routes.yaml rename to manifests/rhoai/shared/base/routes.yaml diff --git a/manifests/overlays/rhoai/service-account.yaml b/manifests/rhoai/shared/base/service-account.yaml similarity index 100% rename from manifests/overlays/rhoai/service-account.yaml rename to manifests/rhoai/shared/base/service-account.yaml diff --git a/manifests/overlays/rhoai/service.yaml b/manifests/rhoai/shared/base/service.yaml similarity index 100% rename from manifests/overlays/rhoai/service.yaml rename to manifests/rhoai/shared/base/service.yaml diff --git a/manifests/overlays/consolelink/consolelink.yaml b/manifests/rhoai/shared/consolelink/consolelink.yaml similarity index 100% rename from manifests/overlays/consolelink/consolelink.yaml rename to manifests/rhoai/shared/consolelink/consolelink.yaml diff --git a/manifests/overlays/consolelink/kustomization.yaml b/manifests/rhoai/shared/consolelink/kustomization.yaml similarity index 83% rename from manifests/overlays/consolelink/kustomization.yaml rename to manifests/rhoai/shared/consolelink/kustomization.yaml index 5c4539cd89..85cfcd7365 100644 --- a/manifests/overlays/consolelink/kustomization.yaml +++ b/manifests/rhoai/shared/consolelink/kustomization.yaml @@ -4,10 +4,10 @@ commonLabels: app: rhods-dashboard app.kubernetes.io/part-of: rhods-dashboard resources: - - ../../consolelink + - ../../../common/consolelink patchesJson6902: - path: consolelink.yaml target: version: v1 kind: ConsoleLink - name: odhlink \ No newline at end of file + name: odhlink diff --git a/manifests/rhoai/shared/kustomization.yaml b/manifests/rhoai/shared/kustomization.yaml new file mode 100644 index 0000000000..44c308901e --- /dev/null +++ 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/manifests/overlays/odhdashboardconfig/kustomization.yaml b/manifests/rhoai/shared/odhdashboardconfig/kustomization.yaml similarity index 100% rename from manifests/overlays/odhdashboardconfig/kustomization.yaml rename to manifests/rhoai/shared/odhdashboardconfig/kustomization.yaml diff --git a/manifests/overlays/odhdashboardconfig/odhdashboardconfig.yaml b/manifests/rhoai/shared/odhdashboardconfig/odhdashboardconfig.yaml similarity index 100% rename from manifests/overlays/odhdashboardconfig/odhdashboardconfig.yaml rename to manifests/rhoai/shared/odhdashboardconfig/odhdashboardconfig.yaml