From fd7c0333f12438fe8da9fadc5caf16af71c9aa7f Mon Sep 17 00:00:00 2001
From: mahdikhashan <mahdikhashan1@gmail.com>
Date: Thu, 13 Feb 2025 17:00:27 +0100
Subject: [PATCH] update kustomization

Signed-off-by: mahdikhashan <mahdikhashan1@gmail.com>
---
 config/base/kustomization.yaml              | 16 +++++---
 config/overlays/kubeflow/kustomization.yaml | 43 +++++++++++----------
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/config/base/kustomization.yaml b/config/base/kustomization.yaml
index 31c453a..59936f1 100644
--- a/config/base/kustomization.yaml
+++ b/config/base/kustomization.yaml
@@ -6,15 +6,19 @@ resources:
 
 namespace: kserve
 
-commonLabels:
-  kustomize.component: kserve-models-web-app
-  app.kubernetes.io/component: kserve-models-web-app
 
 images:
 - name: kserve/models-web-app
   newName: kserve/models-web-app
   newTag: v0.13.0
 configMapGenerator:
-  - name: kserve-models-web-app-config
-    literals:
-    - APP_DISABLE_AUTH="True"
+- literals:
+  - APP_DISABLE_AUTH="True"
+  name: kserve-models-web-app-config
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/component: kserve-models-web-app
+    kustomize.component: kserve-models-web-app
diff --git a/config/overlays/kubeflow/kustomization.yaml b/config/overlays/kubeflow/kustomization.yaml
index 18f0724..b2e828f 100644
--- a/config/overlays/kubeflow/kustomization.yaml
+++ b/config/overlays/kubeflow/kustomization.yaml
@@ -5,25 +5,9 @@ kind: Kustomization
 namespace: kubeflow
 
 # Labels to add to all resources and selectors.
-commonLabels:
-  app: kserve
-  app.kubernetes.io/name: kserve
 
-bases:
-- ../../base
-- web-app-authorization-policy.yaml
 
-patchesStrategicMerge:
-- patches/web-app-sidecar.yaml
 
-patchesJson6902:
-- target:
-    group: networking.istio.io
-    version: v1beta1
-    kind: VirtualService
-    name: kserve-models-web-app
-    namespace: kserve
-  path: patches/web-app-vsvc.yaml
 
 generatorOptions:
   disableNameSuffixHash: true
@@ -32,11 +16,28 @@ generatorOptions:
 # variabalize ingress gateway, webhook service name and
 # kserve namespace in webhook configurations
 configMapGenerator:
-  - name: kserve-models-web-app-config
-    behavior: replace
-    literals:
-    - USERID_HEADER=kubeflow-userid
-    - APP_PREFIX=/kserve-endpoints
+- behavior: replace
+  literals:
+  - USERID_HEADER=kubeflow-userid
+  - APP_PREFIX=/kserve-endpoints
+  name: kserve-models-web-app-config
 
 configurations:
 - params.yaml
+resources:
+- ../../base
+- web-app-authorization-policy.yaml
+labels:
+- includeSelectors: true
+  pairs:
+    app: kserve
+    app.kubernetes.io/name: kserve
+patches:
+- path: patches/web-app-vsvc.yaml
+  target:
+    group: networking.istio.io
+    kind: VirtualService
+    name: kserve-models-web-app
+    namespace: kserve
+    version: v1beta1
+- path: patches/web-app-sidecar.yaml