diff --git a/components/base/kustomization.yaml b/components/base/kustomization.yaml index b47e463be66..dedaa10c264 100644 --- 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 \ No newline at end of file diff --git a/components/notebook-controller/config/overlays/openshift/kustomization.yaml b/components/notebook-controller/config/overlays/openshift/kustomization.yaml index ddc1162ed69..5e8c54ae140 100644 --- 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 \ No newline at end of file diff --git a/components/odh-notebook-controller/config/base/kustomization.yaml b/components/odh-notebook-controller/config/base/kustomization.yaml index e45bd53c008..bd1eb6697ad 100644 --- 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 \ No newline at end of file diff --git a/components/base/params.env b/components/odh-notebook-controller/config/base/params.env similarity index 100% rename from components/base/params.env rename to components/odh-notebook-controller/config/base/params.env