From 08616ca77c133517c33f72774fcbcd1421c948c7 Mon Sep 17 00:00:00 2001
From: atheo89 <atheodorak@outlook.com>
Date: Thu, 4 Jul 2024 13:27:44 +0200
Subject: [PATCH] Update kustomization to use params env and yml on kfnc and
 odh-kfnc

---
 .../overlays/openshift/kustomization.yaml     | 18 ++++++++++++++----
 .../config/overlays/openshift/params.env      |  1 +
 .../config/overlays/openshift/params.yaml     |  3 +++
 .../config/base/kustomization.yaml            | 19 +++++++++++++++----
 .../config/base/params.env                    |  1 +
 5 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 components/notebook-controller/config/overlays/openshift/params.env
 create mode 100644 components/notebook-controller/config/overlays/openshift/params.yaml
 create mode 100644 components/odh-notebook-controller/config/base/params.env

diff --git a/components/notebook-controller/config/overlays/openshift/kustomization.yaml b/components/notebook-controller/config/overlays/openshift/kustomization.yaml
index 244fd0528f3..e3bde1e9db8 100644
--- a/components/notebook-controller/config/overlays/openshift/kustomization.yaml
+++ b/components/notebook-controller/config/overlays/openshift/kustomization.yaml
@@ -8,17 +8,27 @@ commonLabels:
   app.kubernetes.io/part-of: odh-notebook-controller
   component.opendatahub.io/name: kf-notebook-controller
   opendatahub.io/component: "true"
-images:
-  - name: docker.io/kubeflownotebookswg/notebook-controller
-    newName: quay.io/opendatahub/kubeflow-notebook-controller
-    newTag: 1.7-35b81f5
+configurations:
+  - params.yaml
 configMapGenerator:
+  - name: kf-notebook-controller-image-parameters
+    env: params.env
   - name: config
     behavior: merge
     literals:
       - USE_ISTIO=false
       - ADD_FSGROUP=false
+generatorOptions:
+  disableNameSuffixHash: true
 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: kf-notebook-controller-image-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.odh-kf-notebook-controller-image
diff --git a/components/notebook-controller/config/overlays/openshift/params.env b/components/notebook-controller/config/overlays/openshift/params.env
new file mode 100644
index 00000000000..199b0ff7f65
--- /dev/null
+++ b/components/notebook-controller/config/overlays/openshift/params.env
@@ -0,0 +1 @@
+odh-kf-notebook-controller-image=quay.io/opendatahub/kubeflow-notebook-controller:1.7-35b81f5
diff --git a/components/notebook-controller/config/overlays/openshift/params.yaml b/components/notebook-controller/config/overlays/openshift/params.yaml
new file mode 100644
index 00000000000..3d389397289
--- /dev/null
+++ b/components/notebook-controller/config/overlays/openshift/params.yaml
@@ -0,0 +1,3 @@
+varReference:
+- path: spec/template/spec/containers/image
+  kind: Deployment
diff --git a/components/odh-notebook-controller/config/base/kustomization.yaml b/components/odh-notebook-controller/config/base/kustomization.yaml
index fdae9c19a6e..936b747ad6c 100644
--- a/components/odh-notebook-controller/config/base/kustomization.yaml
+++ b/components/odh-notebook-controller/config/base/kustomization.yaml
@@ -3,7 +3,18 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../default
-images:
-  - name: quay.io/opendatahub/odh-notebook-controller
-    newName: quay.io/opendatahub/odh-notebook-controller
-    newTag: 1.7-35b81f5
+
+configMapGenerator:
+- name: odh-notebook-controller-image-parameters
+  env: params.env
+generatorOptions:
+  disableNameSuffixHash: true
+
+vars:
+- name: odh-notebook-controller-image
+  objref:
+    kind: ConfigMap
+    name: odh-notebook-controller-image-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.odh-notebook-controller-image
diff --git a/components/odh-notebook-controller/config/base/params.env b/components/odh-notebook-controller/config/base/params.env
new file mode 100644
index 00000000000..93f93063b15
--- /dev/null
+++ b/components/odh-notebook-controller/config/base/params.env
@@ -0,0 +1 @@
+odh-notebook-controller-image=quay.io/opendatahub/odh-notebook-controller:1.7-35b81f5