Skip to content

Commit a4854c7

Browse files
ofanmergify[bot]
authored andcommitted
kustomize: replace patchesStrategicMerge with patches
kustomize v5.0.0 deprecated patchesStrategicMerge, it's renamed to patches. Normally it just gives a warning, tools like Argocd will treat this as error. https://kubectl.docs.kubernetes.io/references/kustomize/kustomization/patchesstrategicmerge/ Signed-off-by: Ryan Feng <[email protected]>
1 parent 1e1e9d7 commit a4854c7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

config/crd/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resources:
66
- bases/samba-operator.samba.org_smbsecurityconfigs.yaml
77
- bases/samba-operator.samba.org_smbcommonconfigs.yaml
88
# +kubebuilder:scaffold:crdkustomizeresource
9-
patchesStrategicMerge:
9+
patches:
1010
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
1111
# patches here are for enabling the conversion webhook for each CRD
1212
#- patches/webhook_in_smbshares.yaml

config/manager-full/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
44
- ../manager
5-
patchesStrategicMerge:
5+
patches:
66
# Protect the /metrics endpoint by putting it behind auth.
77
# If you want your controller-manager to expose the /metrics
88
# endpoint w/o any authn/z, please comment the following line.
9-
- auth_proxy_patch.yaml
9+
- path: auth_proxy_patch.yaml
1010

1111
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
1212
# crd/kustomization.yaml

0 commit comments

Comments
 (0)