zhaoxiaopeng/fleet-examples
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41 from weyfonk/kustomize-drop-legacy-patching

Browse Source 
Use `patchesStrategicMerge` for Kustomize patching
This commit is contained in:
Corentin Néau
2023-10-03 17:52:06 +02:00
committed by GitHub
parent 23790cad75 86f321d37b
commit 704573591a
12 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
multi-cluster/helm-kustomize/overlays/dev/kustomization.yaml
View File

@@ -1,3 +1,3 @@
patches: patchesStrategicMerge:
- redis-slave-deployment.yaml - redis-slave-deployment.yaml
- redis-slave-service.yaml - redis-slave-service.yaml

2
multi-cluster/helm-kustomize/overlays/prod/kustomization.yaml
View File

@@ -1,3 +1,3 @@
patches: patchesStrategicMerge:
- frontend-deployment.yaml - frontend-deployment.yaml
- frontend-service.yaml - frontend-service.yaml

2
multi-cluster/helm-kustomize/overlays/test/kustomization.yaml
View File

@@ -1,2 +1,2 @@
patches: patchesStrategicMerge:
- frontend-deployment.yaml - frontend-deployment.yaml

2
multi-cluster/kustomize/overlays/dev/kustomization.yaml
View File

@@ -1,5 +1,5 @@
resources: resources:
- ../../base - ../../base
patches: patchesStrategicMerge:
- redis-slave-deployment.yaml - redis-slave-deployment.yaml
- redis-slave-service.yaml - redis-slave-service.yaml

2
multi-cluster/kustomize/overlays/prod/kustomization.yaml
View File

@@ -1,5 +1,5 @@
resources: resources:
- ../../base - ../../base
patches: patchesStrategicMerge:
- frontend-deployment.yaml - frontend-deployment.yaml
- frontend-service.yaml - frontend-service.yaml

2
multi-cluster/kustomize/overlays/test/kustomization.yaml
View File

@@ -1,4 +1,4 @@
resources: resources:
- ../../base - ../../base
patches: patchesStrategicMerge:
- frontend-deployment.yaml - frontend-deployment.yaml

2
single-cluster/helm-kustomize/overlays/dev/kustomization.yaml
View File

@@ -1,3 +1,3 @@
patches: patchesStrategicMerge:
- redis-slave-deployment.yaml - redis-slave-deployment.yaml
- redis-slave-service.yaml - redis-slave-service.yaml

2
single-cluster/kustomize/overlays/dev/kustomization.yaml
View File

@@ -1,5 +1,5 @@
bases: bases:
- ../../base - ../../base
patches: patchesStrategicMerge:
- redis-slave-deployment.yaml - redis-slave-deployment.yaml
- redis-slave-service.yaml - redis-slave-service.yaml

6
tests/expected/multi-cluster/helm-kustomize/bundle.yaml
View File

@@ -231,7 +231,7 @@ spec:
dir: overlays/prod dir: overlays/prod
name: fleet.yaml name: fleet.yaml
- content: | - content: |
patches: patchesStrategicMerge:
- redis-slave-deployment.yaml - redis-slave-deployment.yaml
- redis-slave-service.yaml - redis-slave-service.yaml
name: overlays/dev/kustomization.yaml name: overlays/dev/kustomization.yaml
@@ -269,7 +269,7 @@ spec:
type: LoadBalancer type: LoadBalancer
name: overlays/prod/frontend-service.yaml name: overlays/prod/frontend-service.yaml
- content: | - content: |
patches: patchesStrategicMerge:
- frontend-deployment.yaml - frontend-deployment.yaml
- frontend-service.yaml - frontend-service.yaml
name: overlays/prod/kustomization.yaml name: overlays/prod/kustomization.yaml
@@ -282,7 +282,7 @@ spec:
replicas: 3 replicas: 3
name: overlays/test/frontend-deployment.yaml name: overlays/test/frontend-deployment.yaml
- content: | - content: |
patches: patchesStrategicMerge:
- frontend-deployment.yaml - frontend-deployment.yaml
name: overlays/test/kustomization.yaml name: overlays/test/kustomization.yaml
targets: targets:

6
tests/expected/multi-cluster/kustomize/bundle.yaml
View File

@@ -219,7 +219,7 @@ spec:
- content: | - content: |
resources: resources:
- ../../base - ../../base
patches: patchesStrategicMerge:
- redis-slave-deployment.yaml - redis-slave-deployment.yaml
- redis-slave-service.yaml - redis-slave-service.yaml
name: overlays/dev/kustomization.yaml name: overlays/dev/kustomization.yaml
@@ -259,7 +259,7 @@ spec:
- content: | - content: |
resources: resources:
- ../../base - ../../base
patches: patchesStrategicMerge:
- frontend-deployment.yaml - frontend-deployment.yaml
- frontend-service.yaml - frontend-service.yaml
name: overlays/prod/kustomization.yaml name: overlays/prod/kustomization.yaml
@@ -274,7 +274,7 @@ spec:
- content: | - content: |
resources: resources:
- ../../base - ../../base
patches: patchesStrategicMerge:
- frontend-deployment.yaml - frontend-deployment.yaml
name: overlays/test/kustomization.yaml name: overlays/test/kustomization.yaml
targets: targets:

2
tests/expected/single-cluster/helm-kustomize/bundle.yaml
View File

@@ -198,7 +198,7 @@ spec:
dir: overlays/dev dir: overlays/dev
name: fleet.yaml name: fleet.yaml
- content: | - content: |
patches: patchesStrategicMerge:
- redis-slave-deployment.yaml - redis-slave-deployment.yaml
- redis-slave-service.yaml - redis-slave-service.yaml
name: overlays/dev/kustomization.yaml name: overlays/dev/kustomization.yaml

2
tests/expected/single-cluster/kustomize/bundle.yaml
View File

@@ -192,7 +192,7 @@ spec:
- content: | - content: |
bases: bases:
- ../../base - ../../base
patches: patchesStrategicMerge:
- redis-slave-deployment.yaml - redis-slave-deployment.yaml
- redis-slave-service.yaml - redis-slave-service.yaml
name: overlays/dev/kustomization.yaml name: overlays/dev/kustomization.yaml