Skip to content

Backport of removed deprecated patchesStrategicMerge into release/1.0.x #2895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hc-github-team-consul-core wants to merge 1 commit into from
Closed

Backport of removed deprecated patchesStrategicMerge into release/1.0.x #2895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions acceptance/tests/fixtures/cases/crd-partitions/default-partition-default/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/crd-partitions/default-partition-ns1/kustomization.yaml
View file
Open in desktop
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 ...ptance/tests/fixtures/cases/crd-partitions/secondary-partition-default/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/crd-partitions/secondary-partition-ns1/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/crd-peers/default-namespace/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/crd-peers/default/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/crd-peers/non-default-namespace/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/static-client-inject-multiport/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/static-client-inject/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/static-client-multi-dc/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/static-client-namespaces/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/static-client-openshift-inject/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
# SPDX-License-Identifier: MPL-2.0

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 acceptance/tests/fixtures/cases/static-client-openshift-tproxy/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
# SPDX-License-Identifier: MPL-2.0

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 ...s/fixtures/cases/static-client-partitions/default-ns-default-partition/kustomization.yaml
View file
Open in desktop
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 ...nce/tests/fixtures/cases/static-client-partitions/default-ns-partition/kustomization.yaml
View file
Open in desktop
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 ...nce/tests/fixtures/cases/static-client-partitions/ns-default-partition/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/static-client-partitions/ns-partition/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/static-client-peers/default-namespace/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/static-client-peers/default/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/static-client-peers/non-default-namespace/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/static-client-tproxy/kustomization.yaml
View file
Open in desktop
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 acceptance/tests/fixtures/cases/static-server-inject/kustomization.yaml
View file
Open in desktop
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
8 changes: 5 additions & 3 deletions acceptance/tests/fixtures/cases/static-server-openshift/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
# SPDX-License-Identifier: MPL-2.0

resources:
- ../../bases/static-server
- ../../bases/static-server

patchesStrategicMerge:
- patch.yaml
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
patches:
- path: patch.yaml