From e40383333000ffe0c67ced2fb992a739d7e7c3ed Mon Sep 17 00:00:00 2001
From: Aleksey Karpov <86011874+alekseyolg@users.noreply.github.com>
Date: Sun, 24 Dec 2023 20:43:18 +0300
Subject: [PATCH 1/2] Fixes user-namespace for kustomize 5

---
 common/user-namespace/base/kustomization.yaml | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/common/user-namespace/base/kustomization.yaml b/common/user-namespace/base/kustomization.yaml
index ebf7180b35..a77e6bba95 100644
--- a/common/user-namespace/base/kustomization.yaml
+++ b/common/user-namespace/base/kustomization.yaml
@@ -5,25 +5,37 @@ kind: Kustomization
 resources:
 - profile-instance.yaml
 configMapGenerator:
-- name: default-install-config
-  envs:
+- envs:
   - params.env
-vars:
+  name: default-install-config
 # These vars are used for substituing in the parameters from the config map
 # into the Profiles custom resource.
-- name: user
-  objref:
+configurations:
+- params.yaml
+replacements:
+- source:
+    fieldPath: data.user
     kind: ConfigMap
     name: default-install-config
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.user
-- name: profile-name
-  objref:
+    version: v1
+  targets:
+  - fieldPaths:
+    - spec.owner.name
+    select:
+      group: kubeflow.org
+      kind: Profile
+      name: $(profile-name)
+      version: v1beta1
+- source:
+    fieldPath: data.profile-name
     kind: ConfigMap
     name: default-install-config
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.profile-name
-configurations:
-- params.yaml
+    version: v1
+  targets:
+  - fieldPaths:
+    - metadata.name
+    select:
+      group: kubeflow.org
+      kind: Profile
+      name: $(profile-name)
+      version: v1beta1

From 236d0fb10fdc823b9da4efb927bf9e25fb1bae2a Mon Sep 17 00:00:00 2001
From: Aleksey Karpov <86011874+alekseyolg@users.noreply.github.com>
Date: Mon, 1 Jan 2024 17:23:56 +0300
Subject: [PATCH 2/2] Fixes dex for kustomize 5

---
 common/dex/overlays/istio/kustomization.yaml | 46 +++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/common/dex/overlays/istio/kustomization.yaml b/common/dex/overlays/istio/kustomization.yaml
index 2d71ade9b4..15ed5af7c2 100644
--- a/common/dex/overlays/istio/kustomization.yaml
+++ b/common/dex/overlays/istio/kustomization.yaml
@@ -1,26 +1,40 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-
 resources:
 - ../../base
 - virtual-service.yaml
-
 namespace: auth
-
-vars:
-- name: DEX_SERVICE
-  objref:
+configurations:
+- params.yaml
+replacements:
+- source:
+    fieldPath: metadata.name
     kind: Service
     name: dex
-    apiVersion: v1
-  fieldref:
-    fieldpath: metadata.name
-- name: DEX_NAMESPACE
-  objref:
+    version: v1
+  targets:
+  - fieldPaths:
+    - spec.http.0.route.0.destination.host
+    options:
+      delimiter: .
+    select:
+      group: networking.istio.io
+      kind: VirtualService
+      name: dex
+      version: v1alpha3
+- source:
+    fieldPath: metadata.namespace
     kind: Service
     name: dex
-    apiVersion: v1
-  fieldref:
-    fieldpath: metadata.namespace
-configurations:
-- params.yaml
+    version: v1
+  targets:
+  - fieldPaths:
+    - spec.http.0.route.0.destination.host
+    options:
+      delimiter: .
+      index: 1
+    select:
+      group: networking.istio.io
+      kind: VirtualService
+      name: dex
+      version: v1alpha3