File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -327,7 +327,7 @@ func (f Filter) selectReferral(
327
327
}
328
328
candidates = doSieve (candidates , prefixSuffixEquals (f .Referrer , true ))
329
329
if len (candidates ) > 1 {
330
- candidates = doSieve (candidates , prefixSuffixEquals (f .Referrer , false ))
330
+ candidates = doSieve (candidates , prefixSuffixEquals (f .Referrer , false ))
331
331
}
332
332
if len (candidates ) == 1 {
333
333
return candidates [0 ], nil
Original file line number Diff line number Diff line change @@ -594,7 +594,7 @@ metadata:
594
594
595
595
// Regression test for https://github.com/kubernetes-sigs/kustomize/issues/5047
596
596
func TestPrefixSuffix (t * testing.T ) {
597
- th := kusttest_test .MakeHarness (t )
597
+ th := kusttest_test .MakeHarness (t )
598
598
th .WriteF ("kustomization.yaml" , `
599
599
resources:
600
600
- a
@@ -647,7 +647,6 @@ resources:
647
647
nameSuffix: api
648
648
` )
649
649
650
-
651
650
m := th .Run ("." , th .MakeDefaultOptions ())
652
651
th .AssertActualEqualsExpected (m , `
653
652
apiVersion: apps/v1
@@ -690,7 +689,7 @@ metadata:
690
689
691
690
// Regression test for https://github.com/kubernetes-sigs/kustomize/issues/5047
692
691
func TestPrefixSuffix2 (t * testing.T ) {
693
- th := kusttest_test .MakeHarness (t )
692
+ th := kusttest_test .MakeHarness (t )
694
693
th .WriteF ("kustomization.yaml" , `
695
694
resources:
696
695
- a
@@ -734,7 +733,6 @@ configMapGenerator:
734
733
- name: "-example-configmap"
735
734
` )
736
735
737
-
738
736
m := th .Run ("." , th .MakeDefaultOptions ())
739
737
th .AssertActualEqualsExpected (m , `
740
738
apiVersion: apps/v1
Original file line number Diff line number Diff line change @@ -157,7 +157,9 @@ func (r *Resource) DeepCopy() *Resource {
157
157
// the resource.
158
158
// TODO: move to RNode, use GetMeta to improve performance.
159
159
// TODO: make a version of mergeStringMaps that is build-annotation aware
160
- // to avoid repeatedly setting refby and genargs annotations
160
+ //
161
+ // to avoid repeatedly setting refby and genargs annotations
162
+ //
161
163
// Must remove the kustomize bit at the end.
162
164
func (r * Resource ) CopyMergeMetaDataFieldsFrom (other * Resource ) error {
163
165
if err := r .SetLabels (
You can’t perform that action at this time.
0 commit comments