networkservicemesh · denis-tingaikin · Feb 27, 2024 · Feb 15, 2024 · Feb 21, 2024
diff --git a/examples/afxdp/kustomization.yaml b/examples/afxdp/kustomization.yaml
@@ -11,5 +11,5 @@ resources:
 - ../../apps/registry-k8s
 - ../../apps/admission-webhook-k8s
 
-patchesStrategicMerge:
-- forwarder-vpp.yaml
+patches:
+- path: forwarder-vpp.yaml
diff --git a/examples/features/annotated-namespace/kustomization.yaml b/examples/features/annotated-namespace/kustomization.yaml
@@ -9,5 +9,5 @@ resources:
   - namespace.yaml
   - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-  - patch-nse.yaml
+patches:
+  - path: patch-nse.yaml
diff --git a/examples/features/dns/kustomization.yaml b/examples/features/dns/kustomization.yaml
@@ -11,5 +11,5 @@ resources:
 - netsvc.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/features/dual-stack/Kernel2IP2Kernel_dual_stack/kustomization.yaml b/examples/features/dual-stack/Kernel2IP2Kernel_dual_stack/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - client.yaml
 - ../../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/features/dual-stack/Kernel2Kernel_dual_stack/kustomization.yaml b/examples/features/dual-stack/Kernel2Kernel_dual_stack/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - client.yaml
 - ../../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/features/exclude-prefixes/kustomization.yaml b/examples/features/exclude-prefixes/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - client.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/features/ipv6/Kernel2IP2Kernel_ipv6/kustomization.yaml b/examples/features/ipv6/Kernel2IP2Kernel_ipv6/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - netsvc.yaml
 - ../../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/features/ipv6/Kernel2IP2Memif_ipv6/kustomization.yaml b/examples/features/ipv6/Kernel2IP2Memif_ipv6/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - netsvc.yaml
 - ../../../../apps/nse-memif
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/features/ipv6/Kernel2Kernel_ipv6/kustomization.yaml b/examples/features/ipv6/Kernel2Kernel_ipv6/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - netsvc.yaml
 - ../../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/features/ipv6/Memif2IP2Kernel_ipv6/kustomization.yaml b/examples/features/ipv6/Memif2IP2Kernel_ipv6/kustomization.yaml
@@ -10,6 +10,6 @@ resources:
 - ../../../../apps/nsc-memif
 - ../../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nsc.yaml
-- patch-nse.yaml
+patches:
+- path: patch-nsc.yaml
+- path: patch-nse.yaml
diff --git a/examples/features/ipv6/Memif2IP2Memif_ipv6/kustomization.yaml b/examples/features/ipv6/Memif2IP2Memif_ipv6/kustomization.yaml
@@ -10,6 +10,6 @@ resources:
 - ../../../../apps/nsc-memif
 - ../../../../apps/nse-memif
 
-patchesStrategicMerge:
-- patch-nsc.yaml
-- patch-nse.yaml
+patches:
+- path: patch-nsc.yaml
+- path: patch-nse.yaml
diff --git a/examples/features/ipv6/Memif2Memif_ipv6/kustomization.yaml b/examples/features/ipv6/Memif2Memif_ipv6/kustomization.yaml
@@ -10,6 +10,6 @@ resources:
 - ../../../../apps/nsc-memif
 - ../../../../apps/nse-memif
 
-patchesStrategicMerge:
-- patch-nsc.yaml
-- patch-nse.yaml
+patches:
+- path: patch-nsc.yaml
+- path: patch-nse.yaml
diff --git a/examples/features/mutually-aware-nses/kustomization.yaml b/examples/features/mutually-aware-nses/kustomization.yaml
@@ -14,5 +14,5 @@ resources:
 - config-file-nse-2.yaml
 - ../../../apps/nsc-kernel
 
-patchesStrategicMerge:
-- patch-nsc.yaml
+patches:
+- path: patch-nsc.yaml
diff --git a/examples/features/nse-composition/kustomization.yaml b/examples/features/nse-composition/kustomization.yaml
@@ -14,8 +14,8 @@ resources:
 - nse-firewall
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
 
 configMapGenerator:
   - name: nginx-config

