diff --git a/manifests/README.md b/manifests/README.md index a7ee0c3d75..532d627542 100644 --- a/manifests/README.md +++ b/manifests/README.md @@ -7,6 +7,8 @@ The Dashboard manifests run on Kustomize. There are 3 types of deployments for t - RHOAI Managed ([`./rhoai/addon`](./rhoai/addon)) - RHOAI Self Managed ([`./rhoai/onprem`](./rhoai/onprem)) +Each deployment type will have a `params.env` file where the Operator can inject values for us to use. + ## Adding/Modifying Manifests Rules for keeping the manifest files in a sane order: diff --git a/manifests/odh/params.env b/manifests/odh/params.env new file mode 100644 index 0000000000..6db368c5ac --- /dev/null +++ b/manifests/odh/params.env @@ -0,0 +1,5 @@ +# Injected variables from the Operator +odh-dashboard-image=quay.io/opendatahub/odh-dashboard:main +admin_groups=odh-admins +dashboard-url=https://www.redhat.com +section-title=Open Data Hub diff --git a/manifests/overrides/base/deployment.yaml b/manifests/overrides/base/deployment.yaml index d17e034e3c..fb412def69 100644 --- a/manifests/overrides/base/deployment.yaml +++ b/manifests/overrides/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/overrides/base/kustomization.yaml b/manifests/overrides/base/kustomization.yaml index 0ad1b6d0e4..72ab64eaf1 100644 --- a/manifests/overrides/base/kustomization.yaml +++ b/manifests/overrides/base/kustomization.yaml @@ -18,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/overrides/consolelink/consolelink.yaml b/manifests/overrides/consolelink/consolelink.yaml index 9d14a41c5e..4da5230646 100644 --- a/manifests/overrides/consolelink/consolelink.yaml +++ b/manifests/overrides/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/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/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/shared/base/deployment.yaml b/manifests/rhoai/shared/base/deployment.yaml index 5ea7548a45..dfcf729954 100644 --- a/manifests/rhoai/shared/base/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/rhoai/shared/base/params.env b/manifests/rhoai/shared/base/params.env deleted file mode 100644 index ce1596f876..0000000000 --- a/manifests/rhoai/shared/base/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/rhoai/shared/consolelink/consolelink.yaml b/manifests/rhoai/shared/consolelink/consolelink.yaml index 274c3f6114..289a3943d6 100644 --- a/manifests/rhoai/shared/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/rhoai/shared/odhdashboardconfig/odhdashboardconfig.yaml b/manifests/rhoai/shared/odhdashboardconfig/odhdashboardconfig.yaml index 4b6bc94ba9..10991bff9c 100644 --- a/manifests/rhoai/shared/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