Skip to content

Commit 00c9395

Browse files
committed
Revert "[kustomize] fix deprecated patch fields"
This reverts commit d487fa2.
1 parent a91f569 commit 00c9395

File tree

3 files changed

+9
-17
lines changed

3 files changed

+9
-17
lines changed

pkg/resources/config/manifests/kustomization.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ kind: Kustomization
1919

2020
# Labels to add to all resources and selectors.
2121
labels:
22-
- includeSelectors: true
23-
pairs:
24-
app: camel-k
22+
- pairs:
23+
app: camel-k
24+
includeSelectors: true
2525

2626
resources:
2727
- ../manager
@@ -31,10 +31,8 @@ resources:
3131
- ../rbac
3232
- ../rbac/namespaced
3333

34-
patches:
35-
- path: patch-delete-user-cluster-role.yaml
36-
target:
37-
kind: ClusterRole
34+
patchesStrategicMerge:
35+
- patch-delete-user-cluster-role.yaml
3836
images:
3937
- name: docker.io/apache/camel-k
4038
newName: docker.io/apache/camel-k

pkg/resources/config/samples/kustomization.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
# customizes the integration platform custom resource
2121
# Edit the patch manually to add required configuration
2222
#
23-
24-
apiVersion: kustomize.config.k8s.io/v1beta1
25-
kind: Kustomization
26-
2723
resources:
2824
- bases/camel_v1_integrationplatform.yaml
2925
- bases/camel_v1_integrationprofile.yaml
@@ -34,7 +30,5 @@ resources:
3430
- bases/camel_v1_kamelet.yaml
3531
- bases/camel_v1_pipe.yaml
3632

37-
patches:
38-
- path: patch-integration-platform.yaml
39-
target:
40-
kind: IntegrationPlatform
33+
patchesStrategicMerge:
34+
- patch-integration-platform.yaml

pkg/resources/config/scorecard/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
resources:
1919
- bases/config.yaml
20-
patches:
20+
patchesJson6902:
2121
- path: patches/basic.config.yaml
2222
target:
2323
group: scorecard.operatorframework.io
@@ -30,4 +30,4 @@ patches:
3030
version: v1alpha3
3131
kind: Configuration
3232
name: config
33-
# +kubebuilder:scaffold:patches
33+
# +kubebuilder:scaffold:patchesJson6902

0 commit comments

Comments
 (0)