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
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
patches:
|
||||
patchesStrategicMerge:
|
||||
- redis-slave-deployment.yaml
|
||||
- redis-slave-service.yaml
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
patches:
|
||||
patchesStrategicMerge:
|
||||
- frontend-deployment.yaml
|
||||
- frontend-service.yaml
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
patches:
|
||||
patchesStrategicMerge:
|
||||
- frontend-deployment.yaml
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
resources:
|
||||
- ../../base
|
||||
patches:
|
||||
patchesStrategicMerge:
|
||||
- redis-slave-deployment.yaml
|
||||
- redis-slave-service.yaml
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
resources:
|
||||
- ../../base
|
||||
patches:
|
||||
patchesStrategicMerge:
|
||||
- frontend-deployment.yaml
|
||||
- frontend-service.yaml
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
resources:
|
||||
- ../../base
|
||||
patches:
|
||||
patchesStrategicMerge:
|
||||
- frontend-deployment.yaml
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
patches:
|
||||
patchesStrategicMerge:
|
||||
- redis-slave-deployment.yaml
|
||||
- redis-slave-service.yaml
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
bases:
|
||||
- ../../base
|
||||
patches:
|
||||
patchesStrategicMerge:
|
||||
- redis-slave-deployment.yaml
|
||||
- redis-slave-service.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:
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -192,7 +192,7 @@ spec:
|
||||
- content: |
|
||||
bases:
|
||||
- ../../base
|
||||
patches:
|
||||
patchesStrategicMerge:
|
||||
- redis-slave-deployment.yaml
|
||||
- redis-slave-service.yaml
|
||||
name: overlays/dev/kustomization.yaml
|
||||
|
||||
Reference in New Issue
Block a user