diff --git a/examples/features/nse-composition/nse-firewall/kustomization.yaml b/examples/features/nse-composition/nse-firewall/kustomization.yaml
@@ -5,6 +5,6 @@ kind: Kustomization
 resources:
 - ../../../../apps/nse-firewall-vpp
 
-patchesStrategicMerge:
-- patch-nse-firewall-vpp.yaml
-- config-patch.yaml
+patches:
+- path: patch-nse-firewall-vpp.yaml
+- path: config-patch.yaml
diff --git a/examples/features/opa/kustomization.yaml b/examples/features/opa/kustomization.yaml
@@ -10,6 +10,6 @@ resources:
 - ../../../apps/nsc-kernel
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nsc.yaml
-- patch-nse.yaml
+patches:
+- path: patch-nsc.yaml
+- path: patch-nse.yaml
diff --git a/examples/features/policy-based-routing/kustomization.yaml b/examples/features/policy-based-routing/kustomization.yaml
@@ -11,5 +11,5 @@ resources:
 - netsvc.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/features/scale-from-zero/kustomization.yaml b/examples/features/scale-from-zero/kustomization.yaml
@@ -10,8 +10,8 @@ resources:
 - client.yaml
 - ../../../apps/nse-supplier-k8s
 
-patchesStrategicMerge:
-- patch-supplier.yaml
+patches:
+- path: patch-supplier.yaml
 
 configMapGenerator:
   - name: supplier-pod-template-configmap

diff --git a/examples/features/scaled-registry/kustomization.yaml b/examples/features/scaled-registry/kustomization.yaml
@@ -9,5 +9,5 @@ resources:
 - netsvc.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/features/select-forwarder/kustomization.yaml b/examples/features/select-forwarder/kustomization.yaml
@@ -11,5 +11,5 @@ resources:
 - forwarder.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- nse-patch.yaml
+patches:
+- path: nse-patch.yaml
diff --git a/examples/features/vl3-basic/kustomization.yaml b/examples/features/vl3-basic/kustomization.yaml
@@ -11,5 +11,5 @@ resources:
 - ../../../apps/nse-vl3-vpp
 - ../../../apps/vl3-ipam
 
-patchesStrategicMerge:
-- nse-patch.yaml
+patches:
+- path: nse-patch.yaml
diff --git a/examples/features/vl3-dns/kustomization.yaml b/examples/features/vl3-dns/kustomization.yaml
@@ -11,5 +11,5 @@ resources:
 - ../../../apps/nse-vl3-vpp
 - ../../../apps/vl3-ipam
 
-patchesStrategicMerge:
-- nse-patch.yaml
+patches:
+- path: nse-patch.yaml
diff --git a/examples/features/vl3-ipv6/kustomization.yaml b/examples/features/vl3-ipv6/kustomization.yaml
@@ -11,11 +11,9 @@ resources:
 - ../../../apps/nse-vl3-vpp
 - ../../../apps/vl3-ipam
 
-patchesStrategicMerge:
-- nse-patch.yaml
-- ipam-patch.yaml
-
 patches:
+ - path: nse-patch.yaml
+ - path: ipam-patch.yaml
  - target:
       version: v1
       kind: Deployment

diff --git a/examples/features/vl3-lb/kustomization.yaml b/examples/features/vl3-lb/kustomization.yaml
@@ -13,6 +13,6 @@ resources:
 - ../../../apps/vl3-ipam
 - ../../../apps/vl3-lb
 
-patchesStrategicMerge:
-- nse-patch.yaml
-- finance-lb-patch.yaml
+patches:
+- path: nse-patch.yaml
+- path: finance-lb-patch.yaml
diff --git a/examples/features/vl3-scale-from-zero/kustomization.yaml b/examples/features/vl3-scale-from-zero/kustomization.yaml
@@ -11,8 +11,8 @@ resources:
 - ../../../apps/vl3-ipam
 - ../../../apps/nse-supplier-k8s
 
-patchesStrategicMerge:
-- supplier-patch.yaml
+patches:
+- path: supplier-patch.yaml
 
 configMapGenerator:
   - name: supplier-pod-template-configmap

diff --git a/examples/features/webhook-smartvf/kustomization.yaml b/examples/features/webhook-smartvf/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - netsvc.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/features/webhook/kustomization.yaml b/examples/features/webhook/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - netsvc.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/dataplane-interrupt/kustomization.yaml b/examples/heal/dataplane-interrupt/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - client.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/local-forwarder-death/kustomization.yaml b/examples/heal/local-forwarder-death/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - netsvc.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/local-forwarder-remote-forwarder/kustomization.yaml b/examples/heal/local-forwarder-remote-forwarder/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - client.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/local-nse-death/nse-after-death/kustomization.yaml b/examples/heal/local-nse-death/nse-after-death/kustomization.yaml
@@ -7,5 +7,5 @@ namespace: ns-local-nse-death
 resources:
 - ../base
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/local-nse-death/nse-before-death/kustomization.yaml b/examples/heal/local-nse-death/nse-before-death/kustomization.yaml
@@ -8,5 +8,5 @@ resources:
 - ns-local-nse-death.yaml
 - ../base
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/local-nsm-system-restart/kustomization.yaml b/examples/heal/local-nsm-system-restart/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - client.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/local-nsmgr-local-forwarder-memif/kustomization.yaml b/examples/heal/local-nsmgr-local-forwarder-memif/kustomization.yaml
@@ -10,6 +10,6 @@ resources:
 - ../../../apps/nsc-memif
 - ../../../apps/nse-memif
 
-patchesStrategicMerge:
-- patch-nsc.yaml
-- patch-nse.yaml
+patches:
+- path: patch-nsc.yaml
+- path: patch-nse.yaml
diff --git a/examples/heal/local-nsmgr-local-nse-memif/base/kustomization.yaml b/examples/heal/local-nsmgr-local-nse-memif/base/kustomization.yaml
@@ -9,5 +9,5 @@ resources:
 - ../../../../apps/nsc-memif
 - ../../../../apps/nse-memif
 
-patchesStrategicMerge:
-- patch-nsc.yaml
+patches:
+- path: patch-nsc.yaml
diff --git a/examples/heal/local-nsmgr-local-nse-memif/nse-after-death/kustomization.yaml b/examples/heal/local-nsmgr-local-nse-memif/nse-after-death/kustomization.yaml
@@ -7,5 +7,5 @@ namespace: ns-local-nsmgr-local-nse-memif
 resources:
 - ../base
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/local-nsmgr-local-nse-memif/nse-before-death/kustomization.yaml b/examples/heal/local-nsmgr-local-nse-memif/nse-before-death/kustomization.yaml
@@ -8,5 +8,5 @@ resources:
 - ns-local-nsmgr-local-nse-memif.yaml
 - ../base
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/local-nsmgr-remote-nsmgr/kustomization.yaml b/examples/heal/local-nsmgr-remote-nsmgr/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - client.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/local-nsmgr-restart/kustomization.yaml b/examples/heal/local-nsmgr-restart/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - client.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/registry-local-endpoint/nse-first/kustomization.yaml b/examples/heal/registry-local-endpoint/nse-first/kustomization.yaml
@@ -8,5 +8,5 @@ resources:
 - ns-registry-local-endpoint.yaml
 - ../base
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/registry-local-endpoint/nse-second/kustomization.yaml b/examples/heal/registry-local-endpoint/nse-second/kustomization.yaml
@@ -7,5 +7,5 @@ namespace: ns-registry-local-endpoint
 resources:
 - ../base
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/registry-remote-forwarder/kustomization.yaml b/examples/heal/registry-remote-forwarder/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - client.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/registry-remote-nsmgr/kustomization.yaml b/examples/heal/registry-remote-nsmgr/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - client.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/registry-restart/registry-before-death/kustomization.yaml b/examples/heal/registry-restart/registry-before-death/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - client.yaml
 - ../../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/remote-forwarder-death-ip/kustomization.yaml b/examples/heal/remote-forwarder-death-ip/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - client.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml
diff --git a/examples/heal/remote-forwarder-death/kustomization.yaml b/examples/heal/remote-forwarder-death/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 - client.yaml
 - ../../../apps/nse-kernel
 
-patchesStrategicMerge:
-- patch-nse.yaml
+patches:
+- path: patch-nse.yaml