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 d487fa294 [kustomize] fix deprecated patch fields
d487fa294 is described below
commit d487fa2949ab0ac36354c0a10a7b6c5f07e88ed7
Author: Pranav Singh <pranavsing...@hotmail.com>
AuthorDate: Sat Dec 7 19:50:50 2024 +0530
[kustomize] fix deprecated patch fields
Signed-off-by: Pranav Singh <pranavsing...@hotmail.com>
---
pkg/resources/config/manifests/kustomization.yaml | 12 +++++++-----
pkg/resources/config/samples/kustomization.yaml | 10 ++++++++--
pkg/resources/config/scorecard/kustomization.yaml | 4 ++--
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/pkg/resources/config/manifests/kustomization.yaml
b/pkg/resources/config/manifests/kustomization.yaml
index 1af136a8a..c382591f9 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:
- - pairs:
- app: camel-k
- includeSelectors: true
+- includeSelectors: true
+ pairs:
+ app: camel-k
resources:
- ../manager
@@ -31,8 +31,10 @@ resources:
- ../rbac
- ../rbac/namespaced
-patchesStrategicMerge:
-- patch-delete-user-cluster-role.yaml
+patches:
+ - path: patch-delete-user-cluster-role.yaml
+ target:
+ kind: ClusterRole
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 b7fbc0c90..550537dbe 100644
--- a/pkg/resources/config/samples/kustomization.yaml
+++ b/pkg/resources/config/samples/kustomization.yaml
@@ -20,6 +20,10 @@
# 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
@@ -30,5 +34,7 @@ resources:
- bases/camel_v1_kamelet.yaml
- bases/camel_v1_pipe.yaml
-patchesStrategicMerge:
-- patch-integration-platform.yaml
+patches:
+ - path: patch-integration-platform.yaml
+ target:
+ kind: IntegrationPlatform
diff --git a/pkg/resources/config/scorecard/kustomization.yaml
b/pkg/resources/config/scorecard/kustomization.yaml
index 7fbd50703..b9cea2ad2 100644
--- a/pkg/resources/config/scorecard/kustomization.yaml
+++ b/pkg/resources/config/scorecard/kustomization.yaml
@@ -17,7 +17,7 @@
resources:
- bases/config.yaml
-patchesJson6902:
+patches:
- path: patches/basic.config.yaml
target:
group: scorecard.operatorframework.io
@@ -30,4 +30,4 @@ patchesJson6902:
version: v1alpha3
kind: Configuration
name: config
-# +kubebuilder:scaffold:patchesJson6902
+# +kubebuilder:scaffold:patches
