@@ -258,19 +258,17 @@ metadata:
258
258
assert .Equal (t , string (expYaml ), string (actYaml ))
259
259
}
260
260
261
- func TestMergeTransformersConfig (t * testing.T ) {
261
+ func TestConfigurationsOverrideDefault (t * testing.T ) {
262
262
th := kusttest_test .MakeHarness (t )
263
263
th .WriteK ("/merge-config" , `
264
264
apiVersion: kustomize.config.k8s.io/v1beta1
265
265
kind: Kustomization
266
266
namePrefix: foo-
267
267
nameSuffix: -bar
268
- namespace: ns1
269
268
resources:
270
269
- deployment.yaml
271
270
- config.yaml
272
271
- secret.yaml
273
- - namespace.yaml
274
272
configurations:
275
273
- name-prefix-rules.yaml
276
274
` )
@@ -301,12 +299,6 @@ kind: Secret
301
299
metadata:
302
300
name: secret
303
301
` )
304
- th .WriteF ("/merge-config/namespace.yaml" , `
305
- apiVersion: v1
306
- kind: Namespace
307
- metadata:
308
- name: ns1
309
- ` )
310
302
311
303
pvd := provider .NewDefaultDepProvider ()
312
304
resFactory := pvd .GetResourceFactory ()
@@ -316,50 +308,40 @@ metadata:
316
308
"apiVersion" : "apps/v1" ,
317
309
"kind" : "Deployment" ,
318
310
"metadata" : map [string ]interface {}{
319
- "name" : "foo-deployment1-bar" ,
320
- "namespace" : "ns1" ,
311
+ "name" : "foo-deployment1-bar" ,
321
312
},
322
313
}), resFactory .FromMapWithName ("config" , map [string ]interface {}{
323
314
"apiVersion" : "v1" ,
324
315
"kind" : "ConfigMap" ,
325
316
"metadata" : map [string ]interface {}{
326
- "name" : "config-bar" ,
327
- "namespace" : "ns1" ,
317
+ "name" : "config-bar" ,
328
318
},
329
319
}), resFactory .FromMapWithName ("secret" , map [string ]interface {}{
330
320
"apiVersion" : "v1" ,
331
321
"kind" : "Secret" ,
332
322
"metadata" : map [string ]interface {}{
333
- "name" : "foo-secret-bar" ,
334
- "namespace" : "ns1" ,
335
- },
336
- }), resFactory .FromMapWithName ("ns1" , map [string ]interface {}{
337
- "apiVersion" : "v1" ,
338
- "kind" : "Namespace" ,
339
- "metadata" : map [string ]interface {}{
340
- "name" : "ns1" ,
323
+ "name" : "foo-secret-bar" ,
341
324
},
342
325
}),
343
326
}
344
327
345
328
expected := resmap .New ()
346
329
for _ , r := range resources {
347
- if err := expected .Append (r ); err != nil {
348
- t .Fatalf ("unexpected error %v" , err )
349
- }
330
+ err := expected .Append (r )
331
+ require .NoError (t , err )
350
332
}
351
333
expected .RemoveBuildAnnotations ()
352
334
expYaml , err := expected .AsYaml ()
353
- assert .NoError (t , err )
335
+ require .NoError (t , err )
354
336
355
337
kt := makeKustTargetWithRf (t , th .GetFSys (), "/merge-config" , pvd )
356
- assert .NoError (t , kt .Load ())
338
+ require .NoError (t , kt .Load ())
357
339
actual , err := kt .MakeCustomizedResMap ()
358
- assert .NoError (t , err )
340
+ require .NoError (t , err )
359
341
actual .RemoveBuildAnnotations ()
360
342
actYaml , err := actual .AsYaml ()
361
- assert .NoError (t , err )
362
- assert .Equal (t , string (expYaml ), string (actYaml ))
343
+ require .NoError (t , err )
344
+ require .Equal (t , string (expYaml ), string (actYaml ))
363
345
}
364
346
365
347
func TestDuplicateExternalGeneratorsForbidden (t * testing.T ) {
0 commit comments