Commit 394decc Mengqi Yu
committed
1 parent 7be1de3 commit 394decc Copy full SHA for 394decc
File tree 7 files changed +6
-7
lines changed
gopath/src/project/config/default
7 files changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -68,4 +68,3 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
68
68
gopkg.in/yaml.v2 v2.2.1 /go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI =
69
69
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw =
70
70
gopkg.in/yaml.v2 v2.2.2 /go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI =
71
-
Original file line number Diff line number Diff line change 69
69
- ../rbac
70
70
- ../manager
71
71
72
- patches :
72
+ patchesStrategicMerge :
73
73
- manager_image_patch.yaml
74
74
# Protect the /metrics endpoint by putting it behind auth.
75
75
# Only one of manager_auth_proxy_patch.yaml and
Original file line number Diff line number Diff line change @@ -81,7 +81,7 @@ var kustomizationTemplate = fmt.Sprintf(`# This kustomization.yaml is not intend
81
81
resources:
82
82
%s
83
83
84
- patches :
84
+ patchesStrategicMerge :
85
85
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
86
86
# patches here are for enabling the conversion webhook for each CRD
87
87
%s
Original file line number Diff line number Diff line change 74
74
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
75
75
#- ../certmanager
76
76
77
- patches :
77
+ patchesStrategicMerge :
78
78
# Protect the /metrics endpoint by putting it behind auth.
79
79
# Only one of manager_auth_proxy_patch.yaml and
80
80
# manager_prometheus_metrics_patch.yaml should be enabled.
Original file line number Diff line number Diff line change 16
16
- ../rbac
17
17
- ../manager
18
18
19
- patches :
19
+ patchesStrategicMerge :
20
20
- manager_image_patch.yaml
21
21
# Protect the /metrics endpoint by putting it behind auth.
22
22
# Only one of manager_auth_proxy_patch.yaml and
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ resources:
7
7
- bases/crew.testproject.org_admirals.yaml
8
8
# +kubebuilder:scaffold:crdkustomizeresource
9
9
10
- patches :
10
+ patchesStrategicMerge :
11
11
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
12
12
# patches here are for enabling the conversion webhook for each CRD
13
13
# - patches/webhook_in_captains.yaml
Original file line number Diff line number Diff line change 21
21
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
22
22
# - ../certmanager
23
23
24
- patches :
24
+ patchesStrategicMerge :
25
25
# Protect the /metrics endpoint by putting it behind auth.
26
26
# Only one of manager_auth_proxy_patch.yaml and
27
27
# manager_prometheus_metrics_patch.yaml should be enabled.
You can’t perform that action at this time.
0 commit comments