Skip to content

Renamed patches -> patchesStrategicMerge #1430

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

Merged
Zerpet merged 1 commit into from
Aug 22, 2023
Merged

Renamed patches -> patchesStrategicMerge #1430

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
2 changes: 1 addition & 1 deletion config/crd/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ resources:
- bases/rabbitmq.com_rabbitmqclusters.yaml
# +kubebuilder:scaffold:kustomizeresource

patches:
patchesStrategicMerge:
- patches/crd_labels_patch.yaml

# the following config is for teaching kustomize how to do kustomization for CRDs.
Expand Down
2 changes: 1 addition & 1 deletion config/default/overlays/dev/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ namespace: rabbitmq-system
resources:
- ../../base

patches:
patchesStrategicMerge:
- manager_image_patch.yaml
2 changes: 1 addition & 1 deletion config/default/overlays/kind/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ namespace: rabbitmq-system
resources:
- ../../base

patches:
patchesStrategicMerge:
- manager_image_patch.yaml
2 changes: 1 addition & 1 deletion config/rbac/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ resources:
- leader_election_role_binding.yaml
- service_binding_cluster_role.yaml

patches:
patchesStrategicMerge:
# the following patch file adds labels to the operator ClusterRole definition in role.yaml
# role.yaml is a generated file, and adding labels directly to the file does not work.
- role_labels_patch.yaml