diff --git a/docs/architecture.md b/docs/architecture.md index 7f9df4b709..7f8aee5c68 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -1,4 +1,4 @@ -[Dashboard Deployment `containers`]: ../manifests/base/deployment.yaml +[Dashboard Deployment `containers`]: ../manifests/core-bases/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 947debb2f1..e78f3fc0ff 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/core-bases/base/cluster-role.yaml) to your user as we do with the service account [binding](../manifests/core-bases/base/cluster-role-binding.yaml). ```bash npm run start diff --git a/docs/release-steps.md b/docs/release-steps.md index 725d09fd74..09046efd62 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/core-bases/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 fef8ae3c45..67126d4a47 100644 --- a/manifests/README.md +++ b/manifests/README.md @@ -1,32 +1,59 @@ -# 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`](./odh)) +- Red Hat OpenShift AI + - RHOAI Managed ([`./rhoai/addon`](./rhoai/addon)) + - RHOAI Self Managed ([`./rhoai/onprem`](./rhoai/onprem)) -For more information, visit the project [GitHub repo](https://github.com/opendatahub-io/odh-dashboard). +Each deployment type will have a `params.env` file where the Operator can inject values for us to use. -### Folders -1. base: contains all the necessary yaml files to install the dashboard +## Adding/Modifying Manifests -##### Installation -Use the `kustomize` tool to process the manifest for the `oc apply` command. +Rules for keeping the manifest files in a sane order: +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 (ODH) + +You can use the `kustomize` tool to process the manifest for the `oc apply` command. + +```markdown +# Set the namespace in the manifest where you want to deploy the dashboard +kustomize edit set namespace +kustomize build common | oc apply -f - +kustomize build core-bases/base | oc apply -f - ``` -# 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 - -``` +Alternatively, you can use the `./install/deploy.sh` which uses the `overlays/dev` overlay to select specific folders. + +## 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 ``` -# 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 -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" + +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 new file mode 100644 index 0000000000..e63179d3c5 --- /dev/null +++ b/manifests/common/README.md @@ -0,0 +1,7 @@ +# Common Manifests + +These are manifests that are shared in both ODH & RHOAI deployments. + +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 [`../core-bases`](../core-bases/README.md) folder for those that can be overridden 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 71% rename from manifests/apps/jupyter/kustomization.yaml rename to manifests/common/apps/jupyter/kustomization.yaml index b316884b04..bd432cfd1c 100644 --- a/manifests/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/apps/kustomization.yaml b/manifests/common/apps/kustomization.yaml similarity index 53% rename from manifests/apps/kustomization.yaml rename to manifests/common/apps/kustomization.yaml index 0539650276..ddd7ba842e 100644 --- a/manifests/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/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 68% rename from manifests/crd/kustomization.yaml rename to manifests/common/crd/kustomization.yaml index 3d8497d804..ba8313ec34 100644 --- a/manifests/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/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..1ed46d1a44 --- /dev/null +++ b/manifests/common/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ./crd + - ./apps diff --git a/manifests/core-bases/README.md b/manifests/core-bases/README.md new file mode 100644 index 0000000000..65400eb175 --- /dev/null +++ b/manifests/core-bases/README.md @@ -0,0 +1,5 @@ +# Core-Bases Manifests + +These are manifest files that are intended to be used in part by other deployments and configured for their own use-cases. + +> **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/base/auth-delegator.clusterrolebinding.yaml b/manifests/core-bases/base/auth-delegator.clusterrolebinding.yaml similarity index 100% rename from manifests/base/auth-delegator.clusterrolebinding.yaml rename to manifests/core-bases/base/auth-delegator.clusterrolebinding.yaml diff --git a/manifests/base/cluster-monitoring-role-binding.yaml b/manifests/core-bases/base/cluster-monitoring-role-binding.yaml similarity index 100% rename from manifests/base/cluster-monitoring-role-binding.yaml rename to manifests/core-bases/base/cluster-monitoring-role-binding.yaml diff --git a/manifests/base/cluster-role-binding.yaml b/manifests/core-bases/base/cluster-role-binding.yaml similarity index 100% rename from manifests/base/cluster-role-binding.yaml rename to manifests/core-bases/base/cluster-role-binding.yaml diff --git a/manifests/base/cluster-role.yaml b/manifests/core-bases/base/cluster-role.yaml similarity index 100% rename from manifests/base/cluster-role.yaml rename to manifests/core-bases/base/cluster-role.yaml diff --git a/manifests/base/deployment.yaml b/manifests/core-bases/base/deployment.yaml similarity index 99% rename from manifests/base/deployment.yaml rename to manifests/core-bases/base/deployment.yaml index d17e034e3c..fb412def69 100644 --- a/manifests/base/deployment.yaml +++ b/manifests/core-bases/base/deployment.yaml @@ -27,7 +27,7 @@ spec: serviceAccount: odh-dashboard containers: - name: odh-dashboard - image: odh-dashboard + image: $(odh-dashboard-image) imagePullPolicy: Always ports: - containerPort: 8080 diff --git a/manifests/base/fetch-accelerators.rbac.yaml b/manifests/core-bases/base/fetch-accelerators.rbac.yaml similarity index 100% rename from manifests/base/fetch-accelerators.rbac.yaml rename to manifests/core-bases/base/fetch-accelerators.rbac.yaml diff --git a/manifests/base/fetch-builds-and-images.rbac.yaml b/manifests/core-bases/base/fetch-builds-and-images.rbac.yaml similarity index 100% rename from manifests/base/fetch-builds-and-images.rbac.yaml rename to manifests/core-bases/base/fetch-builds-and-images.rbac.yaml diff --git a/manifests/base/image-puller.clusterrolebinding.yaml b/manifests/core-bases/base/image-puller.clusterrolebinding.yaml similarity index 100% rename from manifests/base/image-puller.clusterrolebinding.yaml rename to manifests/core-bases/base/image-puller.clusterrolebinding.yaml diff --git a/manifests/base/kustomization.yaml b/manifests/core-bases/base/kustomization.yaml similarity index 80% rename from manifests/base/kustomization.yaml rename to manifests/core-bases/base/kustomization.yaml index 52e4f1a016..72ab64eaf1 100644 --- a/manifests/base/kustomization.yaml +++ b/manifests/core-bases/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 @@ -21,9 +18,6 @@ resources: - model-serving-role-binding.yaml - fetch-accelerators.rbac.yaml images: - - name: odh-dashboard - newName: quay.io/opendatahub/odh-dashboard - newTag: main - name: oauth-proxy newName: registry.redhat.io/openshift4/ose-oauth-proxy digest: sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33 diff --git a/manifests/base/model-serving-role-binding.yaml b/manifests/core-bases/base/model-serving-role-binding.yaml similarity index 100% rename from manifests/base/model-serving-role-binding.yaml rename to manifests/core-bases/base/model-serving-role-binding.yaml diff --git a/manifests/base/model-serving-role.yaml b/manifests/core-bases/base/model-serving-role.yaml similarity index 100% rename from manifests/base/model-serving-role.yaml rename to manifests/core-bases/base/model-serving-role.yaml diff --git a/manifests/base/oauth.secret.yaml b/manifests/core-bases/base/oauth.secret.yaml similarity index 100% rename from manifests/base/oauth.secret.yaml rename to manifests/core-bases/base/oauth.secret.yaml diff --git a/manifests/base/role-binding.yaml b/manifests/core-bases/base/role-binding.yaml similarity index 100% rename from manifests/base/role-binding.yaml rename to manifests/core-bases/base/role-binding.yaml diff --git a/manifests/base/role.yaml b/manifests/core-bases/base/role.yaml similarity index 100% rename from manifests/base/role.yaml rename to manifests/core-bases/base/role.yaml diff --git a/manifests/base/routes.yaml b/manifests/core-bases/base/routes.yaml similarity index 100% rename from manifests/base/routes.yaml rename to manifests/core-bases/base/routes.yaml diff --git a/manifests/base/service-account.yaml b/manifests/core-bases/base/service-account.yaml similarity index 100% rename from manifests/base/service-account.yaml rename to manifests/core-bases/base/service-account.yaml diff --git a/manifests/base/service.yaml b/manifests/core-bases/base/service.yaml similarity index 100% rename from manifests/base/service.yaml rename to manifests/core-bases/base/service.yaml diff --git a/manifests/consolelink/consolelink.yaml b/manifests/core-bases/consolelink/consolelink.yaml similarity index 99% rename from manifests/consolelink/consolelink.yaml rename to manifests/core-bases/consolelink/consolelink.yaml index 9d14a41c5e..4da5230646 100644 --- a/manifests/consolelink/consolelink.yaml +++ b/manifests/core-bases/consolelink/consolelink.yaml @@ -4,8 +4,8 @@ metadata: name: odhlink spec: applicationMenu: - section: + section: $(section-title) imageURL: data:image/png;base64,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 - href: + href: $(dashboard-url) location: ApplicationMenu text: Open Data Hub diff --git a/manifests/consolelink/kustomization.yaml b/manifests/core-bases/consolelink/kustomization.yaml similarity index 100% rename from manifests/consolelink/kustomization.yaml rename to manifests/core-bases/consolelink/kustomization.yaml diff --git a/manifests/odh/README.md b/manifests/odh/README.md new file mode 100644 index 0000000000..37dd833c60 --- /dev/null +++ b/manifests/odh/README.md @@ -0,0 +1,3 @@ +# ODH Deployment + +This is the starting location for ODH manifests. diff --git a/manifests/odh/kustomization.yaml b/manifests/odh/kustomization.yaml new file mode 100644 index 0000000000..5ca04d83c3 --- /dev/null +++ b/manifests/odh/kustomization.yaml @@ -0,0 +1,38 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +commonLabels: + app: odh-dashboard + app.kubernetes.io/part-of: odh-dashboard +resources: + - ../common + - ../core-bases/base + - ../core-bases/consolelink +configMapGenerator: + - name: odh-dashboard-params + env: params.env +generatorOptions: + disableNameSuffixHash: true +vars: + - name: odh-dashboard-image + objref: + kind: ConfigMap + name: odh-dashboard-params + apiVersion: v1 + fieldref: + fieldpath: data.odh-dashboard-image + - name: section-title + objref: + kind: ConfigMap + name: odh-dashboard-params + apiVersion: v1 + fieldref: + fieldpath: data.section-title + - name: dashboard-url + objref: + kind: ConfigMap + name: odh-dashboard-params + apiVersion: v1 + fieldref: + fieldpath: data.dashboard-url +configurations: + - params.yaml diff --git a/manifests/odh/params.env b/manifests/odh/params.env new file mode 100644 index 0000000000..f23189c35c --- /dev/null +++ b/manifests/odh/params.env @@ -0,0 +1,4 @@ +# Injected variables from the Operator +odh-dashboard-image=quay.io/opendatahub/odh-dashboard:main +dashboard-url=https://www.redhat.com +section-title=Open Data Hub diff --git a/manifests/odh/params.yaml b/manifests/odh/params.yaml new file mode 100644 index 0000000000..9ac33366ae --- /dev/null +++ b/manifests/odh/params.yaml @@ -0,0 +1,7 @@ +varReference: +- path: spec/template/spec/containers/image + kind: Deployment +- path: spec/applicationMenu/section + kind: ConsoleLink +- path: spec/href + kind: ConsoleLink diff --git a/manifests/overlays/README.md b/manifests/overlays/README.md new file mode 100644 index 0000000000..97feec9980 --- /dev/null +++ b/manifests/overlays/README.md @@ -0,0 +1,7 @@ +# Overlay Manifests + +These are shared modifications to existing deployments. These set of folders are to be considered for custom deployments or modifications to existing deployments to suit adhoc and non-operator default deployments. + +> **Note:** Consider making overlays inside each deployment if your overlay is non-generic. + +Each overlay should come with a readme to help with the use-case for it. diff --git a/manifests/overlays/dev/README.md b/manifests/overlays/dev/README.md new file mode 100644 index 0000000000..12c1d0ce3b --- /dev/null +++ b/manifests/overlays/dev/README.md @@ -0,0 +1,3 @@ +# Dev Overlay + +Allows for custom direct deployments of the min-viable resources. Used by the custom deployment install without the operator. diff --git a/manifests/overlays/dev/kustomization.yaml b/manifests/overlays/dev/kustomization.yaml index b30866572f..4c5a4150be 100644 --- a/manifests/overlays/dev/kustomization.yaml +++ b/manifests/overlays/dev/kustomization.yaml @@ -1,6 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../base - - ../../crd - - ../../apps + - ../common/crd + - ../core-bases/base + - ../common/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/overlays/rhoai/params.env b/manifests/overlays/rhoai/params.env deleted file mode 100644 index ce1596f876..0000000000 --- a/manifests/overlays/rhoai/params.env +++ /dev/null @@ -1,2 +0,0 @@ -# This will be overridden through the Operator as needed to inject the dashboard image as a variable to be used in the manifests (look for references of this variable) -odh-dashboard-image=quay.io/opendatahub/odh-dashboard:main \ No newline at end of file diff --git a/manifests/overlays/rhoai/params.yaml b/manifests/overlays/rhoai/params.yaml deleted file mode 100644 index 3d38939728..0000000000 --- a/manifests/overlays/rhoai/params.yaml +++ /dev/null @@ -1,3 +0,0 @@ -varReference: -- path: spec/template/spec/containers/image - kind: Deployment diff --git a/manifests/rhoai/README.md b/manifests/rhoai/README.md new file mode 100644 index 0000000000..9945e8cb76 --- /dev/null +++ b/manifests/rhoai/README.md @@ -0,0 +1,3 @@ +# RHOAI Manifests + +These manifests are only for RHOAI. Overrides can be performed on the manifest files in [`../core-bases`](../core-bases/README.md). 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/overlays/apps/apps-addon/kustomization.yaml b/manifests/rhoai/addon/apps/kustomization.yaml similarity index 56% rename from manifests/overlays/apps/apps-addon/kustomization.yaml rename to manifests/rhoai/addon/apps/kustomization.yaml index f7341d624d..49582fd4da 100644 --- a/manifests/overlays/apps/apps-addon/kustomization.yaml +++ b/manifests/rhoai/addon/apps/kustomization.yaml @@ -1,10 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -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 66% rename from manifests/overlays/apps/apps-addon/nvidia/kustomization.yaml rename to manifests/rhoai/addon/apps/nvidia/kustomization.yaml index 736243866e..24138ad818 100644 --- a/manifests/overlays/apps/apps-addon/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/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 62% rename from manifests/overlays/apps/apps-addon/rhoam/kustomization.yaml rename to manifests/rhoai/addon/apps/rhoam/kustomization.yaml index 2e885aecde..542fad61c9 100644 --- a/manifests/overlays/apps/apps-addon/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/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 62% rename from manifests/overlays/apps/apps-addon/starburst/kustomization.yaml rename to manifests/rhoai/addon/apps/starburst/kustomization.yaml index 74986913b9..534c89db72 100644 --- a/manifests/overlays/apps/apps-addon/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/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..fe3e9b6512 --- /dev/null +++ b/manifests/rhoai/addon/kustomization.yaml @@ -0,0 +1,44 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +commonLabels: + app: rhods-dashboard + app.kubernetes.io/part-of: rhods-dashboard +resources: + - ../shared + - ./apps +configMapGenerator: + - name: rhoai-dashboard-params + env: params.env +generatorOptions: + disableNameSuffixHash: true +vars: + - name: odh-dashboard-image + objref: + kind: ConfigMap + name: rhoai-dashboard-params + apiVersion: v1 + fieldref: + fieldpath: data.odh-dashboard-image + - name: section-title + objref: + kind: ConfigMap + name: rhoai-dashboard-params + apiVersion: v1 + fieldref: + fieldpath: data.section-title + - name: dashboard-url + objref: + kind: ConfigMap + name: rhoai-dashboard-params + apiVersion: v1 + fieldref: + fieldpath: data.dashboard-url + - name: admin_groups + objref: + kind: ConfigMap + name: rhoai-dashboard-params + apiVersion: v1 + fieldref: + fieldpath: data.admin_groups +configurations: + - params.yaml diff --git a/manifests/rhoai/addon/params.env b/manifests/rhoai/addon/params.env new file mode 100644 index 0000000000..096b8b4d0f --- /dev/null +++ b/manifests/rhoai/addon/params.env @@ -0,0 +1,5 @@ +# Injected variables from the Operator +odh-dashboard-image=quay.io/opendatahub/odh-dashboard:main +admin_groups=rhods-admins +dashboard-url=https://www.redhat.com +section-title=OpenShift AI diff --git a/manifests/rhoai/addon/params.yaml b/manifests/rhoai/addon/params.yaml new file mode 100644 index 0000000000..b3b7852c71 --- /dev/null +++ b/manifests/rhoai/addon/params.yaml @@ -0,0 +1,9 @@ +varReference: + - path: spec/template/spec/containers/image + kind: Deployment + - path: spec/applicationMenu/section + kind: ConsoleLink + - path: spec/href + kind: ConsoleLink + - path: spec/groupsConfig/adminGroups + kind: OdhDashboardConfig 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/overlays/apps/apps-onprem/kustomization.yaml b/manifests/rhoai/onprem/apps/kustomization.yaml similarity index 53% rename from manifests/overlays/apps/apps-onprem/kustomization.yaml rename to manifests/rhoai/onprem/apps/kustomization.yaml index 951bd10ac1..7b7fd5939f 100644 --- a/manifests/overlays/apps/apps-onprem/kustomization.yaml +++ b/manifests/rhoai/onprem/apps/kustomization.yaml @@ -1,8 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -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 70% rename from manifests/overlays/apps/apps-onprem/starburst-enterprise/kustomization.yaml rename to manifests/rhoai/onprem/apps/starburst-enterprise/kustomization.yaml index 93d5ffc53f..14e3a63209 100644 --- a/manifests/overlays/apps/apps-onprem/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/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..fe3e9b6512 --- /dev/null +++ b/manifests/rhoai/onprem/kustomization.yaml @@ -0,0 +1,44 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +commonLabels: + app: rhods-dashboard + app.kubernetes.io/part-of: rhods-dashboard +resources: + - ../shared + - ./apps +configMapGenerator: + - name: rhoai-dashboard-params + env: params.env +generatorOptions: + disableNameSuffixHash: true +vars: + - name: odh-dashboard-image + objref: + kind: ConfigMap + name: rhoai-dashboard-params + apiVersion: v1 + fieldref: + fieldpath: data.odh-dashboard-image + - name: section-title + objref: + kind: ConfigMap + name: rhoai-dashboard-params + apiVersion: v1 + fieldref: + fieldpath: data.section-title + - name: dashboard-url + objref: + kind: ConfigMap + name: rhoai-dashboard-params + apiVersion: v1 + fieldref: + fieldpath: data.dashboard-url + - name: admin_groups + objref: + kind: ConfigMap + name: rhoai-dashboard-params + apiVersion: v1 + fieldref: + fieldpath: data.admin_groups +configurations: + - params.yaml diff --git a/manifests/rhoai/onprem/params.env b/manifests/rhoai/onprem/params.env new file mode 100644 index 0000000000..096b8b4d0f --- /dev/null +++ b/manifests/rhoai/onprem/params.env @@ -0,0 +1,5 @@ +# Injected variables from the Operator +odh-dashboard-image=quay.io/opendatahub/odh-dashboard:main +admin_groups=rhods-admins +dashboard-url=https://www.redhat.com +section-title=OpenShift AI diff --git a/manifests/rhoai/onprem/params.yaml b/manifests/rhoai/onprem/params.yaml new file mode 100644 index 0000000000..b3b7852c71 --- /dev/null +++ b/manifests/rhoai/onprem/params.yaml @@ -0,0 +1,9 @@ +varReference: + - path: spec/template/spec/containers/image + kind: Deployment + - path: spec/applicationMenu/section + kind: ConsoleLink + - path: spec/href + kind: ConsoleLink + - path: spec/groupsConfig/adminGroups + kind: OdhDashboardConfig 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/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 62% rename from manifests/overlays/apps/base/aikit/kustomization.yaml rename to manifests/rhoai/shared/apps/aikit/kustomization.yaml index d2ed5d7632..2aa3393b07 100644 --- a/manifests/overlays/apps/base/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/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 69% rename from manifests/overlays/apps/base/anaconda-ce/kustomization.yaml rename to manifests/rhoai/shared/apps/anaconda-ce/kustomization.yaml index d756d7b4a4..ea8f8062a9 100644 --- a/manifests/overlays/apps/base/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/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 54% rename from manifests/overlays/apps/base/elastic/kustomization.yaml rename to manifests/rhoai/shared/apps/elastic/kustomization.yaml index 5b1d520879..77c72de0a4 100644 --- a/manifests/overlays/apps/base/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/overlays/apps/base/kustomization.yaml b/manifests/rhoai/shared/apps/kustomization.yaml similarity index 64% rename from manifests/overlays/apps/base/kustomization.yaml rename to manifests/rhoai/shared/apps/kustomization.yaml index f10478327e..a783c6d066 100644 --- a/manifests/overlays/apps/base/kustomization.yaml +++ b/manifests/rhoai/shared/apps/kustomization.yaml @@ -1,10 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -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 65% rename from manifests/overlays/apps/base/openvino/kustomization.yaml rename to manifests/rhoai/shared/apps/openvino/kustomization.yaml index 2aac1b3fe4..fe1e16c964 100644 --- a/manifests/overlays/apps/base/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/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 67% rename from manifests/overlays/apps/base/pachyderm/kustomization.yaml rename to manifests/rhoai/shared/apps/pachyderm/kustomization.yaml index 5a641e275f..a8fb3af6c5 100644 --- a/manifests/overlays/apps/base/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/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 59% rename from manifests/overlays/apps/base/rhoai/kustomization.yaml rename to manifests/rhoai/shared/apps/rhoai/kustomization.yaml index 09ea374288..dfd185c81e 100644 --- a/manifests/overlays/apps/base/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/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 59% rename from manifests/overlays/apps/base/watson-x/kustomization.yaml rename to manifests/rhoai/shared/apps/watson-x/kustomization.yaml index cebc5ea8f0..d33ee262b8 100644 --- a/manifests/overlays/apps/base/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/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 84% rename from manifests/overlays/rhoai/deployment.yaml rename to manifests/rhoai/shared/base/deployment.yaml index 5ea7548a45..dfcf729954 100644 --- a/manifests/overlays/rhoai/deployment.yaml +++ b/manifests/rhoai/shared/base/deployment.yaml @@ -16,13 +16,11 @@ - op: replace path: /spec/template/spec/containers/0/name value: rhods-dashboard -- op: replace - path: /spec/template/spec/containers/0/image - value: $(odh-dashboard-image) + # The image value is already an env - op: replace path: /spec/template/spec/serviceAccount value: rhods-dashboard - op: replace path: /spec/template/spec/imagePullSecrets value: - - name: addon-managed-odh-pullsecret \ No newline at end of file + - name: addon-managed-odh-pullsecret diff --git a/manifests/overlays/rhoai/kustomization.yaml b/manifests/rhoai/shared/base/kustomization.yaml similarity index 79% rename from manifests/overlays/rhoai/kustomization.yaml rename to manifests/rhoai/shared/base/kustomization.yaml index 494f3549fa..73dbb3a979 100644 --- a/manifests/overlays/rhoai/kustomization.yaml +++ b/manifests/rhoai/shared/base/kustomization.yaml @@ -1,10 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: rhods-dashboard - app.kubernetes.io/part-of: rhods-dashboard resources: - - ../../base + - ../../../core-bases/base - anaconda-ce-validator-cron.yaml patchesJson6902: - path: service-account.yaml @@ -70,18 +67,3 @@ patchesJson6902: version: v1 kind: Route name: odh-dashboard -configMapGenerator: -- name: odh-dashboard-image-parameters - env: params.env -generatorOptions: - disableNameSuffixHash: true -vars: -- name: odh-dashboard-image - objref: - kind: ConfigMap - name: odh-dashboard-image-parameters - apiVersion: v1 - fieldref: - fieldpath: data.odh-dashboard-image -configurations: -- params.yaml \ No newline at end of file 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/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 98% rename from manifests/overlays/consolelink/consolelink.yaml rename to manifests/rhoai/shared/consolelink/consolelink.yaml index 274c3f6114..289a3943d6 100644 --- a/manifests/overlays/consolelink/consolelink.yaml +++ b/manifests/rhoai/shared/consolelink/consolelink.yaml @@ -9,7 +9,7 @@ value: Red Hat OpenShift AI - op: replace path: /spec/applicationMenu/section - value: + value: $(section-title) - op: replace path: /spec/href - value: + value: $(dashboard-url) diff --git a/manifests/overlays/consolelink/kustomization.yaml b/manifests/rhoai/shared/consolelink/kustomization.yaml similarity index 73% rename from manifests/overlays/consolelink/kustomization.yaml rename to manifests/rhoai/shared/consolelink/kustomization.yaml index 5c4539cd89..9af691e5e3 100644 --- a/manifests/overlays/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: - - ../../consolelink + - ../../../core-bases/consolelink patchesJson6902: - path: consolelink.yaml target: + group: console.openshift.io 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..d22a15bb89 --- /dev/null +++ b/manifests/rhoai/shared/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +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 98% rename from manifests/overlays/odhdashboardconfig/odhdashboardconfig.yaml rename to manifests/rhoai/shared/odhdashboardconfig/odhdashboardconfig.yaml index 4b6bc94ba9..10991bff9c 100644 --- a/manifests/overlays/odhdashboardconfig/odhdashboardconfig.yaml +++ b/manifests/rhoai/shared/odhdashboardconfig/odhdashboardconfig.yaml @@ -29,7 +29,7 @@ spec: disableDistributedWorkloads: false disableModelRegistry: true groupsConfig: - adminGroups: "" + adminGroups: "$(admin_groups)" allowedGroups: "system:authenticated" notebookController: enabled: true