@@ -329,9 +329,9 @@ func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdp
329329 Behavior : "merge" ,
330330 KvPairSources : kusttypes.KvPairSources {
331331 LiteralSources : []string {
332- fmt .Sprintf ("ingressUrl=" + ingressUrl ),
333- fmt .Sprintf ("contextName=" + opts .clusterName ),
334- fmt .Sprintf ("server=" + server ),
332+ fmt .Sprint ("ingressUrl=" + ingressUrl ),
333+ fmt .Sprint ("contextName=" + opts .clusterName ),
334+ fmt .Sprint ("server=" + server ),
335335 fmt .Sprintf ("skipTLSValidation=%v" , opts .skipTLSValidation ),
336336 },
337337 },
@@ -346,7 +346,7 @@ func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdp
346346 Behavior : "merge" ,
347347 KvPairSources : kusttypes.KvPairSources {
348348 LiteralSources : []string {
349- fmt .Sprintf ("csdpToken=" + csdpToken ),
349+ fmt .Sprint ("csdpToken=" + csdpToken ),
350350 },
351351 },
352352 },
@@ -401,7 +401,7 @@ func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdp
401401 return nil , "" , fmt .Errorf ("failed encoding annotations: %w" , err )
402402 }
403403
404- k .ConfigMapGenerator [0 ].KvPairSources .LiteralSources = append (k .ConfigMapGenerator [0 ].KvPairSources .LiteralSources , fmt .Sprintf ("annotations=" + annotationsStr ))
404+ k .ConfigMapGenerator [0 ].KvPairSources .LiteralSources = append (k .ConfigMapGenerator [0 ].KvPairSources .LiteralSources , fmt .Sprint ("annotations=" + annotationsStr ))
405405 }
406406
407407 if len (opts .labels ) > 0 {
@@ -410,7 +410,7 @@ func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdp
410410 return nil , "" , fmt .Errorf ("failed encoding labels: %w" , err )
411411 }
412412
413- k .ConfigMapGenerator [0 ].KvPairSources .LiteralSources = append (k .ConfigMapGenerator [0 ].KvPairSources .LiteralSources , fmt .Sprintf ("labels=" + labelsStr ))
413+ k .ConfigMapGenerator [0 ].KvPairSources .LiteralSources = append (k .ConfigMapGenerator [0 ].KvPairSources .LiteralSources , fmt .Sprint ("labels=" + labelsStr ))
414414 }
415415
416416 if opts .tag != "" {
@@ -422,9 +422,6 @@ func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdp
422422 }
423423 }
424424
425- k .FixKustomizationPostUnmarshalling ()
426- util .Die (k .FixKustomizationPreMarshalling ())
427-
428425 manifests , err := kustutil .BuildKustomization (k )
429426 if err != nil {
430427 return nil , "" , fmt .Errorf ("failed to build kustomization: %w" , err )
0 commit comments