This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 00c939584 Revert "[kustomize] fix deprecated patch fields"
00c939584 is described below
commit 00c939584b14e8934c947bbe4ec4cc4089c487e8
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Sat Jan 11 09:31:35 2025 +0100
Revert "[kustomize] fix deprecated patch fields"
This reverts commit d487fa2949ab0ac36354c0a10a7b6c5f07e88ed7.
---
pkg/resources/config/manifests/kustomization.yaml | 12 +++++-------
pkg/resources/config/samples/kustomization.yaml | 10 ++--------
pkg/resources/config/scorecard/kustomization.yaml | 4 ++--
3 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/pkg/resources/config/manifests/kustomization.yaml
b/pkg/resources/config/manifests/kustomization.yaml
index c382591f9..1af136a8a 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 550537dbe..b7fbc0c90 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 b9cea2ad2..7fbd50703 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
