From 86f321d37b1a0906b7cd76cf8bfd9a4a9e087ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20N=C3=A9au?= Date: Tue, 3 Oct 2023 16:56:13 +0200 Subject: [PATCH] Use `patchesStrategicMerge` for Kustomize patching Drop for legacy patches was dropped [1] in `sigs.k8s.io/kustomize/api` `v0.13.0`, causing Fleet acceptance tests for Kustomize examples to fail. [1]: https://github.com/kubernetes-sigs/kustomize/releases/tag/api%2Fv0.13.0 --- .../helm-kustomize/overlays/dev/kustomization.yaml | 2 +- .../helm-kustomize/overlays/prod/kustomization.yaml | 2 +- .../helm-kustomize/overlays/test/kustomization.yaml | 2 +- multi-cluster/kustomize/overlays/dev/kustomization.yaml | 2 +- multi-cluster/kustomize/overlays/prod/kustomization.yaml | 2 +- multi-cluster/kustomize/overlays/test/kustomization.yaml | 2 +- .../helm-kustomize/overlays/dev/kustomization.yaml | 2 +- single-cluster/kustomize/overlays/dev/kustomization.yaml | 2 +- tests/expected/multi-cluster/helm-kustomize/bundle.yaml | 6 +++--- tests/expected/multi-cluster/kustomize/bundle.yaml | 6 +++--- tests/expected/single-cluster/helm-kustomize/bundle.yaml | 2 +- tests/expected/single-cluster/kustomize/bundle.yaml | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/multi-cluster/helm-kustomize/overlays/dev/kustomization.yaml b/multi-cluster/helm-kustomize/overlays/dev/kustomization.yaml index c3759a0..14211d6 100644 --- a/multi-cluster/helm-kustomize/overlays/dev/kustomization.yaml +++ b/multi-cluster/helm-kustomize/overlays/dev/kustomization.yaml @@ -1,3 +1,3 @@ -patches: +patchesStrategicMerge: - redis-slave-deployment.yaml - redis-slave-service.yaml diff --git a/multi-cluster/helm-kustomize/overlays/prod/kustomization.yaml b/multi-cluster/helm-kustomize/overlays/prod/kustomization.yaml index 3529762..7333d39 100644 --- a/multi-cluster/helm-kustomize/overlays/prod/kustomization.yaml +++ b/multi-cluster/helm-kustomize/overlays/prod/kustomization.yaml @@ -1,3 +1,3 @@ -patches: +patchesStrategicMerge: - frontend-deployment.yaml - frontend-service.yaml diff --git a/multi-cluster/helm-kustomize/overlays/test/kustomization.yaml b/multi-cluster/helm-kustomize/overlays/test/kustomization.yaml index cae2c12..226b12a 100644 --- a/multi-cluster/helm-kustomize/overlays/test/kustomization.yaml +++ b/multi-cluster/helm-kustomize/overlays/test/kustomization.yaml @@ -1,2 +1,2 @@ -patches: +patchesStrategicMerge: - frontend-deployment.yaml diff --git a/multi-cluster/kustomize/overlays/dev/kustomization.yaml b/multi-cluster/kustomize/overlays/dev/kustomization.yaml index 3e70f16..a9f9b3d 100644 --- a/multi-cluster/kustomize/overlays/dev/kustomization.yaml +++ b/multi-cluster/kustomize/overlays/dev/kustomization.yaml @@ -1,5 +1,5 @@ resources: - ../../base -patches: +patchesStrategicMerge: - redis-slave-deployment.yaml - redis-slave-service.yaml diff --git a/multi-cluster/kustomize/overlays/prod/kustomization.yaml b/multi-cluster/kustomize/overlays/prod/kustomization.yaml index d5efb3b..9cc26a8 100644 --- a/multi-cluster/kustomize/overlays/prod/kustomization.yaml +++ b/multi-cluster/kustomize/overlays/prod/kustomization.yaml @@ -1,5 +1,5 @@ resources: - ../../base -patches: +patchesStrategicMerge: - frontend-deployment.yaml - frontend-service.yaml diff --git a/multi-cluster/kustomize/overlays/test/kustomization.yaml b/multi-cluster/kustomize/overlays/test/kustomization.yaml index aa9cad8..924a468 100644 --- a/multi-cluster/kustomize/overlays/test/kustomization.yaml +++ b/multi-cluster/kustomize/overlays/test/kustomization.yaml @@ -1,4 +1,4 @@ resources: - ../../base -patches: +patchesStrategicMerge: - frontend-deployment.yaml diff --git a/single-cluster/helm-kustomize/overlays/dev/kustomization.yaml b/single-cluster/helm-kustomize/overlays/dev/kustomization.yaml index c3759a0..14211d6 100644 --- a/single-cluster/helm-kustomize/overlays/dev/kustomization.yaml +++ b/single-cluster/helm-kustomize/overlays/dev/kustomization.yaml @@ -1,3 +1,3 @@ -patches: +patchesStrategicMerge: - redis-slave-deployment.yaml - redis-slave-service.yaml diff --git a/single-cluster/kustomize/overlays/dev/kustomization.yaml b/single-cluster/kustomize/overlays/dev/kustomization.yaml index c428810..ee8993d 100644 --- a/single-cluster/kustomize/overlays/dev/kustomization.yaml +++ b/single-cluster/kustomize/overlays/dev/kustomization.yaml @@ -1,5 +1,5 @@ bases: - ../../base -patches: +patchesStrategicMerge: - redis-slave-deployment.yaml - redis-slave-service.yaml diff --git a/tests/expected/multi-cluster/helm-kustomize/bundle.yaml b/tests/expected/multi-cluster/helm-kustomize/bundle.yaml index bcb6c6b..f205cbc 100644 --- a/tests/expected/multi-cluster/helm-kustomize/bundle.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/bundle.yaml @@ -231,7 +231,7 @@ spec: dir: overlays/prod name: fleet.yaml - content: | - patches: + patchesStrategicMerge: - redis-slave-deployment.yaml - redis-slave-service.yaml name: overlays/dev/kustomization.yaml @@ -269,7 +269,7 @@ spec: type: LoadBalancer name: overlays/prod/frontend-service.yaml - content: | - patches: + patchesStrategicMerge: - frontend-deployment.yaml - frontend-service.yaml name: overlays/prod/kustomization.yaml @@ -282,7 +282,7 @@ spec: replicas: 3 name: overlays/test/frontend-deployment.yaml - content: | - patches: + patchesStrategicMerge: - frontend-deployment.yaml name: overlays/test/kustomization.yaml targets: diff --git a/tests/expected/multi-cluster/kustomize/bundle.yaml b/tests/expected/multi-cluster/kustomize/bundle.yaml index a1825c2..a177597 100644 --- a/tests/expected/multi-cluster/kustomize/bundle.yaml +++ b/tests/expected/multi-cluster/kustomize/bundle.yaml @@ -219,7 +219,7 @@ spec: - content: | resources: - ../../base - patches: + patchesStrategicMerge: - redis-slave-deployment.yaml - redis-slave-service.yaml name: overlays/dev/kustomization.yaml @@ -259,7 +259,7 @@ spec: - content: | resources: - ../../base - patches: + patchesStrategicMerge: - frontend-deployment.yaml - frontend-service.yaml name: overlays/prod/kustomization.yaml @@ -274,7 +274,7 @@ spec: - content: | resources: - ../../base - patches: + patchesStrategicMerge: - frontend-deployment.yaml name: overlays/test/kustomization.yaml targets: diff --git a/tests/expected/single-cluster/helm-kustomize/bundle.yaml b/tests/expected/single-cluster/helm-kustomize/bundle.yaml index 75029f4..60c5a1d 100644 --- a/tests/expected/single-cluster/helm-kustomize/bundle.yaml +++ b/tests/expected/single-cluster/helm-kustomize/bundle.yaml @@ -198,7 +198,7 @@ spec: dir: overlays/dev name: fleet.yaml - content: | - patches: + patchesStrategicMerge: - redis-slave-deployment.yaml - redis-slave-service.yaml name: overlays/dev/kustomization.yaml diff --git a/tests/expected/single-cluster/kustomize/bundle.yaml b/tests/expected/single-cluster/kustomize/bundle.yaml index e1d9042..1798a9e 100644 --- a/tests/expected/single-cluster/kustomize/bundle.yaml +++ b/tests/expected/single-cluster/kustomize/bundle.yaml @@ -192,7 +192,7 @@ spec: - content: | bases: - ../../base - patches: + patchesStrategicMerge: - redis-slave-deployment.yaml - redis-slave-service.yaml name: overlays/dev/kustomization.yaml