From 7681427dba2fd6bf18db715c1b9f61730beccdc5 Mon Sep 17 00:00:00 2001
From: Julius von Kohout <45896133+juliusvonkohout@users.noreply.github.com>
Date: Thu, 21 Sep 2023 17:02:37 +0200
Subject: [PATCH] Fix istio 1.16 and 1.17 and istio-cni 1.17 for kustomize 5
 (#2537)

* kustomize edit fix --vars

* Update kustomization.yaml

* Delete common/istio-1-16/istio-install/base/tmp.yaml

* fix for istio-cni-1-17

* Revert "kustomize edit fix --vars"

This reverts commit c9138a7f1132a1c4f8ec1ae57aa677d7af536636.
---
 .../istio-install/base/kustomization.yaml           | 13 ++++++-------
 .../istio-install/base/kustomization.yaml           | 13 ++++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/common/istio-1-17/istio-install/base/kustomization.yaml b/common/istio-1-17/istio-install/base/kustomization.yaml
index 18089dc88f..da19a0353e 100644
--- a/common/istio-1-17/istio-install/base/kustomization.yaml
+++ b/common/istio-1-17/istio-install/base/kustomization.yaml
@@ -10,10 +10,9 @@ resources:
 - gateway.yaml
 - x-forwarded-host.yaml
 
-patchesStrategicMerge:
-- patches/service.yaml
-- patches/istio-configmap-disable-tracing.yaml
-- patches/disable-debugging.yaml
-- patches/istio-ingressgateway-remove-pdb.yaml
-- patches/istiod-remove-pdb.yaml
-
+patches:
+- path: patches/service.yaml
+- path: patches/istio-configmap-disable-tracing.yaml
+- path: patches/disable-debugging.yaml
+- path: patches/istio-ingressgateway-remove-pdb.yaml
+- path: patches/istiod-remove-pdb.yaml
diff --git a/common/istio-cni-1-17/istio-install/base/kustomization.yaml b/common/istio-cni-1-17/istio-install/base/kustomization.yaml
index 8038c2cf45..79d1fe5817 100644
--- a/common/istio-cni-1-17/istio-install/base/kustomization.yaml
+++ b/common/istio-cni-1-17/istio-install/base/kustomization.yaml
@@ -8,10 +8,9 @@ resources:
 - gateway.yaml
 - x-forwarded-host.yaml
 
-patchesStrategicMerge:
-- patches/service.yaml
-- patches/istio-configmap-disable-tracing.yaml
-- patches/disable-debugging.yaml
-- patches/istio-ingressgateway-remove-pdb.yaml
-- patches/istiod-remove-pdb.yaml
-
+patches:
+- path: patches/service.yaml
+- path: patches/istio-configmap-disable-tracing.yaml
+- path: patches/disable-debugging.yaml
+- path: patches/istio-ingressgateway-remove-pdb.yaml
+- path: patches/istiod-remove-pdb.yaml