Skip to content

Commit d18160c

Browse files
briandealwisbriandealwis
authored
Name debug helper containers more explicitly (#4946)
1 parent 2814e74 commit d18160c

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

‎pkg/skaffold/debug/transform.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ func transformPodSpec(metadata *metav1.ObjectMeta, podSpec *v1.PodSpec, retrieve
251251
// the initContainers are responsible for populating the contents of `/dbg`
252252
for imageID := range requiredSupportImages {
253253
supportFilesInitContainer := v1.Container{
254-
Name: fmt.Sprintf("install-%s-support", imageID),
254+
Name: fmt.Sprintf("install-%s-debug-support", imageID),
255255
Image: fmt.Sprintf("%s/%s", debugHelpersRegistry, imageID),
256256
VolumeMounts: []v1.VolumeMount{supportVolumeMount},
257257
}

‎pkg/skaffold/debug/transform_go_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ func TestTransformManifestDelve(t *testing.T) {
268268
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
269269
}},
270270
InitContainers: []v1.Container{{
271-
Name: "install-go-support",
271+
Name: "install-go-debug-support",
272272
Image: "HELPERS/go",
273273
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
274274
}},
@@ -311,7 +311,7 @@ func TestTransformManifestDelve(t *testing.T) {
311311
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
312312
}},
313313
InitContainers: []v1.Container{{
314-
Name: "install-go-support",
314+
Name: "install-go-debug-support",
315315
Image: "HELPERS/go",
316316
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
317317
}},
@@ -354,7 +354,7 @@ func TestTransformManifestDelve(t *testing.T) {
354354
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
355355
}},
356356
InitContainers: []v1.Container{{
357-
Name: "install-go-support",
357+
Name: "install-go-debug-support",
358358
Image: "HELPERS/go",
359359
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
360360
}},
@@ -397,7 +397,7 @@ func TestTransformManifestDelve(t *testing.T) {
397397
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
398398
}},
399399
InitContainers: []v1.Container{{
400-
Name: "install-go-support",
400+
Name: "install-go-debug-support",
401401
Image: "HELPERS/go",
402402
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
403403
}},
@@ -438,7 +438,7 @@ func TestTransformManifestDelve(t *testing.T) {
438438
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
439439
}},
440440
InitContainers: []v1.Container{{
441-
Name: "install-go-support",
441+
Name: "install-go-debug-support",
442442
Image: "HELPERS/go",
443443
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
444444
}},
@@ -479,7 +479,7 @@ func TestTransformManifestDelve(t *testing.T) {
479479
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
480480
}},
481481
InitContainers: []v1.Container{{
482-
Name: "install-go-support",
482+
Name: "install-go-debug-support",
483483
Image: "HELPERS/go",
484484
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
485485
}},
@@ -522,7 +522,7 @@ func TestTransformManifestDelve(t *testing.T) {
522522
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
523523
}},
524524
InitContainers: []v1.Container{{
525-
Name: "install-go-support",
525+
Name: "install-go-debug-support",
526526
Image: "HELPERS/go",
527527
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
528528
}},
@@ -575,7 +575,7 @@ func TestTransformManifestDelve(t *testing.T) {
575575
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
576576
}},
577577
InitContainers: []v1.Container{{
578-
Name: "install-go-support",
578+
Name: "install-go-debug-support",
579579
Image: "HELPERS/go",
580580
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
581581
}},

