Merge pull request #671 from monopole/fixCommentNits

Fix some comments and format nits.

pkg/target/customconfig_test.go

@@ -155,7 +155,8 @@ func TestCustomConfigWithDefaultOverspecification(t *testing.T) {
 	makeBaseReferencingCustomConfig(th)
 	th.writeDefaultConfigs("/app/base/config/defaults.yaml")
 	// Specifying namePrefix here conflicts with (is the same as)
-	// the defaults written above.
+	// the defaults written above.  This is intentional in the
+	// test to assure duplicate config doesn't cause problems.
 	th.writeF("/app/base/config/custom.yaml", `
 namePrefix:
 - path: metadata/name

pkg/target/kusttarget.go

@@ -97,8 +97,9 @@ func unmarshal(y []byte, o interface{}) error {
 	return dec.Decode(o)
 }
 
-// Maybe switch to the false path permanently (desired by #606),
-// or expose this as a CLI flag.
+// TODO(#6060) Maybe switch to the false path permanently
+// (desired by #606), or expose this as a new customization
+// directive.
 const demandExplicitConfig = true
 
 func makeTransformerConfig(

pkg/transformers/config/transformerconfig.go

@@ -68,12 +68,14 @@ func (t *TransformerConfig) AddAnnotationFieldSpec(fs FieldSpec) (err error) {
 }
 
 // AddNamereferenceFieldSpec adds a NameBackReferences to NameReference
-func (t *TransformerConfig) AddNamereferenceFieldSpec(nbrs NameBackReferences) (err error) {
+func (t *TransformerConfig) AddNamereferenceFieldSpec(
+	nbrs NameBackReferences) (err error) {
 	t.NameReference, err = t.NameReference.mergeOne(nbrs)
 	return err
 }
 
-// Merge merges two TransformerConfigs objects into a new TransformerConfig object
+// Merge merges two TransformerConfigs objects into
+// a new TransformerConfig object
 func (t *TransformerConfig) Merge(input *TransformerConfig) (
 	merged *TransformerConfig, err error) {
 	if input == nil {
@@ -92,7 +94,8 @@ func (t *TransformerConfig) Merge(input *TransformerConfig) (
 	if err != nil {
 		return nil, err
 	}
-	merged.CommonAnnotations, err = t.CommonAnnotations.mergeAll(input.CommonAnnotations)
+	merged.CommonAnnotations, err = t.CommonAnnotations.mergeAll(
+		input.CommonAnnotations)
 	if err != nil {
 		return nil, err
 	}