kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #671 from monopole/fixCommentNits

Browse Source 
Fix some comments and format nits.
This commit is contained in:
Jeff Regan
2018-12-30 07:44:39 -08:00
committed by GitHub
parent 80f3afc1ff 93ad371400
commit 746c7b0b5b
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/target/customconfig_test.go
View File

@@ -155,7 +155,8 @@ func TestCustomConfigWithDefaultOverspecification(t *testing.T) {
makeBaseReferencingCustomConfig(th) makeBaseReferencingCustomConfig(th)
th.writeDefaultConfigs("/app/base/config/defaults.yaml") th.writeDefaultConfigs("/app/base/config/defaults.yaml")
// Specifying namePrefix here conflicts with (is the same as) // 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", ` th.writeF("/app/base/config/custom.yaml", `
namePrefix: namePrefix:
- path: metadata/name - path: metadata/name

5
pkg/target/kusttarget.go
View File

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

9
pkg/transformers/config/transformerconfig.go
View File

@@ -68,12 +68,14 @@ func (t *TransformerConfig) AddAnnotationFieldSpec(fs FieldSpec) (err error) {
} }
// AddNamereferenceFieldSpec adds a NameBackReferences to NameReference // 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) t.NameReference, err = t.NameReference.mergeOne(nbrs)
return err 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) ( func (t *TransformerConfig) Merge(input *TransformerConfig) (
merged *TransformerConfig, err error) { merged *TransformerConfig, err error) {
if input == nil { if input == nil {
@@ -92,7 +94,8 @@ func (t *TransformerConfig) Merge(input *TransformerConfig) (
if err != nil { if err != nil {
return nil, err return nil, err
} }
merged.CommonAnnotations, err = t.CommonAnnotations.mergeAll(input.CommonAnnotations) merged.CommonAnnotations, err = t.CommonAnnotations.mergeAll(
input.CommonAnnotations)
if err != nil { if err != nil {
return nil, err return nil, err
} }