From 7e28620824526549098cbf560cd4613cc07d80b7 Mon Sep 17 00:00:00 2001 From: Ildar Valiullin Date: Sat, 19 Aug 2023 03:21:35 +0300 Subject: [PATCH] Renamed patches -> patchesStrategicMerge Signed-off-by: Ildar Valiullin --- config/crd/kustomization.yaml | 2 +- config/default/overlays/dev/kustomization.yaml | 2 +- config/default/overlays/kind/kustomization.yaml | 2 +- config/rbac/kustomization.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 399d55bb3..3e30e2564 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -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. diff --git a/config/default/overlays/dev/kustomization.yaml b/config/default/overlays/dev/kustomization.yaml index c6c72fae1..b74ebbafa 100644 --- a/config/default/overlays/dev/kustomization.yaml +++ b/config/default/overlays/dev/kustomization.yaml @@ -10,5 +10,5 @@ namespace: rabbitmq-system resources: - ../../base -patches: +patchesStrategicMerge: - manager_image_patch.yaml diff --git a/config/default/overlays/kind/kustomization.yaml b/config/default/overlays/kind/kustomization.yaml index c6c72fae1..b74ebbafa 100644 --- a/config/default/overlays/kind/kustomization.yaml +++ b/config/default/overlays/kind/kustomization.yaml @@ -10,5 +10,5 @@ namespace: rabbitmq-system resources: - ../../base -patches: +patchesStrategicMerge: - manager_image_patch.yaml diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml index 96940d96f..182e61bed 100644 --- a/config/rbac/kustomization.yaml +++ b/config/rbac/kustomization.yaml @@ -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