-
Notifications
You must be signed in to change notification settings - Fork 320
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix deprecated kustomize strategic merge (#3031)
- Loading branch information
1 parent
6a3f88f
commit 00fd857
Showing
20 changed files
with
100 additions
and
60 deletions.
There are no files selected for viewing
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/crd-partitions/default-partition-default/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../../bases/exportedservices-default | ||
| - ../../../bases/exportedservices-default | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/crd-partitions/default-partition-ns1/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../../bases/exportedservices-default | ||
| - ../../../bases/exportedservices-default | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
...ptance/tests/fixtures/cases/crd-partitions/secondary-partition-default/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../../bases/exportedservices-secondary | ||
| - ../../../bases/exportedservices-secondary | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/crd-partitions/secondary-partition-ns1/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../../bases/exportedservices-secondary | ||
| - ../../../bases/exportedservices-secondary | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/crd-peers/default-namespace/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../../bases/exportedservices-default | ||
| - ../../../bases/exportedservices-default | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/crd-peers/default/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../../bases/exportedservices-default | ||
| - ../../../bases/exportedservices-default | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/crd-peers/non-default-namespace/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../../bases/exportedservices-default | ||
| - ../../../bases/exportedservices-default | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/static-client-inject-multiport/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../bases/static-client | ||
| - ../../bases/static-client | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/static-client-inject/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../bases/static-client | ||
| - ../../bases/static-client | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/static-client-multi-dc/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../bases/static-client | ||
| - ../../bases/static-client | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/static-client-namespaces/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../bases/static-client | ||
| - ../../bases/static-client | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
...s/fixtures/cases/static-client-partitions/default-ns-default-partition/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../../bases/static-client | ||
| - ../../../bases/static-client | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
...nce/tests/fixtures/cases/static-client-partitions/default-ns-partition/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../../bases/static-client | ||
| - ../../../bases/static-client | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
...nce/tests/fixtures/cases/static-client-partitions/ns-default-partition/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../../bases/static-client | ||
| - ../../../bases/static-client | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/static-client-partitions/ns-partition/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../../bases/static-client | ||
| - ../../../bases/static-client | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/static-client-peers/default-namespace/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../../bases/static-client | ||
| - ../../../bases/static-client | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/static-client-peers/default/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../../bases/static-client | ||
| - ../../../bases/static-client | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/static-client-peers/non-default-namespace/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../../bases/static-client | ||
| - ../../../bases/static-client | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/static-client-tproxy/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../bases/static-client | ||
| - ../../bases/static-client | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |
8 changes: 5 additions & 3 deletions
8
acceptance/tests/fixtures/cases/static-server-inject/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| resources: | ||
| - ../../bases/static-server | ||
| - ../../bases/static-server | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch.yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| patches: | ||
| - path: patch.yaml |