patch the images only on the odh-notebook-controller

Signed-off-by: Harshad Reddy Nalla <[email protected]>
red-hat-data-services · Oct 25, 2023 · d088878 · d088878
1 parent 8e09748
commit d088878
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 22 deletions.
diff --git a/components/base/kustomization.yaml b/components/base/kustomization.yaml
@@ -4,25 +4,3 @@ kind: Kustomization
 bases:
   - ../notebook-controller/config/overlays/openshift
   - ../odh-notebook-controller/config/base
-
-configMapGenerator:
-- name: notebook-controller-image-parameters
-  env: params.env
-generatorOptions:
-  disableNameSuffixHash: true
-
-vars:
-- name: odh-kf-notebook-controller-image
-  objref:
-    kind: ConfigMap
-    name: notebook-controller-image-parameters
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.odh-kf-notebook-controller-image
-- name: odh-notebook-controller-image
-  objref:
-    kind: ConfigMap
-    name: notebook-controller-image-parameters
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.odh-notebook-controller-image
diff --git a/components/notebook-controller/config/overlays/openshift/kustomization.yaml b/components/notebook-controller/config/overlays/openshift/kustomization.yaml
@@ -22,3 +22,12 @@ patchesStrategicMerge:
   - remove_namespace_patch.yaml
   - manager_openshift_patch.yaml
   - manager_service_openshift_patch.yaml
+
+vars:
+- name: odh-kf-notebook-controller-image
+  objref:
+    kind: ConfigMap
+    name: notebook-controller-image-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.odh-kf-notebook-controller-image
diff --git a/components/odh-notebook-controller/config/base/kustomization.yaml b/components/odh-notebook-controller/config/base/kustomization.yaml
@@ -3,3 +3,25 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../default
+
+configMapGenerator:
+- name: notebook-controller-image-parameters
+  env: params.env
+generatorOptions:
+  disableNameSuffixHash: true
+
+vars:
+- name: odh-kf-notebook-controller-image
+  objref:
+    kind: ConfigMap
+    name: notebook-controller-image-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.odh-kf-notebook-controller-image
+- name: odh-notebook-controller-image
+  objref:
+    kind: ConfigMap
+    name: notebook-controller-image-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.odh-notebook-controller-image
diff --git a/components/base/params.env → ...otebook-controller/config/base/params.env b/components/base/params.env → ...otebook-controller/config/base/params.env