Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[chore] Fix Kustomize Fields" #6023

Merged
merged 1 commit into from
Jan 11, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Revert "[kustomize] fix deprecated patch fields"
This reverts commit d487fa2.
squakez authored Jan 11, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit aeffdb201039a9ca7bce1b9ce91fb4e5a440bd37
12 changes: 5 additions & 7 deletions pkg/resources/config/manifests/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 2 additions & 8 deletions pkg/resources/config/samples/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions pkg/resources/config/scorecard/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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