Merge pull request #1832 from FabianKramm/master

FabianKramm · web-flow · commit 3e027cded57c · 2021-12-17T12:33:12.000+01:00
refactor: add containername to error messages
diff --git a/pkg/devspace/kubectl/selector/selector.go b/pkg/devspace/kubectl/selector/selector.go
@@ -96,7 +96,11 @@ func (s Selector) String() string {
 		strs = append(strs, "image selector: "+strings.Join(sa, ","))
 	}
 	if len(s.LabelSelector) > 0 {
-		strs = append(strs, "label selector: "+s.LabelSelector)
+		if s.ContainerName != "" {
+			strs = append(strs, "label selector: "+s.LabelSelector+" - container: "+s.ContainerName)
+		} else {
+			strs = append(strs, "label selector: "+s.LabelSelector)
+		}
 	}
 	if s.Pod != "" {
 		strs = append(strs, "pod name: "+s.Pod)

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,11 @@ func (s Selector) String() string {`
`96`	`96`	`strs = append(strs, "image selector: "+strings.Join(sa, ","))`
`97`	`97`	`}`
`98`	`98`	`if len(s.LabelSelector) > 0 {`
`99`		`- strs = append(strs, "label selector: "+s.LabelSelector)`
	`99`	`+ if s.ContainerName != "" {`
	`100`	`+ strs = append(strs, "label selector: "+s.LabelSelector+" - container: "+s.ContainerName)`
	`101`	`+ } else {`
	`102`	`+ strs = append(strs, "label selector: "+s.LabelSelector)`
	`103`	`+ }`
`100`	`104`	`}`
`101`	`105`	`if s.Pod != "" {`
`102`	`106`	`strs = append(strs, "pod name: "+s.Pod)`