@@ -329,9 +329,9 @@ func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdp
329
329
Behavior : "merge" ,
330
330
KvPairSources : kusttypes.KvPairSources {
331
331
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 ),
335
335
fmt .Sprintf ("skipTLSValidation=%v" , opts .skipTLSValidation ),
336
336
},
337
337
},
@@ -346,7 +346,7 @@ func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdp
346
346
Behavior : "merge" ,
347
347
KvPairSources : kusttypes.KvPairSources {
348
348
LiteralSources : []string {
349
- fmt .Sprintf ("csdpToken=" + csdpToken ),
349
+ fmt .Sprint ("csdpToken=" + csdpToken ),
350
350
},
351
351
},
352
352
},
@@ -401,7 +401,7 @@ func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdp
401
401
return nil , "" , fmt .Errorf ("failed encoding annotations: %w" , err )
402
402
}
403
403
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 ))
405
405
}
406
406
407
407
if len (opts .labels ) > 0 {
@@ -410,7 +410,7 @@ func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdp
410
410
return nil , "" , fmt .Errorf ("failed encoding labels: %w" , err )
411
411
}
412
412
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 ))
414
414
}
415
415
416
416
if opts .tag != "" {
@@ -422,9 +422,6 @@ func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdp
422
422
}
423
423
}
424
424
425
- k .FixKustomizationPostUnmarshalling ()
426
- util .Die (k .FixKustomizationPreMarshalling ())
427
-
428
425
manifests , err := kustutil .BuildKustomization (k )
429
426
if err != nil {
430
427
return nil , "" , fmt .Errorf ("failed to build kustomization: %w" , err )
0 commit comments