Skip to content

Commit

Permalink
Revert "[kustomize] fix deprecated patch fields"
Browse files Browse the repository at this point in the history
This reverts commit d487fa2.
  • Loading branch information
squakez authored Jan 11, 2025
1 parent ca21806 commit aeffdb2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 17 deletions.
12 changes: 5 additions & 7 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:
- includeSelectors: true
pairs:
app: camel-k
- pairs:
app: camel-k
includeSelectors: true

resources:
- ../manager
Expand All @@ -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
Expand Down
10 changes: 2 additions & 8 deletions pkg/resources/config/samples/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
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
patches:
patchesJson6902:
- path: patches/basic.config.yaml
target:
group: scorecard.operatorframework.io
Expand All @@ -30,4 +30,4 @@ patches:
version: v1alpha3
kind: Configuration
name: config
# +kubebuilder:scaffold:patches
# +kubebuilder:scaffold:patchesJson6902

0 comments on commit aeffdb2

Please sign in to comment.