Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Name debug helper containers more explicitly #4946

Merged
merged 1 commit into from
Oct 26, 2020
Merged

Name debug helper containers more explicitly #4946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/skaffold/debug/transform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func transformPodSpec(metadata *metav1.ObjectMeta, podSpec *v1.PodSpec, retrieve
// the initContainers are responsible for populating the contents of `/dbg`
for imageID := range requiredSupportImages {
supportFilesInitContainer := v1.Container{
Name: fmt.Sprintf("install-%s-support", imageID),
Name: fmt.Sprintf("install-%s-debug-support", imageID),
Image: fmt.Sprintf("%s/%s", debugHelpersRegistry, imageID),
VolumeMounts: []v1.VolumeMount{supportVolumeMount},
}
Expand Down
16 changes: 8 additions & 8 deletions pkg/skaffold/debug/transform_go_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ func TestTransformManifestDelve(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-go-support",
Name: "install-go-debug-support",
Image: "HELPERS/go",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -311,7 +311,7 @@ func TestTransformManifestDelve(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-go-support",
Name: "install-go-debug-support",
Image: "HELPERS/go",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -354,7 +354,7 @@ func TestTransformManifestDelve(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-go-support",
Name: "install-go-debug-support",
Image: "HELPERS/go",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -397,7 +397,7 @@ func TestTransformManifestDelve(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-go-support",
Name: "install-go-debug-support",
Image: "HELPERS/go",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -438,7 +438,7 @@ func TestTransformManifestDelve(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-go-support",
Name: "install-go-debug-support",
Image: "HELPERS/go",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -479,7 +479,7 @@ func TestTransformManifestDelve(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-go-support",
Name: "install-go-debug-support",
Image: "HELPERS/go",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -522,7 +522,7 @@ func TestTransformManifestDelve(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-go-support",
Name: "install-go-debug-support",
Image: "HELPERS/go",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -575,7 +575,7 @@ func TestTransformManifestDelve(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-go-support",
Name: "install-go-debug-support",
Image: "HELPERS/go",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down
16 changes: 8 additions & 8 deletions pkg/skaffold/debug/transform_nodejs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-nodejs-support",
Name: "install-nodejs-debug-support",
Image: "HELPERS/nodejs",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -410,7 +410,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-nodejs-support",
Name: "install-nodejs-debug-support",
Image: "HELPERS/nodejs",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -447,7 +447,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-nodejs-support",
Name: "install-nodejs-debug-support",
Image: "HELPERS/nodejs",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -487,7 +487,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-nodejs-support",
Name: "install-nodejs-debug-support",
Image: "HELPERS/nodejs",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -525,7 +525,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-nodejs-support",
Name: "install-nodejs-debug-support",
Image: "HELPERS/nodejs",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -564,7 +564,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-nodejs-support",
Name: "install-nodejs-debug-support",
Image: "HELPERS/nodejs",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -606,7 +606,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-nodejs-support",
Name: "install-nodejs-debug-support",
Image: "HELPERS/nodejs",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -656,7 +656,7 @@ func TestTransformManifestNodeJS(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-nodejs-support",
Name: "install-nodejs-debug-support",
Image: "HELPERS/nodejs",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down
16 changes: 8 additions & 8 deletions pkg/skaffold/debug/transform_python_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ func TestTransformManifestPython(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-python-support",
Name: "install-python-debug-support",
Image: "HELPERS/python",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -313,7 +313,7 @@ func TestTransformManifestPython(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-python-support",
Name: "install-python-debug-support",
Image: "HELPERS/python",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -355,7 +355,7 @@ func TestTransformManifestPython(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-python-support",
Name: "install-python-debug-support",
Image: "HELPERS/python",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -397,7 +397,7 @@ func TestTransformManifestPython(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-python-support",
Name: "install-python-debug-support",
Image: "HELPERS/python",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -437,7 +437,7 @@ func TestTransformManifestPython(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-python-support",
Name: "install-python-debug-support",
Image: "HELPERS/python",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -477,7 +477,7 @@ func TestTransformManifestPython(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-python-support",
Name: "install-python-debug-support",
Image: "HELPERS/python",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -519,7 +519,7 @@ func TestTransformManifestPython(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-python-support",
Name: "install-python-debug-support",
Image: "HELPERS/python",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down Expand Up @@ -571,7 +571,7 @@ func TestTransformManifestPython(t *testing.T) {
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
InitContainers: []v1.Container{{
Name: "install-python-support",
Name: "install-python-debug-support",
Image: "HELPERS/python",
VolumeMounts: []v1.VolumeMount{{Name: "debugging-support-files", MountPath: "/dbg"}},
}},
Expand Down