Update usage of params

manifests/common/README.md

@@ -4,4 +4,4 @@ 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 [`../overrides`](../core-bases/README.md) folder for those that can be overridden
+> **Note:** See the [`../core-bases`](../core-bases/README.md) folder for those that can be overridden

manifests/odh/kustomization.yaml

@@ -5,5 +5,34 @@ commonLabels:
   app.kubernetes.io/part-of: odh-dashboard
 resources:
   - ../common
-  - ../overrides/base
-  - ../overrides/consolelink
+  - ../core-bases/base
+  - ../core-bases/consolelink
+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
+  - name: section-title
+    objref:
+      kind: ConfigMap
+      name: odh-dashboard-image-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.section-title
+  - name: dashboard-url
+    objref:
+      kind: ConfigMap
+      name: odh-dashboard-image-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.dashboard-url
+configurations:
+  - params.yaml

manifests/odh/params.env

@@ -1,5 +1,4 @@
 # 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

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

manifests/rhoai/README.md

@@ -1,3 +1,3 @@
 # RHOAI Manifests
 
-These manifests are only for RHOAI. Overrides can be performed on the manifest files in `../overrides`.
+These manifests are only for RHOAI. Overrides can be performed on the manifest files in [`../core-bases`](../core-bases/README.md).

manifests/rhoai/addon/kustomization.yaml

@@ -6,3 +6,39 @@ commonLabels:
 resources:
   - ../shared
   - ./apps
+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
+  - name: section-title
+    objref:
+      kind: ConfigMap
+      name: odh-dashboard-image-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.section-title
+  - name: dashboard-url
+    objref:
+      kind: ConfigMap
+      name: odh-dashboard-image-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.dashboard-url
+  - name: admin_groups
+    objref:
+      kind: ConfigMap
+      name: odh-dashboard-image-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.admin_groups
+configurations:
+  - params.yaml

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

manifests/rhoai/onprem/kustomization.yaml

@@ -6,3 +6,39 @@ commonLabels:
 resources:
   - ../shared
   - ./apps
+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
+  - name: section-title
+    objref:
+      kind: ConfigMap
+      name: odh-dashboard-image-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.section-title
+  - name: dashboard-url
+    objref:
+      kind: ConfigMap
+      name: odh-dashboard-image-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.dashboard-url
+  - name: admin_groups
+    objref:
+      kind: ConfigMap
+      name: odh-dashboard-image-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.admin_groups
+configurations:
+  - params.yaml

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

manifests/rhoai/shared/base/kustomization.yaml

@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../../overrides/base
+  - ../../../core-bases/base
   - anaconda-ce-validator-cron.yaml
 patchesJson6902:
   - path: service-account.yaml
@@ -67,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

manifests/rhoai/shared/consolelink/kustomization.yaml

@@ -4,7 +4,7 @@ commonLabels:
   app: rhods-dashboard
   app.kubernetes.io/part-of: rhods-dashboard
 resources:
-  - ../../../overrides/consolelink
+  - ../../../core-bases/consolelink
 patchesJson6902:
   - path: consolelink.yaml
     target: