diff --git a/examples/afxdp/kustomization.yaml b/examples/afxdp/kustomization.yaml index 6b809e45a3a4..9d510856405d 100644 --- 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 index 26776b57142f..f4f13811a15d 100644 --- 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 index 549fc92db032..035d5e06d797 100644 --- 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 index 4ed5106e1ade..9a7ff12d9ea8 100644 --- 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 index f1cfba81ce51..769a940b99a6 100644 --- 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 index 5a71b3d58541..ad9fbcfa2e9c 100644 --- 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 index a9d0ca86ec84..fc306cd5ada4 100644 --- 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 index 65b4fc5b70f1..51eb1743460e 100644 --- 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 index eb5d50a63057..e95cecea8419 100644 --- 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 index b48d939e50af..38fa15017dfd 100644 --- 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 index 5a751f9a2c09..36d4da18ee13 100644 --- 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 index c5e6ded3aa07..71c1cc9512ae 100644 --- 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 index 7a423c17fa87..0da4096e3c16 100644 --- 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 index e98ef8f12f6e..1b8898ebf0ba 100644 --- 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 index fd445f55b48d..05577b0a96a3 100644 --- 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 index afb34ac89630..abcd21f8e697 100644 --- 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 index e9e7690153bd..43f7124aadea 100644 --- 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 index 9318b4107d16..a54adf5da945 100644 --- 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 index ab3aaf454d67..cd5a62f02c35 100644 --- 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 index 64431f92fa76..00aeb7480d04 100644 --- 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 index 15b41417797b..b4ced8d97d9e 100644 --- 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 index 6c5f2b1c26fd..a6b4f52be8d2 100644 --- 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 index d7d71b8f11a6..0153f53a5efa 100644 --- 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 index 2991a4750dd5..6ce592d3af36 100644 --- 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 index dc1621e75758..c49861eb31fc 100644 --- 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 index 7ee3aef147c5..51044a7a6c60 100644 --- 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 index 3ffe60cc6dbc..15b258cb56e4 100644 --- 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 index 7386a20694f9..d6b57cb1c3a2 100644 --- 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 index 0e516a3fc52b..bf3e3fe4b873 100644 --- 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 index 933fd36a9331..c30d80a26fb5 100644 --- 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 index 5e5819375ff8..e135449f3e78 100644 --- 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 index b9c7b32a9d85..f97f5652a9f9 100644 --- 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 index 24fccfba0f8a..4f478c8c0f52 100644 --- 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 index d01d61b314f9..a6dee8a1633d 100644 --- 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 index 58c328441668..1f05b5e58649 100644 --- 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 index 38c3074362ef..d55534b52ad7 100644 --- 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 index b64c4bc8c810..3f796caa0d32 100644 --- 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 index 244c93b83f2b..9d877eba460a 100644 --- 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 index 72362852fba4..be495d808df2 100644 --- 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 index cba4a5928cad..2d21dde1d97a 100644 --- 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 index fc89ccf46502..86c55871bb1e 100644 --- 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 index 0d6791071151..e3c160638d00 100644 --- 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 index ccf94f522d8c..b367edda6102 100644 --- 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 index 23c74ea31427..cded9452ab20 100644 --- 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 index f9765d25a265..15ed86a9c06f 100644 --- 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 index 4569aff1ff53..2e7ce965f2bc 100644 --- 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 diff --git a/examples/heal/remote-nse-death-ip/nse-after-death/kustomization.yaml b/examples/heal/remote-nse-death-ip/nse-after-death/kustomization.yaml index 28cf1bd599ed..e00873afbfe6 100644 --- a/examples/heal/remote-nse-death-ip/nse-after-death/kustomization.yaml +++ b/examples/heal/remote-nse-death-ip/nse-after-death/kustomization.yaml @@ -7,5 +7,5 @@ namespace: ns-remote-nse-death-ip resources: - ../base -patchesStrategicMerge: -- patch-nse.yaml +patches: +- path: patch-nse.yaml diff --git a/examples/heal/remote-nse-death-ip/nse-before-death/kustomization.yaml b/examples/heal/remote-nse-death-ip/nse-before-death/kustomization.yaml index a29f03b8892d..8942d1622267 100644 --- a/examples/heal/remote-nse-death-ip/nse-before-death/kustomization.yaml +++ b/examples/heal/remote-nse-death-ip/nse-before-death/kustomization.yaml @@ -8,5 +8,5 @@ resources: - ns-remote-nse-death-ip.yaml - ../base -patchesStrategicMerge: -- patch-nse.yaml +patches: +- path: patch-nse.yaml diff --git a/examples/heal/remote-nse-death/nse-after-death/kustomization.yaml b/examples/heal/remote-nse-death/nse-after-death/kustomization.yaml index 753b99e8386f..2a11fdd2b403 100644 --- a/examples/heal/remote-nse-death/nse-after-death/kustomization.yaml +++ b/examples/heal/remote-nse-death/nse-after-death/kustomization.yaml @@ -7,5 +7,5 @@ namespace: ns-remote-nse-death resources: - ../base -patchesStrategicMerge: -- patch-nse.yaml +patches: +- path: patch-nse.yaml diff --git a/examples/heal/remote-nse-death/nse-before-death/kustomization.yaml b/examples/heal/remote-nse-death/nse-before-death/kustomization.yaml index d238f5c7d070..7d5d803e5040 100644 --- a/examples/heal/remote-nse-death/nse-before-death/kustomization.yaml +++ b/examples/heal/remote-nse-death/nse-before-death/kustomization.yaml @@ -8,5 +8,5 @@ resources: - ns-remote-nse-death.yaml - ../base -patchesStrategicMerge: -- patch-nse.yaml +patches: +- path: patch-nse.yaml diff --git a/examples/heal/remote-nsm-system-restart-memif-ip/kustomization.yaml b/examples/heal/remote-nsm-system-restart-memif-ip/kustomization.yaml index 7aeb1a7402bb..501acabd186f 100644 --- a/examples/heal/remote-nsm-system-restart-memif-ip/kustomization.yaml +++ b/examples/heal/remote-nsm-system-restart-memif-ip/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/remote-nsmgr-death/local-nse/kustomization.yaml b/examples/heal/remote-nsmgr-death/local-nse/kustomization.yaml index 7a6c6140e05d..0fee1704641e 100644 --- a/examples/heal/remote-nsmgr-death/local-nse/kustomization.yaml +++ b/examples/heal/remote-nsmgr-death/local-nse/kustomization.yaml @@ -7,5 +7,5 @@ namespace: ns-remote-nsmgr-death resources: - ../../../../apps/nse-kernel -patchesStrategicMerge: -- patch-nse.yaml +patches: +- path: patch-nse.yaml diff --git a/examples/heal/remote-nsmgr-death/nsmgr-death/kustomization.yaml b/examples/heal/remote-nsmgr-death/nsmgr-death/kustomization.yaml index b20f4bebe97f..c2a02f487c47 100644 --- a/examples/heal/remote-nsmgr-death/nsmgr-death/kustomization.yaml +++ b/examples/heal/remote-nsmgr-death/nsmgr-death/kustomization.yaml @@ -7,5 +7,5 @@ namespace: nsm-system resources: - ../../../../apps/nsmgr -patchesStrategicMerge: -- patch-nsmgr.yaml +patches: +- path: patch-nsmgr.yaml diff --git a/examples/heal/remote-nsmgr-death/remote-nse/kustomization.yaml b/examples/heal/remote-nsmgr-death/remote-nse/kustomization.yaml index 9de7416072fc..5d47efd2592a 100644 --- a/examples/heal/remote-nsmgr-death/remote-nse/kustomization.yaml +++ b/examples/heal/remote-nsmgr-death/remote-nse/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-nsmgr-remote-endpoint/nsmgr-after-death/kustomization.yaml b/examples/heal/remote-nsmgr-remote-endpoint/nsmgr-after-death/kustomization.yaml index d63443041e90..5d7764d881fc 100644 --- a/examples/heal/remote-nsmgr-remote-endpoint/nsmgr-after-death/kustomization.yaml +++ b/examples/heal/remote-nsmgr-remote-endpoint/nsmgr-after-death/kustomization.yaml @@ -7,5 +7,5 @@ namespace: ns-remote-nsmgr-remote-endpoint resources: - ../base -patchesStrategicMerge: -- patch-nse.yaml +patches: +- path: patch-nse.yaml diff --git a/examples/heal/remote-nsmgr-remote-endpoint/nsmgr-before-death/kustomization.yaml b/examples/heal/remote-nsmgr-remote-endpoint/nsmgr-before-death/kustomization.yaml index 1069e0b9ba80..1fed0a7e0357 100644 --- a/examples/heal/remote-nsmgr-remote-endpoint/nsmgr-before-death/kustomization.yaml +++ b/examples/heal/remote-nsmgr-remote-endpoint/nsmgr-before-death/kustomization.yaml @@ -9,5 +9,5 @@ resources: - ns-remote-nsmgr-remote-endpoint.yaml - client.yaml -patchesStrategicMerge: -- patch-nse.yaml +patches: +- path: patch-nse.yaml diff --git a/examples/heal/remote-nsmgr-restart-ip/kustomization.yaml b/examples/heal/remote-nsmgr-restart-ip/kustomization.yaml index 67d7c32e9f52..a65b42dd13e5 100644 --- a/examples/heal/remote-nsmgr-restart-ip/kustomization.yaml +++ b/examples/heal/remote-nsmgr-restart-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-nsmgr-restart/kustomization.yaml b/examples/heal/remote-nsmgr-restart/kustomization.yaml index fb4f6856e78a..c5d9473fa273 100644 --- a/examples/heal/remote-nsmgr-restart/kustomization.yaml +++ b/examples/heal/remote-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/spire-agent-restart/kustomization.yaml b/examples/heal/spire-agent-restart/kustomization.yaml index c2518544c325..709ee6e53fe3 100644 --- a/examples/heal/spire-agent-restart/kustomization.yaml +++ b/examples/heal/spire-agent-restart/kustomization.yaml @@ -9,5 +9,5 @@ resources: - client.yaml - ../../../apps/nse-kernel -patchesStrategicMerge: -- patch-nse.yaml +patches: +- path: patch-nse.yaml diff --git a/examples/heal/spire-server-agent-restart/kustomization.yaml b/examples/heal/spire-server-agent-restart/kustomization.yaml index 210b0123fa26..0119be6e8eec 100644 --- a/examples/heal/spire-server-agent-restart/kustomization.yaml +++ b/examples/heal/spire-server-agent-restart/kustomization.yaml @@ -9,5 +9,5 @@ resources: - client.yaml - ../../../apps/nse-kernel -patchesStrategicMerge: -- patch-nse.yaml +patches: +- path: patch-nse.yaml diff --git a/examples/heal/spire-server-restart/kustomization.yaml b/examples/heal/spire-server-restart/kustomization.yaml index 40d048bc8b37..b8dd3a579571 100644 --- a/examples/heal/spire-server-restart/kustomization.yaml +++ b/examples/heal/spire-server-restart/kustomization.yaml @@ -10,6 +10,5 @@ resources: - ../../../apps/nsc-kernel - ../../../apps/nse-kernel - -patchesStrategicMerge: -- patch-nse.yaml +patches: +- path: patch-nse.yaml diff --git a/examples/heal/spire-upgrade/kustomization.yaml b/examples/heal/spire-upgrade/kustomization.yaml index aa433a3fb36d..56d30eafc2fb 100644 --- a/examples/heal/spire-upgrade/kustomization.yaml +++ b/examples/heal/spire-upgrade/kustomization.yaml @@ -10,5 +10,5 @@ resources: - ../../../apps/nsc-kernel - ../../../apps/nse-kernel -patchesStrategicMerge: -- patch-nse.yaml +patches: +- path: patch-nse.yaml diff --git a/examples/heal/vl3-nscs-death/kustomization.yaml b/examples/heal/vl3-nscs-death/kustomization.yaml index 8dd57700b4b8..663010fbee37 100644 --- a/examples/heal/vl3-nscs-death/kustomization.yaml +++ b/examples/heal/vl3-nscs-death/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/heal/vl3-nse-death/kustomization.yaml b/examples/heal/vl3-nse-death/kustomization.yaml index 27c5a92a5cec..fb8b754d5036 100644 --- a/examples/heal/vl3-nse-death/kustomization.yaml +++ b/examples/heal/vl3-nse-death/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/heal_extended/component-restart/kustomization.yaml b/examples/heal_extended/component-restart/kustomization.yaml index dba533cc01af..674878885ca3 100644 --- a/examples/heal_extended/component-restart/kustomization.yaml +++ b/examples/heal_extended/component-restart/kustomization.yaml @@ -11,5 +11,5 @@ resources: - client-cp.yaml - ../../../apps/nse-kernel -patchesStrategicMerge: -- patch-nse.yaml +patches: +- path: patch-nse.yaml diff --git a/examples/ipsec_mechanism/kustomization.yaml b/examples/ipsec_mechanism/kustomization.yaml index 3753266a8a83..9d510856405d 100644 --- a/examples/ipsec_mechanism/kustomization.yaml +++ b/examples/ipsec_mechanism/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/k8s_monolith/configuration/cluster/kustomization.yaml b/examples/k8s_monolith/configuration/cluster/kustomization.yaml index b12f4aa182c7..5a2efb6f068c 100644 --- a/examples/k8s_monolith/configuration/cluster/kustomization.yaml +++ b/examples/k8s_monolith/configuration/cluster/kustomization.yaml @@ -12,12 +12,10 @@ resources: - ../../../../apps/nsmgr-proxy - ../../../../apps/admission-webhook-k8s -patchesStrategicMerge: -- patch-forwarder.yaml -- patch-registry-k8s.yaml -- patch-nsmgr-proxy.yaml - patches: + - path: patch-forwarder.yaml + - path: patch-registry-k8s.yaml + - path: patch-nsmgr-proxy.yaml - target: version: v1 kind: Service diff --git a/examples/k8s_monolith/external_nsc/usecases/Kernel2IP2Kernel/kustomization.yaml b/examples/k8s_monolith/external_nsc/usecases/Kernel2IP2Kernel/kustomization.yaml index 2e8930a3f0b2..3d1a6217d0c6 100644 --- a/examples/k8s_monolith/external_nsc/usecases/Kernel2IP2Kernel/kustomization.yaml +++ b/examples/k8s_monolith/external_nsc/usecases/Kernel2IP2Kernel/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/memory/Kernel2Ethernet2Kernel/kustomization.yaml b/examples/memory/Kernel2Ethernet2Kernel/kustomization.yaml index b1d50c9b0443..08f9e0ea2d60 100644 --- a/examples/memory/Kernel2Ethernet2Kernel/kustomization.yaml +++ b/examples/memory/Kernel2Ethernet2Kernel/kustomization.yaml @@ -9,5 +9,5 @@ resources: - client.yaml - ../../../apps/nse-kernel -patchesStrategicMerge: -- patch-nse.yaml +patches: +- path: patch-nse.yaml diff --git a/examples/memory/Kernel2Kernel/kustomization.yaml b/examples/memory/Kernel2Kernel/kustomization.yaml index 77408ef3ba33..0cd27a5dc2c3 100644 --- a/examples/memory/Kernel2Kernel/kustomization.yaml +++ b/examples/memory/Kernel2Kernel/kustomization.yaml @@ -9,5 +9,5 @@ resources: - client.yaml - ../../../apps/nse-kernel -patchesStrategicMerge: -- patch-nse.yaml +patches: +- path: patch-nse.yaml diff --git a/examples/memory/Memif2Memif/kustomization.yaml b/examples/memory/Memif2Memif/kustomization.yaml index 926758ff9aae..0a5c646f0af1 100644 --- a/examples/memory/Memif2Memif/kustomization.yaml +++ b/examples/memory/Memif2Memif/kustomization.yaml @@ -9,6 +9,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/observability/jaeger_and_prometheus/example/kustomization.yaml b/examples/observability/jaeger_and_prometheus/example/kustomization.yaml index 28c179be98aa..96bcb0444d47 100644 --- a/examples/observability/jaeger_and_prometheus/example/kustomization.yaml +++ b/examples/observability/jaeger_and_prometheus/example/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/observability/nsm_system/kustomization.yaml b/examples/observability/nsm_system/kustomization.yaml index 8d1a3997ce69..251c2235d66b 100644 --- a/examples/observability/nsm_system/kustomization.yaml +++ b/examples/observability/nsm_system/kustomization.yaml @@ -7,6 +7,6 @@ namespace: nsm-system resources: - ../../basic -patchesStrategicMerge: - - patch-nsmgr.yaml - - patch-forwarder.yaml +patches: + - path: patch-nsmgr.yaml + - path: patch-forwarder.yaml diff --git a/examples/remotevlan_ovs/kustomization.yaml b/examples/remotevlan_ovs/kustomization.yaml index a18cc43d76e3..5dcb6a2385ee 100644 --- a/examples/remotevlan_ovs/kustomization.yaml +++ b/examples/remotevlan_ovs/kustomization.yaml @@ -15,9 +15,9 @@ resources: - kernel2rvlan-breakout-svc.yaml - kernel2rvlan-multins-svc.yaml -patchesStrategicMerge: - - patch-nse.yaml - - patch-forwarder-ovs.yaml +patches: + - path: patch-nse.yaml + - path: patch-forwarder-ovs.yaml configMapGenerator: - name: device-selector diff --git a/examples/remotevlan_vpp/kustomization.yaml b/examples/remotevlan_vpp/kustomization.yaml index 798c6c3f0997..892d5fcf094e 100644 --- a/examples/remotevlan_vpp/kustomization.yaml +++ b/examples/remotevlan_vpp/kustomization.yaml @@ -15,9 +15,9 @@ resources: - kernel2rvlan-breakout-svc.yaml - kernel2rvlan-multins-svc.yaml -patchesStrategicMerge: - - patch-nse.yaml - - patch-forwarder-vpp.yaml +patches: + - path: patch-nse.yaml + - path: patch-forwarder-vpp.yaml configMapGenerator: - name: device-selector diff --git a/examples/sriov/kustomization.yaml b/examples/sriov/kustomization.yaml index baea4ad7b1af..478eaf6c19e4 100644 --- a/examples/sriov/kustomization.yaml +++ b/examples/sriov/kustomization.yaml @@ -10,5 +10,5 @@ resources: - ../../apps/forwarder-vpp - ../../apps/registry-k8s -patchesStrategicMerge: - - forwarder-vpp.yaml +patches: + - path: forwarder-vpp.yaml diff --git a/examples/use-cases/Kernel2Ethernet2Kernel/kustomization.yaml b/examples/use-cases/Kernel2Ethernet2Kernel/kustomization.yaml index ee8ffb5a406e..9897ae783706 100644 --- a/examples/use-cases/Kernel2Ethernet2Kernel/kustomization.yaml +++ b/examples/use-cases/Kernel2Ethernet2Kernel/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/use-cases/Kernel2Ethernet2Kernel_Vfio2Noop/kustomization.yaml b/examples/use-cases/Kernel2Ethernet2Kernel_Vfio2Noop/kustomization.yaml index 337c03987ac7..549682858e0f 100644 --- a/examples/use-cases/Kernel2Ethernet2Kernel_Vfio2Noop/kustomization.yaml +++ b/examples/use-cases/Kernel2Ethernet2Kernel_Vfio2Noop/kustomization.yaml @@ -12,7 +12,7 @@ resources: - ../../../apps/nse-vfio - client.yaml -patchesStrategicMerge: - - patch-nse.yaml - - patch-nsc-vfio.yaml - - patch-nse-vfio.yaml +patches: + - path: patch-nse.yaml + - path: patch-nsc-vfio.yaml + - path: patch-nse-vfio.yaml diff --git a/examples/use-cases/Kernel2Ethernet2Kernel_Vfio2NoopVlanTag/kustomization.yaml b/examples/use-cases/Kernel2Ethernet2Kernel_Vfio2NoopVlanTag/kustomization.yaml index 15dd5c03f178..2a61728980cd 100644 --- a/examples/use-cases/Kernel2Ethernet2Kernel_Vfio2NoopVlanTag/kustomization.yaml +++ b/examples/use-cases/Kernel2Ethernet2Kernel_Vfio2NoopVlanTag/kustomization.yaml @@ -12,7 +12,7 @@ resources: - ../../../apps/nse-vfio - client.yaml -patchesStrategicMerge: - - patch-nse.yaml - - patch-nsc-vfio.yaml - - patch-nse-vfio.yaml +patches: + - path: patch-nse.yaml + - path: patch-nsc-vfio.yaml + - path: patch-nse-vfio.yaml diff --git a/examples/use-cases/Kernel2Ethernet2Memif/kustomization.yaml b/examples/use-cases/Kernel2Ethernet2Memif/kustomization.yaml index 2e99d618d28b..be46efda6162 100644 --- a/examples/use-cases/Kernel2Ethernet2Memif/kustomization.yaml +++ b/examples/use-cases/Kernel2Ethernet2Memif/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/use-cases/Kernel2IP2Kernel/kustomization.yaml b/examples/use-cases/Kernel2IP2Kernel/kustomization.yaml index e5e903745473..397240386a41 100644 --- a/examples/use-cases/Kernel2IP2Kernel/kustomization.yaml +++ b/examples/use-cases/Kernel2IP2Kernel/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/use-cases/Kernel2IP2Memif/kustomization.yaml b/examples/use-cases/Kernel2IP2Memif/kustomization.yaml index 9622e234da65..000239afdf7f 100644 --- a/examples/use-cases/Kernel2IP2Memif/kustomization.yaml +++ b/examples/use-cases/Kernel2IP2Memif/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/use-cases/Kernel2Kernel/kustomization.yaml b/examples/use-cases/Kernel2Kernel/kustomization.yaml index 493f860a5294..3348ab884b33 100644 --- a/examples/use-cases/Kernel2Kernel/kustomization.yaml +++ b/examples/use-cases/Kernel2Kernel/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/use-cases/Kernel2KernelVLAN/kustomization.yaml b/examples/use-cases/Kernel2KernelVLAN/kustomization.yaml index 55d679560322..c244698d8623 100644 --- a/examples/use-cases/Kernel2KernelVLAN/kustomization.yaml +++ b/examples/use-cases/Kernel2KernelVLAN/kustomization.yaml @@ -10,6 +10,6 @@ resources: - ../../../apps/nsc-kernel - ../../../apps/nse-vlan-vpp -patchesStrategicMerge: -- patch-nsc.yaml -- patch-nse.yaml +patches: +- path: patch-nsc.yaml +- path: patch-nse.yaml diff --git a/examples/use-cases/Kernel2Kernel_Vfio2Noop/kustomization.yaml b/examples/use-cases/Kernel2Kernel_Vfio2Noop/kustomization.yaml index e060f3f78676..018896eaa2e6 100644 --- a/examples/use-cases/Kernel2Kernel_Vfio2Noop/kustomization.yaml +++ b/examples/use-cases/Kernel2Kernel_Vfio2Noop/kustomization.yaml @@ -12,7 +12,7 @@ resources: - netsvc.yaml - client.yaml -patchesStrategicMerge: - - patch-nse.yaml - - patch-nsc-vfio.yaml - - patch-nse-vfio.yaml +patches: + - path: patch-nse.yaml + - path: patch-nsc-vfio.yaml + - path: patch-nse-vfio.yaml diff --git a/examples/use-cases/Kernel2Kernel_Vfio2NoopVlanTag/kustomization.yaml b/examples/use-cases/Kernel2Kernel_Vfio2NoopVlanTag/kustomization.yaml index 91a5bc10456e..7ae5b38de1d3 100644 --- a/examples/use-cases/Kernel2Kernel_Vfio2NoopVlanTag/kustomization.yaml +++ b/examples/use-cases/Kernel2Kernel_Vfio2NoopVlanTag/kustomization.yaml @@ -12,7 +12,7 @@ resources: - netsvc.yaml - client.yaml -patchesStrategicMerge: - - patch-nse.yaml - - patch-nsc-vfio.yaml - - patch-nse-vfio.yaml +patches: + - path: patch-nse.yaml + - path: patch-nsc-vfio.yaml + - path: patch-nse-vfio.yaml diff --git a/examples/use-cases/Kernel2Memif/kustomization.yaml b/examples/use-cases/Kernel2Memif/kustomization.yaml index 7bf0b2cbcdd8..96811a655369 100644 --- a/examples/use-cases/Kernel2Memif/kustomization.yaml +++ b/examples/use-cases/Kernel2Memif/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/use-cases/Kernel2RVlanMultiNS/ns-1/kustomization.yaml b/examples/use-cases/Kernel2RVlanMultiNS/ns-1/kustomization.yaml index 3929d1a84581..3c7134b44c4f 100644 --- a/examples/use-cases/Kernel2RVlanMultiNS/ns-1/kustomization.yaml +++ b/examples/use-cases/Kernel2RVlanMultiNS/ns-1/kustomization.yaml @@ -10,5 +10,5 @@ resources: - netsvc.yaml - ../../../../apps/nse-remote-vlan -patchesStrategicMerge: - - patch-nse.yaml +patches: + - path: patch-nse.yaml diff --git a/examples/use-cases/Kernel2RVlanMultiNS/ns-2/kustomization.yaml b/examples/use-cases/Kernel2RVlanMultiNS/ns-2/kustomization.yaml index a909bac930e0..5e3a5552c001 100644 --- a/examples/use-cases/Kernel2RVlanMultiNS/ns-2/kustomization.yaml +++ b/examples/use-cases/Kernel2RVlanMultiNS/ns-2/kustomization.yaml @@ -11,5 +11,5 @@ resources: nameSuffix: -bg -patchesStrategicMerge: - - patch-nse.yaml +patches: + - path: patch-nse.yaml diff --git a/examples/use-cases/Memif2Ethernet2Kernel/kustomization.yaml b/examples/use-cases/Memif2Ethernet2Kernel/kustomization.yaml index c050d606fee7..a79dab737833 100644 --- a/examples/use-cases/Memif2Ethernet2Kernel/kustomization.yaml +++ b/examples/use-cases/Memif2Ethernet2Kernel/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/use-cases/Memif2Ethernet2Memif/kustomization.yaml b/examples/use-cases/Memif2Ethernet2Memif/kustomization.yaml index 54b27cd8b9f9..429597904910 100644 --- a/examples/use-cases/Memif2Ethernet2Memif/kustomization.yaml +++ b/examples/use-cases/Memif2Ethernet2Memif/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/use-cases/Memif2IP2Kernel/kustomization.yaml b/examples/use-cases/Memif2IP2Kernel/kustomization.yaml index 15377549f403..7f33ff26e4c7 100644 --- a/examples/use-cases/Memif2IP2Kernel/kustomization.yaml +++ b/examples/use-cases/Memif2IP2Kernel/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/use-cases/Memif2IP2Memif/kustomization.yaml b/examples/use-cases/Memif2IP2Memif/kustomization.yaml index a736111df8d5..9c6f3eba2970 100644 --- a/examples/use-cases/Memif2IP2Memif/kustomization.yaml +++ b/examples/use-cases/Memif2IP2Memif/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/use-cases/Memif2Kernel/kustomization.yaml b/examples/use-cases/Memif2Kernel/kustomization.yaml index 52f3e05933fe..f0720f7cdb7c 100644 --- a/examples/use-cases/Memif2Kernel/kustomization.yaml +++ b/examples/use-cases/Memif2Kernel/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/use-cases/Memif2Memif/kustomization.yaml b/examples/use-cases/Memif2Memif/kustomization.yaml index 39790ddde1c9..87c97374aba6 100644 --- a/examples/use-cases/Memif2Memif/kustomization.yaml +++ b/examples/use-cases/Memif2Memif/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/use-cases/SmartVF2SmartVF/kustomization.yaml b/examples/use-cases/SmartVF2SmartVF/kustomization.yaml index acbefb160b72..34401e89ed40 100644 --- a/examples/use-cases/SmartVF2SmartVF/kustomization.yaml +++ b/examples/use-cases/SmartVF2SmartVF/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/use-cases/SriovKernel2Noop/kustomization.yaml b/examples/use-cases/SriovKernel2Noop/kustomization.yaml index b507431c0202..83f57c5dbc50 100644 --- a/examples/use-cases/SriovKernel2Noop/kustomization.yaml +++ b/examples/use-cases/SriovKernel2Noop/kustomization.yaml @@ -10,6 +10,6 @@ resources: - namespace - netsvc.yaml -patchesStrategicMerge: -- patch-nsc.yaml -- patch-nse.yaml +patches: +- path: patch-nsc.yaml +- path: patch-nse.yaml diff --git a/examples/use-cases/SriovKernel2NoopVlanTag/kustomization.yaml b/examples/use-cases/SriovKernel2NoopVlanTag/kustomization.yaml index 346982c676d9..6092449345e8 100644 --- a/examples/use-cases/SriovKernel2NoopVlanTag/kustomization.yaml +++ b/examples/use-cases/SriovKernel2NoopVlanTag/kustomization.yaml @@ -10,6 +10,6 @@ resources: - namespace - netsvc.yaml -patchesStrategicMerge: -- patch-nsc.yaml -- patch-nse.yaml +patches: +- path: patch-nsc.yaml +- path: patch-nse.yaml diff --git a/examples/use-cases/SriovKernel2NoopVlanTag/ponger/kustomization.yaml b/examples/use-cases/SriovKernel2NoopVlanTag/ponger/kustomization.yaml index aa17c05c27b6..eba38932f102 100644 --- a/examples/use-cases/SriovKernel2NoopVlanTag/ponger/kustomization.yaml +++ b/examples/use-cases/SriovKernel2NoopVlanTag/ponger/kustomization.yaml @@ -8,5 +8,5 @@ resources: - ../namespace - ../../../../apps/nse-kernel-ponger -patchesStrategicMerge: - - patch-ponger.yaml +patches: + - path: patch-ponger.yaml diff --git a/examples/use-cases/Vfio2Noop/kustomization.yaml b/examples/use-cases/Vfio2Noop/kustomization.yaml index 450f9c234e8a..f36ba51bd7af 100644 --- a/examples/use-cases/Vfio2Noop/kustomization.yaml +++ b/examples/use-cases/Vfio2Noop/kustomization.yaml @@ -10,6 +10,6 @@ resources: - ../../../apps/nse-vfio - netsvc.yaml -patchesStrategicMerge: - - patch-nsc-vfio.yaml - - patch-nse-vfio.yaml +patches: + - path: patch-nsc-vfio.yaml + - path: patch-nse-vfio.yaml diff --git a/examples/use-cases/Vfio2NoopVlanTag/kustomization.yaml b/examples/use-cases/Vfio2NoopVlanTag/kustomization.yaml index c21c36b7422b..2635f1ba0cea 100644 --- a/examples/use-cases/Vfio2NoopVlanTag/kustomization.yaml +++ b/examples/use-cases/Vfio2NoopVlanTag/kustomization.yaml @@ -10,6 +10,6 @@ resources: - ../../../apps/nse-vfio - netsvc.yaml -patchesStrategicMerge: - - patch-nsc-vfio.yaml - - patch-nse-vfio.yaml +patches: + - path: patch-nsc-vfio.yaml + - path: patch-nse-vfio.yaml