Merge pull request #1916 from FabianKramm/master

fix: allow container name & image selector together

Author: FabianKramm

pkg/devspace/config/loader/validate.go

@@ -385,10 +385,6 @@ func validateDev(config *latest.Config) error {
 	if config.Dev.Ports != nil {
 		for index, port := range config.Dev.Ports {
 			// Validate imageName and label selector
-			if port.ContainerName != "" && len(port.LabelSelector) == 0 {
-				return errors.Errorf("Error in config: containerName is defined but label selector is nil in ports config at index %d", index)
-			}
-
 			if len(port.LabelSelector) == 0 && port.ImageSelector == "" {
 				return errors.Errorf("Error in config: image selector and label selector are nil in ports config at index %d", index)
 			}
@@ -405,10 +401,6 @@ func validateDev(config *latest.Config) error {
 	if config.Dev.Sync != nil {
 		for index, sync := range config.Dev.Sync {
 			// Validate imageName and label selector
-			if sync.ContainerName != "" && len(sync.LabelSelector) == 0 {
-				return errors.Errorf("Error in config: containerName is defined but label selector is nil in sync config at index %d", index)
-			}
-
 			if len(sync.LabelSelector) == 0 && sync.ImageSelector == "" {
 				return errors.Errorf("Error in config: image selector and label selector are nil in sync config at index %d", index)
 			}
@@ -443,9 +435,6 @@ func validateDev(config *latest.Config) error {
 			if selector.ImageSelector != "" && len(selector.LabelSelector) > 0 {
 				return errors.Errorf("Error in config: dev.logs.selectors[%d].imageSelector and dev.logs.selectors[%d].labelSelector cannot be used together", index, index)
 			}
-			if selector.ImageSelector != "" && selector.ContainerName != "" {
-				return errors.Errorf("Error in config: dev.logs.selectors[%d].imageSelector and dev.logs.selectors[%d].containerName cannot be used together", index, index)
-			}
 		}
 	}
 

pkg/devspace/config/loader/validate_test.go

@@ -96,26 +96,6 @@ func TestValidateDev(t *testing.T) {
 	err := validateDev(config)
 	assert.NilError(t, err)
 
-	config = &latest.Config{
-		Dev: latest.DevConfig{
-			Ports: []*latest.PortForwardingConfig{
-				{
-					ContainerName: "fakeContainer",
-					Name:          "someName",
-					PortMappings: []*latest.PortMapping{
-						{
-							LocalPort:  &localPort,
-							RemotePort: &remotePort,
-						},
-					},
-				},
-			},
-		},
-	}
-
-	err = validateDev(config)
-	assert.Error(t, err, "Error in config: containerName is defined but label selector is nil in ports config at index 0")
-
 	// test sync
 	config = &latest.Config{
 		Dev: latest.DevConfig{
@@ -135,20 +115,6 @@ func TestValidateDev(t *testing.T) {
 	err = validateDev(config)
 	assert.NilError(t, err)
 
-	config = &latest.Config{
-		Dev: latest.DevConfig{
-			Sync: []*latest.SyncConfig{
-				{
-					ContainerName: "fakeContainer",
-					Name:          "someName",
-				},
-			},
-		},
-	}
-
-	err = validateDev(config)
-	assert.Error(t, err, "Error in config: containerName is defined but label selector is nil in sync config at index 0")
-
 	// test replace pods
 	config = &latest.Config{
 		Dev: latest.DevConfig{

pkg/devspace/kubectl/selector/selector.go

@@ -147,7 +147,7 @@ func (f *filter) SelectContainers(ctx context.Context, selectors ...Selector) ([
 			retList = append(retList, containersByLabelSelector...)
 		}
 
-		containersByImage, err := byImageName(ctx, f.client, namespace, s.ImageSelector, s.FilterContainer, s.SkipInitContainers)
+		containersByImage, err := byImageName(ctx, f.client, namespace, s.ImageSelector, s.ContainerName, s.FilterContainer, s.SkipInitContainers)
 		if err != nil {
 			return nil, errors.Wrap(err, "pods by image name")
 		}
@@ -310,7 +310,7 @@ func byLabelSelector(ctx context.Context, client kubectl.Client, namespace strin
 	return retPods, nil
 }
 
-func byImageName(ctx context.Context, client kubectl.Client, namespace string, imageSelector []string, skipContainer FilterContainer, skipInit bool) ([]*SelectedPodContainer, error) {
+func byImageName(ctx context.Context, client kubectl.Client, namespace string, imageSelector []string, containerName string, skipContainer FilterContainer, skipInit bool) ([]*SelectedPodContainer, error) {
 	retPods := []*SelectedPodContainer{}
 	if len(imageSelector) > 0 {
 		podList, err := client.KubeClient().CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{})
@@ -325,6 +325,9 @@ func byImageName(ctx context.Context, client kubectl.Client, namespace string, i
 						if skipContainer != nil && skipContainer(&pod, &container) {
 							continue
 						}
+						if containerName != "" && container.Name != containerName {
+							continue
+						}
 
 						if imageselector.CompareImageNames(imageName, container.Image) {
 							retPod := pod
@@ -342,6 +345,9 @@ func byImageName(ctx context.Context, client kubectl.Client, namespace string, i
 					if skipContainer != nil && skipContainer(&pod, &container) {
 						continue
 					}
+					if containerName != "" && container.Name != containerName {
+						continue
+					}
 
 					// check if it is a replaced pod and if yes, check if the imageName and container name matches
 					if pod.Labels != nil && pod.Labels[ReplacedLabel] == "true" && pod.Annotations != nil && pod.Annotations[MatchedContainerAnnotation] == container.Name {