From 00fd857e3cb562bdcd40d09598ec306c55789364 Mon Sep 17 00:00:00 2001
From: Michael Wilkerson <62034708+wilkermichael@users.noreply.github.com>
Date: Wed, 4 Oct 2023 08:46:06 -0700
Subject: [PATCH] fix deprecated kustomize strategic merge (#3031)

---
 .../default-partition-default/kustomization.yaml          | 8 +++++---
 .../default-partition-ns1/kustomization.yaml              | 8 +++++---
 .../secondary-partition-default/kustomization.yaml        | 8 +++++---
 .../secondary-partition-ns1/kustomization.yaml            | 8 +++++---
 .../cases/crd-peers/default-namespace/kustomization.yaml  | 8 +++++---
 .../fixtures/cases/crd-peers/default/kustomization.yaml   | 8 +++++---
 .../crd-peers/non-default-namespace/kustomization.yaml    | 8 +++++---
 .../static-client-inject-multiport/kustomization.yaml     | 8 +++++---
 .../cases/static-client-inject/kustomization.yaml         | 8 +++++---
 .../cases/static-client-multi-dc/kustomization.yaml       | 8 +++++---
 .../cases/static-client-namespaces/kustomization.yaml     | 8 +++++---
 .../default-ns-default-partition/kustomization.yaml       | 8 +++++---
 .../default-ns-partition/kustomization.yaml               | 8 +++++---
 .../ns-default-partition/kustomization.yaml               | 8 +++++---
 .../ns-partition/kustomization.yaml                       | 8 +++++---
 .../default-namespace/kustomization.yaml                  | 8 +++++---
 .../cases/static-client-peers/default/kustomization.yaml  | 8 +++++---
 .../non-default-namespace/kustomization.yaml              | 8 +++++---
 .../cases/static-client-tproxy/kustomization.yaml         | 8 +++++---
 .../cases/static-server-inject/kustomization.yaml         | 8 +++++---
 20 files changed, 100 insertions(+), 60 deletions(-)

diff --git a/acceptance/tests/fixtures/cases/crd-partitions/default-partition-default/kustomization.yaml b/acceptance/tests/fixtures/cases/crd-partitions/default-partition-default/kustomization.yaml
index 499fdc5bc1..efc4746346 100644
--- a/acceptance/tests/fixtures/cases/crd-partitions/default-partition-default/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/crd-partitions/default-partition-default/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../../bases/exportedservices-default
+- ../../../bases/exportedservices-default
 
-patchesStrategicMerge:
-- patch.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/crd-partitions/default-partition-ns1/kustomization.yaml b/acceptance/tests/fixtures/cases/crd-partitions/default-partition-ns1/kustomization.yaml
index 499fdc5bc1..efc4746346 100644
--- a/acceptance/tests/fixtures/cases/crd-partitions/default-partition-ns1/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/crd-partitions/default-partition-ns1/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../../bases/exportedservices-default
+- ../../../bases/exportedservices-default
 
-patchesStrategicMerge:
-- patch.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/crd-partitions/secondary-partition-default/kustomization.yaml b/acceptance/tests/fixtures/cases/crd-partitions/secondary-partition-default/kustomization.yaml
index 5a9c8412aa..08227f89a5 100644
--- a/acceptance/tests/fixtures/cases/crd-partitions/secondary-partition-default/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/crd-partitions/secondary-partition-default/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../../bases/exportedservices-secondary
+- ../../../bases/exportedservices-secondary
 
-patchesStrategicMerge:
-- patch.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/crd-partitions/secondary-partition-ns1/kustomization.yaml b/acceptance/tests/fixtures/cases/crd-partitions/secondary-partition-ns1/kustomization.yaml
index 5a9c8412aa..08227f89a5 100644
--- a/acceptance/tests/fixtures/cases/crd-partitions/secondary-partition-ns1/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/crd-partitions/secondary-partition-ns1/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../../bases/exportedservices-secondary
+- ../../../bases/exportedservices-secondary
 
-patchesStrategicMerge:
-- patch.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/crd-peers/default-namespace/kustomization.yaml b/acceptance/tests/fixtures/cases/crd-peers/default-namespace/kustomization.yaml
index 499fdc5bc1..efc4746346 100644
--- a/acceptance/tests/fixtures/cases/crd-peers/default-namespace/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/crd-peers/default-namespace/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../../bases/exportedservices-default
+- ../../../bases/exportedservices-default
 
-patchesStrategicMerge:
-- patch.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/crd-peers/default/kustomization.yaml b/acceptance/tests/fixtures/cases/crd-peers/default/kustomization.yaml
index 499fdc5bc1..efc4746346 100644
--- a/acceptance/tests/fixtures/cases/crd-peers/default/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/crd-peers/default/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../../bases/exportedservices-default
+- ../../../bases/exportedservices-default
 
-patchesStrategicMerge:
-- patch.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/crd-peers/non-default-namespace/kustomization.yaml b/acceptance/tests/fixtures/cases/crd-peers/non-default-namespace/kustomization.yaml
index 499fdc5bc1..efc4746346 100644
--- a/acceptance/tests/fixtures/cases/crd-peers/non-default-namespace/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/crd-peers/non-default-namespace/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../../bases/exportedservices-default
+- ../../../bases/exportedservices-default
 
-patchesStrategicMerge:
-- patch.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/static-client-inject-multiport/kustomization.yaml b/acceptance/tests/fixtures/cases/static-client-inject-multiport/kustomization.yaml
index 9834f91903..e5cd5f9882 100644
--- a/acceptance/tests/fixtures/cases/static-client-inject-multiport/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/static-client-inject-multiport/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../bases/static-client
+- ../../bases/static-client
 
-patchesStrategicMerge:
-  - patch.yaml
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/static-client-inject/kustomization.yaml b/acceptance/tests/fixtures/cases/static-client-inject/kustomization.yaml
index 9834f91903..e5cd5f9882 100644
--- a/acceptance/tests/fixtures/cases/static-client-inject/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/static-client-inject/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../bases/static-client
+- ../../bases/static-client
 
-patchesStrategicMerge:
-  - patch.yaml
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/static-client-multi-dc/kustomization.yaml b/acceptance/tests/fixtures/cases/static-client-multi-dc/kustomization.yaml
index 9834f91903..e5cd5f9882 100644
--- a/acceptance/tests/fixtures/cases/static-client-multi-dc/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/static-client-multi-dc/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../bases/static-client
+- ../../bases/static-client
 
-patchesStrategicMerge:
-  - patch.yaml
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/static-client-namespaces/kustomization.yaml b/acceptance/tests/fixtures/cases/static-client-namespaces/kustomization.yaml
index 4c5d895a98..e5cd5f9882 100644
--- a/acceptance/tests/fixtures/cases/static-client-namespaces/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/static-client-namespaces/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../bases/static-client
+- ../../bases/static-client
 
-patchesStrategicMerge:
-  - patch.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/static-client-partitions/default-ns-default-partition/kustomization.yaml b/acceptance/tests/fixtures/cases/static-client-partitions/default-ns-default-partition/kustomization.yaml
index 7191edfb80..5a16e6eaff 100644
--- a/acceptance/tests/fixtures/cases/static-client-partitions/default-ns-default-partition/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/static-client-partitions/default-ns-default-partition/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../../bases/static-client
+- ../../../bases/static-client
 
-patchesStrategicMerge:
-  - patch.yaml
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/static-client-partitions/default-ns-partition/kustomization.yaml b/acceptance/tests/fixtures/cases/static-client-partitions/default-ns-partition/kustomization.yaml
index 7191edfb80..5a16e6eaff 100644
--- a/acceptance/tests/fixtures/cases/static-client-partitions/default-ns-partition/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/static-client-partitions/default-ns-partition/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../../bases/static-client
+- ../../../bases/static-client
 
-patchesStrategicMerge:
-  - patch.yaml
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/static-client-partitions/ns-default-partition/kustomization.yaml b/acceptance/tests/fixtures/cases/static-client-partitions/ns-default-partition/kustomization.yaml
index 7191edfb80..5a16e6eaff 100644
--- a/acceptance/tests/fixtures/cases/static-client-partitions/ns-default-partition/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/static-client-partitions/ns-default-partition/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../../bases/static-client
+- ../../../bases/static-client
 
-patchesStrategicMerge:
-  - patch.yaml
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/static-client-partitions/ns-partition/kustomization.yaml b/acceptance/tests/fixtures/cases/static-client-partitions/ns-partition/kustomization.yaml
index 7191edfb80..5a16e6eaff 100644
--- a/acceptance/tests/fixtures/cases/static-client-partitions/ns-partition/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/static-client-partitions/ns-partition/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../../bases/static-client
+- ../../../bases/static-client
 
-patchesStrategicMerge:
-  - patch.yaml
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/static-client-peers/default-namespace/kustomization.yaml b/acceptance/tests/fixtures/cases/static-client-peers/default-namespace/kustomization.yaml
index 7191edfb80..5a16e6eaff 100644
--- a/acceptance/tests/fixtures/cases/static-client-peers/default-namespace/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/static-client-peers/default-namespace/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../../bases/static-client
+- ../../../bases/static-client
 
-patchesStrategicMerge:
-  - patch.yaml
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/static-client-peers/default/kustomization.yaml b/acceptance/tests/fixtures/cases/static-client-peers/default/kustomization.yaml
index 7191edfb80..5a16e6eaff 100644
--- a/acceptance/tests/fixtures/cases/static-client-peers/default/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/static-client-peers/default/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../../bases/static-client
+- ../../../bases/static-client
 
-patchesStrategicMerge:
-  - patch.yaml
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/static-client-peers/non-default-namespace/kustomization.yaml b/acceptance/tests/fixtures/cases/static-client-peers/non-default-namespace/kustomization.yaml
index 7191edfb80..5a16e6eaff 100644
--- a/acceptance/tests/fixtures/cases/static-client-peers/non-default-namespace/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/static-client-peers/non-default-namespace/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../../bases/static-client
+- ../../../bases/static-client
 
-patchesStrategicMerge:
-  - patch.yaml
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/static-client-tproxy/kustomization.yaml b/acceptance/tests/fixtures/cases/static-client-tproxy/kustomization.yaml
index 9834f91903..e5cd5f9882 100644
--- a/acceptance/tests/fixtures/cases/static-client-tproxy/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/static-client-tproxy/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../bases/static-client
+- ../../bases/static-client
 
-patchesStrategicMerge:
-  - patch.yaml
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml
diff --git a/acceptance/tests/fixtures/cases/static-server-inject/kustomization.yaml b/acceptance/tests/fixtures/cases/static-server-inject/kustomization.yaml
index bac892baa0..95b6deaae7 100644
--- a/acceptance/tests/fixtures/cases/static-server-inject/kustomization.yaml
+++ b/acceptance/tests/fixtures/cases/static-server-inject/kustomization.yaml
@@ -1,5 +1,7 @@
 resources:
-  - ../../bases/static-server
+- ../../bases/static-server
 
-patchesStrategicMerge:
-  - patch.yaml
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patch.yaml