Skip to content
Permalink
Browse files

replace patches with patchesStrategicMerge

kustomize has deprecated `patches` fields for months. It should be
replaced by `patchesStrategicMerge`. This is not considered as a
breaking change since kustomize will auto convert patches if in old
format.
  • Loading branch information...
mengqiy committed Jul 20, 2019
1 parent 7be1de3 commit 394decccf8a30dfd38309aca760189cd0f83f335
1 go.sum
@@ -68,4 +68,3 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

@@ -69,7 +69,7 @@ bases:
- ../rbac
- ../manager
patches:
patchesStrategicMerge:
- manager_image_patch.yaml
# Protect the /metrics endpoint by putting it behind auth.
# Only one of manager_auth_proxy_patch.yaml and
@@ -81,7 +81,7 @@ var kustomizationTemplate = fmt.Sprintf(`# This kustomization.yaml is not intend
resources:
%s
patches:
patchesStrategicMerge:
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
# patches here are for enabling the conversion webhook for each CRD
%s
@@ -74,7 +74,7 @@ bases:
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
#- ../certmanager
patches:
patchesStrategicMerge:
# Protect the /metrics endpoint by putting it behind auth.
# Only one of manager_auth_proxy_patch.yaml and
# manager_prometheus_metrics_patch.yaml should be enabled.
@@ -16,7 +16,7 @@ bases:
- ../rbac
- ../manager

patches:
patchesStrategicMerge:
- manager_image_patch.yaml
# Protect the /metrics endpoint by putting it behind auth.
# Only one of manager_auth_proxy_patch.yaml and
@@ -7,7 +7,7 @@ resources:
- bases/crew.testproject.org_admirals.yaml
# +kubebuilder:scaffold:crdkustomizeresource

patches:
patchesStrategicMerge:
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
# patches here are for enabling the conversion webhook for each CRD
#- patches/webhook_in_captains.yaml
@@ -21,7 +21,7 @@ bases:
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
#- ../certmanager

patches:
patchesStrategicMerge:
# Protect the /metrics endpoint by putting it behind auth.
# Only one of manager_auth_proxy_patch.yaml and
# manager_prometheus_metrics_patch.yaml should be enabled.

0 comments on commit 394decc

Please sign in to comment.
You can’t perform that action at this time.