@@ -14,6 +14,7 @@ import (
1414 "sigs.k8s.io/kustomize/kyaml/fieldmeta"
1515 "sigs.k8s.io/kustomize/kyaml/fn/runtime/runtimeutil"
1616 "sigs.k8s.io/kustomize/kyaml/kio"
17+ "sigs.k8s.io/kustomize/kyaml/kio/filters"
1718 "sigs.k8s.io/kustomize/kyaml/kio/kioutil"
1819 "sigs.k8s.io/kustomize/kyaml/openapi"
1920 "sigs.k8s.io/kustomize/kyaml/sets"
@@ -55,7 +56,7 @@ type Result struct {
5556 Message string
5657}
5758
58- const SettersConfigFileName = "setters-config .yaml"
59+ const SettersConfigFileName = "setters.yaml"
5960
6061// Filter implements Fix as a yaml.Filter
6162func (s * Fix ) Filter (nodes []* yaml.RNode ) ([]* yaml.RNode , error ) {
@@ -230,15 +231,18 @@ func (s *Fix) FunctionsInPkg(nodes []*yaml.RNode, pkgPath string) []v1.Function
230231 }
231232 fnSpec := runtimeutil .GetFunctionSpec (node )
232233 if fnSpec != nil {
234+ // in order to make sure there is only one function config per file,
235+ // rename the file with the name(and hash(name)) of the function config resource
236+ fnFileName := fmt .Sprintf ("%s.yaml" , node .GetName ())
233237 // in v1, fn-config must be present in the package directory
234238 // so configPath must be just the file name
235- fnFileName := filepath .Base ( meta . Annotations [ kioutil . PathAnnotation ] )
239+ fnFilePath := filepath .Join ( pkgPath , fnFileName )
236240 res = append (res , v1.Function {
237241 Image : fnSpec .Container .Image ,
238242 ConfigPath : fnFileName ,
239243 })
240244 // move the fn-config to the top level directory of the package
241- meta .Annotations [kioutil .PathAnnotation ] = filepath . Join ( pkgPath , fnFileName )
245+ meta .Annotations [kioutil .PathAnnotation ] = fnFilePath
242246 delete (meta .Annotations , runtimeutil .FunctionAnnotationKey )
243247 delete (meta .Annotations , "config.k8s.io/function" )
244248 err = node .SetAnnotations (meta .Annotations )
@@ -278,7 +282,7 @@ func (s *Fix) FixKptfile(node *yaml.RNode, functions []v1.Function) (*yaml.RNode
278282 if kf .Pipeline != nil {
279283 for i , fn := range kf .Pipeline .Mutators {
280284 if strings .Contains (fn .Image , "apply-setters:v0.1" ) && len (fn .ConfigMap ) > 0 {
281- settersConfig , err := ConfigFromSetters (kf .Pipeline .Mutators [0 ].ConfigMap , settersConfigFilePath )
285+ settersConfig , err := SettersNodeFromSetters (kf .Pipeline .Mutators [0 ].ConfigMap , settersConfigFilePath )
282286 if err != nil {
283287 return node , err
284288 }
@@ -392,9 +396,9 @@ func (s *Fix) FixKptfile(node *yaml.RNode, functions []v1.Function) (*yaml.RNode
392396 if len (setters ) > 0 {
393397 fn := v1.Function {
394398 Image : "gcr.io/kpt-fn/apply-setters:v0.1" ,
395- ConfigPath : "setters-config.yaml" ,
399+ ConfigPath : SettersConfigFileName ,
396400 }
397- settersConfig , err := ConfigFromSetters (setters , settersConfigFilePath )
401+ settersConfig , err := SettersNodeFromSetters (setters , settersConfigFilePath )
398402 if err != nil {
399403 return node , err
400404 }
@@ -431,12 +435,12 @@ func (s *Fix) FixKptfile(node *yaml.RNode, functions []v1.Function) (*yaml.RNode
431435 return kNode , err
432436}
433437
434- // ConfigFromSetters returns the ConfigMap node with input setters in data field
435- func ConfigFromSetters (setters map [string ]string , path string ) (* yaml.RNode , error ) {
438+ // SettersNodeFromSetters returns the ConfigMap node with input setters in data field
439+ func SettersNodeFromSetters (setters map [string ]string , path string ) (* yaml.RNode , error ) {
436440 configNode , err := yaml .Parse (fmt .Sprintf (`apiVersion: v1
437441kind: ConfigMap
438442metadata:
439- name: setters-config
443+ name: setters
440444 annotations:
441445 %s: %s
442446 %s: "0"
@@ -452,28 +456,48 @@ metadata:
452456 sort .Strings (keys )
453457
454458 for _ , k := range keys {
455- v := setters [k ]
456- vNode , err := yaml .Parse (v )
459+ v , err := standardizeArrayValue (setters [k ])
457460 if err != nil {
458461 return nil , err
459462 }
460- if vNode .YNode ().Kind == yaml .SequenceNode {
461- // standardize array values to folded style
462- vNode .YNode ().Style = yaml .FoldedStyle
463- v , err = vNode .String ()
464- if err != nil {
465- return nil , err
466- }
463+ vNode := yaml .NewScalarRNode (v )
464+ if v == "" {
465+ vNode .YNode ().Style = yaml .DoubleQuotedStyle
467466 }
468-
469467 err = configNode .PipeE (
470468 yaml .LookupCreate (yaml .ScalarNode , "data" , k ),
471- yaml.FieldSetter {Value : yaml . NewScalarRNode ( v ) })
469+ yaml.FieldSetter {Value : vNode , OverrideStyle : true })
472470 if err != nil {
473471 return nil , err
474472 }
475473 }
476- return configNode , nil
474+ // format the created resource
475+ _ , err = filters.FormatFilter {UseSchema : true }.Filter ([]* yaml.RNode {configNode })
476+ return configNode , err
477+ }
478+
479+ // standardizeArrayValue returns the folded style array node string
480+ // e.g. for input value [foo, bar], it returns
481+ // - foo
482+ // - bar
483+ func standardizeArrayValue (val string ) (string , error ) {
484+ if ! strings .HasPrefix (val , "[" ) {
485+ // the value is either standardized, or is not a sequence node value
486+ return val , nil
487+ }
488+ vNode , err := yaml .Parse (val )
489+ if err != nil {
490+ return val , fmt .Errorf ("failed to parse the array node value %q with error %q" , val , err .Error ())
491+ }
492+ if vNode .YNode ().Kind == yaml .SequenceNode {
493+ // standardize array values to folded style
494+ vNode .YNode ().Style = yaml .FoldedStyle
495+ val , err = vNode .String ()
496+ if err != nil {
497+ return val , fmt .Errorf ("failed to serialize the array node value %q with error %q" , val , err .Error ())
498+ }
499+ }
500+ return val , nil
477501}
478502
479503// getPkgPathToSettersSchema returns the, map of pkgPath to the setters schema in Kptfile
@@ -507,13 +531,16 @@ func (s *Fix) visitMapping(object *yaml.RNode) error {
507531 // return if it is not a sequence node
508532 return nil
509533 }
510-
534+ oldCommentPrefixes := [] string { `# {"$kpt-set":"` , `# {"$ref":"#/definitions/io.k8s.cli.` }
511535 comment := node .Key .YNode ().LineComment
512- // # {"$kpt-set":"foo"} must be converted to # kpt-set: ${foo}
513- if strings .Contains (comment , "$kpt-set" ) {
514- comment := strings .TrimPrefix (comment , `# {"$kpt-set":"` )
515- comment = strings .TrimSuffix (comment , `"}` )
516- node .Key .YNode ().LineComment = fmt .Sprintf ("kpt-set: ${%s}" , comment )
536+ for _ , cp := range oldCommentPrefixes {
537+ // # {"$kpt-set":"foo"} must be converted to # kpt-set: ${foo}
538+ // # {"$ref":"#/definitions/io.k8s.cli.list"} must be converted to # kpt-set: ${list}
539+ if strings .Contains (comment , cp ) {
540+ comment := strings .TrimPrefix (comment , cp )
541+ comment = strings .TrimSuffix (comment , `"}` )
542+ node .Key .YNode ().LineComment = fmt .Sprintf ("kpt-set: ${%s}" , comment )
543+ }
517544 }
518545 return nil
519546 })
0 commit comments