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 c9138a7.
kubeflow · Sep 21, 2023 · 7681427 · 7681427
1 parent 5cee77f
commit 7681427
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git 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
@@ -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