Skip to content

refactor: improve dev pod selection #2299

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

Merged
FabianKramm merged 2 commits into from
Sep 12, 2022
Merged

refactor: improve dev pod selection #2299

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8efc1d
refactor: improve dev pod selection
FabianKramm Sep 12, 2022
49f3a52
Merge branch 'main' of https://github.com/loft-sh/devspace
FabianKramm Sep 12, 2022
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
27 changes: 26 additions & 1 deletion pkg/devspace/devpod/devpod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,32 @@ func (d *devPod) start(ctx devspacecontext.Context, devPodConfig *latest.DevPod,
if err != nil {
return errors.Wrap(err, "waiting for pod to become ready")
}
ctx.Log().Infof("Selected %s (%s)", ansi.Color(fmt.Sprintf("%s:%s", selectedPod.Pod.Name, selectedPod.Container.Name), "yellow+b"), ansi.Color("pod:container", "white+b"))

// check if the correct pod is matched
loader.EachDevContainer(devPodConfig, func(devContainer *latest.DevContainer) bool {
if devContainer.Container == "" {
return true
}

// check if the container exists in the pod
for _, container := range selectedPod.Pod.Spec.Containers {
if container.Name == devContainer.Container {
return true
}
}
for _, container := range selectedPod.Pod.Spec.InitContainers {
if container.Name == devContainer.Container {
return true
}
}

err = fmt.Errorf("selected pod '%s/%s' doesn't include container '%s', please make sure you don't have overlapping label selectors within the namespace and the pod you select contains container '%s'", selectedPod.Pod.Namespace, selectedPod.Pod.Name, devContainer.Container, devContainer.Container)
return false
})
if err != nil {
return errors.Wrap(err, "select pod")
}
ctx.Log().Infof("Selected pod %s", ansi.Color(selectedPod.Pod.Name, "yellow+b"))

// set selected pod
d.m.Lock()
Expand Down