diff --git a/pkg/resources/config/manifests/kustomization.yaml b/pkg/resources/config/manifests/kustomization.yaml index c382591f96..1af136a8a1 100644 --- a/pkg/resources/config/manifests/kustomization.yaml +++ b/pkg/resources/config/manifests/kustomization.yaml @@ -19,9 +19,9 @@ kind: Kustomization # Labels to add to all resources and selectors. labels: -- includeSelectors: true - pairs: - app: camel-k + - pairs: + app: camel-k + includeSelectors: true resources: - ../manager @@ -31,10 +31,8 @@ resources: - ../rbac - ../rbac/namespaced -patches: - - path: patch-delete-user-cluster-role.yaml - target: - kind: ClusterRole +patchesStrategicMerge: +- patch-delete-user-cluster-role.yaml images: - name: docker.io/apache/camel-k newName: docker.io/apache/camel-k diff --git a/pkg/resources/config/samples/kustomization.yaml b/pkg/resources/config/samples/kustomization.yaml index 550537dbee..b7fbc0c90a 100644 --- a/pkg/resources/config/samples/kustomization.yaml +++ b/pkg/resources/config/samples/kustomization.yaml @@ -20,10 +20,6 @@ # customizes the integration platform custom resource # Edit the patch manually to add required configuration # - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - resources: - bases/camel_v1_integrationplatform.yaml - bases/camel_v1_integrationprofile.yaml @@ -34,7 +30,5 @@ resources: - bases/camel_v1_kamelet.yaml - bases/camel_v1_pipe.yaml -patches: - - path: patch-integration-platform.yaml - target: - kind: IntegrationPlatform +patchesStrategicMerge: +- patch-integration-platform.yaml diff --git a/pkg/resources/config/scorecard/kustomization.yaml b/pkg/resources/config/scorecard/kustomization.yaml index b9cea2ad2a..7fbd50703c 100644 --- a/pkg/resources/config/scorecard/kustomization.yaml +++ b/pkg/resources/config/scorecard/kustomization.yaml @@ -17,7 +17,7 @@ resources: - bases/config.yaml -patches: +patchesJson6902: - path: patches/basic.config.yaml target: group: scorecard.operatorframework.io @@ -30,4 +30,4 @@ patches: version: v1alpha3 kind: Configuration name: config -# +kubebuilder:scaffold:patches +# +kubebuilder:scaffold:patchesJson6902