‎pkg/skaffold/debug/transform_nodejs_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
370370
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
371371
}},
372372
InitContainers: []v1.Container{{
373-
Name: "install-nodejs-support",
373+
Name: "install-nodejs-debug-support",
374374
Image: "HELPERS/nodejs",
375375
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
376376
}},
@@ -410,7 +410,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
410410
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
411411
}},
412412
InitContainers: []v1.Container{{
413-
Name: "install-nodejs-support",
413+
Name: "install-nodejs-debug-support",
414414
Image: "HELPERS/nodejs",
415415
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
416416
}},
@@ -447,7 +447,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
447447
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
448448
}},
449449
InitContainers: []v1.Container{{
450-
Name: "install-nodejs-support",
450+
Name: "install-nodejs-debug-support",
451451
Image: "HELPERS/nodejs",
452452
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
453453
}},
@@ -487,7 +487,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
487487
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
488488
}},
489489
InitContainers: []v1.Container{{
490-
Name: "install-nodejs-support",
490+
Name: "install-nodejs-debug-support",
491491
Image: "HELPERS/nodejs",
492492
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
493493
}},
@@ -525,7 +525,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
525525
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
526526
}},
527527
InitContainers: []v1.Container{{
528-
Name: "install-nodejs-support",
528+
Name: "install-nodejs-debug-support",
529529
Image: "HELPERS/nodejs",
530530
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
531531
}},
@@ -564,7 +564,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
564564
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
565565
}},
566566
InitContainers: []v1.Container{{
567-
Name: "install-nodejs-support",
567+
Name: "install-nodejs-debug-support",
568568
Image: "HELPERS/nodejs",
569569
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
570570
}},
@@ -606,7 +606,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
606606
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
607607
}},
608608
InitContainers: []v1.Container{{
609-
Name: "install-nodejs-support",
609+
Name: "install-nodejs-debug-support",
610610
Image: "HELPERS/nodejs",
611611
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
612612
}},
@@ -656,7 +656,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
656656
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
657657
}},
658658
InitContainers: []v1.Container{{
659-
Name: "install-nodejs-support",
659+
Name: "install-nodejs-debug-support",
660660
Image: "HELPERS/nodejs",
661661
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
662662
}},

‎pkg/skaffold/debug/transform_python_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ func TestTransformManifestPython(t *testing.T) {
271271
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
272272
}},
273273
InitContainers: []v1.Container{{
274-
Name: "install-python-support",
274+
Name: "install-python-debug-support",
275275
Image: "HELPERS/python",
276276
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
277277
}},
@@ -313,7 +313,7 @@ func TestTransformManifestPython(t *testing.T) {
313313
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
314314
}},
315315
InitContainers: []v1.Container{{
316-
Name: "install-python-support",
316+
Name: "install-python-debug-support",
317317
Image: "HELPERS/python",
318318
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
319319
}},
@@ -355,7 +355,7 @@ func TestTransformManifestPython(t *testing.T) {
355355
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
356356
}},
357357
InitContainers: []v1.Container{{
358-
Name: "install-python-support",
358+
Name: "install-python-debug-support",
359359
Image: "HELPERS/python",
360360
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
361361
}},
@@ -397,7 +397,7 @@ func TestTransformManifestPython(t *testing.T) {
397397
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
398398
}},
399399
InitContainers: []v1.Container{{
400-
Name: "install-python-support",
400+
Name: "install-python-debug-support",
401401
Image: "HELPERS/python",
402402
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
403403
}},
@@ -437,7 +437,7 @@ func TestTransformManifestPython(t *testing.T) {
437437
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
438438
}},
439439
InitContainers: []v1.Container{{
440-
Name: "install-python-support",
440+
Name: "install-python-debug-support",
441441
Image: "HELPERS/python",
442442
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
443443
}},
@@ -477,7 +477,7 @@ func TestTransformManifestPython(t *testing.T) {
477477
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
478478
}},
479479
InitContainers: []v1.Container{{
480-
Name: "install-python-support",
480+
Name: "install-python-debug-support",
481481
Image: "HELPERS/python",
482482
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
483483
}},
@@ -519,7 +519,7 @@ func TestTransformManifestPython(t *testing.T) {
519519
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
520520
}},
521521
InitContainers: []v1.Container{{
522-
Name: "install-python-support",
522+
Name: "install-python-debug-support",
523523
Image: "HELPERS/python",
524524
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
525525
}},
@@ -571,7 +571,7 @@ func TestTransformManifestPython(t *testing.T) {
571571
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
572572
}},
573573
InitContainers: []v1.Container{{
574-
Name: "install-python-support",
574+
Name: "install-python-debug-support",
575575
Image: "HELPERS/python",
576576
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
577577
}},

0 commit comments

Comments
 (0)