Skip to content

Commit

Permalink
[kustomize] fix deprecated patch fields
Browse files Browse the repository at this point in the history
Signed-off-by: Pranav Singh <[email protected]>
  • Loading branch information
theBeginner86 committed Dec 7, 2024
1 parent 6c0bba9 commit d2a36f0
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 9 deletions.
12 changes: 7 additions & 5 deletions pkg/resources/config/manifests/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 8 additions & 2 deletions pkg/resources/config/samples/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions pkg/resources/config/scorecard/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

resources:
- bases/config.yaml
patchesJson6902:
patches:
- path: patches/basic.config.yaml
target:
group: scorecard.operatorframework.io
Expand All @@ -30,4 +30,4 @@ patchesJson6902:
version: v1alpha3
kind: Configuration
name: config
# +kubebuilder:scaffold:patchesJson6902
# +kubebuilder:scaffold:patches

0 comments on commit d2a36f0

Please sign in to comment.