fix: replace pods statefulset problems

Author: FabianKramm

pkg/devspace/services/podreplace/builder.go

@@ -13,7 +13,6 @@ import (
 	runtimevar "github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/runtime"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
-	"github.com/loft-sh/devspace/pkg/devspace/imageselector"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl/selector"
 	"github.com/loft-sh/devspace/pkg/util/hash"
 	"github.com/pkg/errors"
@@ -77,9 +76,9 @@ func buildDeployment(ctx *devspacecontext.Context, name string, target runtime.O
 		for _, pvc := range t.Spec.VolumeClaimTemplates {
 			pvcName := pvc.Name
 			if pvcName == "" {
-				pvcName = "data-" + t.Name
+				pvcName = "data"
 			}
-
+			pvcName += "-" + t.Name + "-0"
 			podTemplate.Spec.Volumes = append(podTemplate.Spec.Volumes, corev1.Volume{
 				Name: "data",
 				VolumeSource: corev1.VolumeSource{
@@ -99,12 +98,6 @@ func buildDeployment(ctx *devspacecontext.Context, name string, target runtime.O
 		return nil, err
 	}
 
-	// replace the image names
-	err = replaceImagesInPodSpec(ctx, &podTemplate.Spec, devPod)
-	if err != nil {
-		return nil, err
-	}
-
 	// apply the patches
 	podTemplate, err = applyPodPatches(podTemplate, devPod)
 	if err != nil {
@@ -113,7 +106,7 @@ func buildDeployment(ctx *devspacecontext.Context, name string, target runtime.O
 
 	// check if terminal and modify pod
 	loader.EachDevContainer(devPod, func(devContainer *latest.DevContainer) bool {
-		err = modifyDevContainer(devPod, devContainer, podTemplate)
+		err = modifyDevContainer(ctx, devPod, devContainer, podTemplate)
 		if err != nil {
 			return false
 		}
@@ -167,46 +160,51 @@ func buildDeployment(ctx *devspacecontext.Context, name string, target runtime.O
 	return deployment, nil
 }
 
-func modifyDevContainer(devPod *latest.DevPod, devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
-	err := replaceTerminal(devContainer, podTemplate)
+func modifyDevContainer(ctx *devspacecontext.Context, devPod *latest.DevPod, devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
+	err := replaceImage(ctx, devPod, devContainer, podTemplate)
+	if err != nil {
+		return err
+	}
+
+	err = replaceTerminal(ctx, devPod, devContainer, podTemplate)
 	if err != nil {
 		return errors.Wrap(err, "replace terminal")
 	}
 
-	err = replaceAttach(devContainer, podTemplate)
+	err = replaceAttach(ctx, devPod, devContainer, podTemplate)
 	if err != nil {
 		return errors.Wrap(err, "replace attach")
 	}
 
-	err = replaceEnv(devContainer, podTemplate)
+	err = replaceEnv(ctx, devPod, devContainer, podTemplate)
 	if err != nil {
 		return errors.Wrap(err, "replace env")
 	}
 
-	err = replaceCommand(devPod, devContainer, podTemplate)
+	err = replaceCommand(ctx, devPod, devContainer, podTemplate)
 	if err != nil {
 		return errors.Wrap(err, "replace entrypoint")
 	}
 
-	err = replaceWorkingDir(devContainer, podTemplate)
+	err = replaceWorkingDir(ctx, devPod, devContainer, podTemplate)
 	if err != nil {
 		return errors.Wrap(err, "replace working dir")
 	}
 
-	err = replaceResources(devContainer, podTemplate)
+	err = replaceResources(ctx, devPod, devContainer, podTemplate)
 	if err != nil {
 		return errors.Wrap(err, "replace resources")
 	}
 
 	return nil
 }
 
-func replaceResources(devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
+func replaceResources(ctx *devspacecontext.Context, devPod *latest.DevPod, devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
 	if devContainer.Resources == nil {
 		return nil
 	}
 
-	index, container, err := getPodTemplateContainer(devContainer, podTemplate)
+	index, container, err := getPodTemplateContainer(ctx, devPod, devContainer, podTemplate)
 	if err != nil {
 		return err
 	}
@@ -227,12 +225,12 @@ func replaceResources(devContainer *latest.DevContainer, podTemplate *corev1.Pod
 	return nil
 }
 
-func replaceWorkingDir(devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
+func replaceWorkingDir(ctx *devspacecontext.Context, devPod *latest.DevPod, devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
 	if devContainer.WorkingDir == "" {
 		return nil
 	}
 
-	index, container, err := getPodTemplateContainer(devContainer, podTemplate)
+	index, container, err := getPodTemplateContainer(ctx, devPod, devContainer, podTemplate)
 	if err != nil {
 		return err
 	}
@@ -242,7 +240,7 @@ func replaceWorkingDir(devContainer *latest.DevContainer, podTemplate *corev1.Po
 	return nil
 }
 
-func replaceCommand(devPod *latest.DevPod, devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
+func replaceCommand(ctx *devspacecontext.Context, devPod *latest.DevPod, devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
 	// replace with DevSpace helper
 	injectRestartHelper := false
 	if !devContainer.DisableRestartHelper {
@@ -259,7 +257,7 @@ func replaceCommand(devPod *latest.DevPod, devContainer *latest.DevContainer, po
 		return nil
 	}
 
-	index, container, err := getPodTemplateContainer(devContainer, podTemplate)
+	index, container, err := getPodTemplateContainer(ctx, devPod, devContainer, podTemplate)
 	if err != nil {
 		return err
 	}
@@ -324,12 +322,12 @@ func replaceCommand(devPod *latest.DevPod, devContainer *latest.DevContainer, po
 	return nil
 }
 
-func replaceEnv(devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
+func replaceEnv(ctx *devspacecontext.Context, devPod *latest.DevPod, devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
 	if len(devContainer.Env) == 0 {
 		return nil
 	}
 
-	index, container, err := getPodTemplateContainer(devContainer, podTemplate)
+	index, container, err := getPodTemplateContainer(ctx, devPod, devContainer, podTemplate)
 	if err != nil {
 		return err
 	}
@@ -345,12 +343,12 @@ func replaceEnv(devContainer *latest.DevContainer, podTemplate *corev1.PodTempla
 	return nil
 }
 
-func replaceAttach(devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
+func replaceAttach(ctx *devspacecontext.Context, devPod *latest.DevPod, devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
 	if devContainer.Attach == nil || devContainer.Attach.DisableReplace || (devContainer.Attach.Enabled != nil && !*devContainer.Attach.Enabled) {
 		return nil
 	}
 
-	index, container, err := getPodTemplateContainer(devContainer, podTemplate)
+	index, container, err := getPodTemplateContainer(ctx, devPod, devContainer, podTemplate)
 	if err != nil {
 		return err
 	}
@@ -364,12 +362,12 @@ func replaceAttach(devContainer *latest.DevContainer, podTemplate *corev1.PodTem
 	return nil
 }
 
-func replaceTerminal(devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
+func replaceTerminal(ctx *devspacecontext.Context, devPod *latest.DevPod, devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
 	if devContainer.Terminal == nil || devContainer.Terminal.DisableReplace || (devContainer.Terminal.Enabled != nil && !*devContainer.Terminal.Enabled) {
 		return nil
 	}
 
-	index, container, err := getPodTemplateContainer(devContainer, podTemplate)
+	index, container, err := getPodTemplateContainer(ctx, devPod, devContainer, podTemplate)
 	if err != nil {
 		return err
 	}
@@ -383,23 +381,31 @@ func replaceTerminal(devContainer *latest.DevContainer, podTemplate *corev1.PodT
 	return nil
 }
 
-func getPodTemplateContainer(devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) (int, *corev1.Container, error) {
-	if devContainer.Container == "" && len(podTemplate.Spec.Containers) > 1 {
-		names := []string{}
-		for _, c := range podTemplate.Spec.Containers {
-			names = append(names, c.Name)
+func getPodTemplateContainer(ctx *devspacecontext.Context, devPod *latest.DevPod, devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) (int, *corev1.Container, error) {
+	containerName := devContainer.Container
+	if containerName == "" && len(podTemplate.Spec.Containers) > 1 {
+		containers, err := matchesImageSelector(ctx, podTemplate, devPod)
+		if err != nil {
+			return 0, nil, err
+		} else if len(containers) != 1 {
+			names := []string{}
+			for _, c := range podTemplate.Spec.Containers {
+				names = append(names, c.Name)
+			}
+
+			return 0, nil, fmt.Errorf("couldn't modify pod as multiple containers were found '%s', but no dev.*.container was specified", strings.Join(names, "' '"))
 		}
 
-		return 0, nil, fmt.Errorf("couldn't modify pod as multiple containers were found %s, but no containerName was specified", strings.Join(names, " "))
+		containerName = containers[0]
 	}
 
 	for i, con := range podTemplate.Spec.Containers {
-		if devContainer.Container == "" || con.Name == devContainer.Container {
+		if containerName == "" || con.Name == containerName {
 			return i, &con, nil
 		}
 	}
 
-	return 0, nil, fmt.Errorf("couldn't find container %s", devContainer.Container)
+	return 0, nil, fmt.Errorf("couldn't find container '%s' in pod", containerName)
 }
 
 func hashConfig(replacePod *latest.DevPod) (string, error) {
@@ -411,70 +417,23 @@ func hashConfig(replacePod *latest.DevPod) (string, error) {
 	return hash.String(string(out)), nil
 }
 
-func replaceImagesInPodSpec(ctx *devspacecontext.Context, podSpec *corev1.PodSpec, devPod *latest.DevPod) error {
-	var err error
-	loader.EachDevContainer(devPod, func(devContainer *latest.DevContainer) bool {
-		if devContainer.DevImage == "" {
-			return true
-		}
-		err = replaceImageInPodSpec(ctx, podSpec, devPod.LabelSelector, devPod.ImageSelector, devContainer.Container, devContainer.DevImage)
-		if err != nil {
-			return false
-		}
-		return true
-	})
-
-	return err
-}
-
-func replaceImageInPodSpec(ctx *devspacecontext.Context, podSpec *corev1.PodSpec, labelSelector map[string]string, imageSelector string, container, replaceImage string) error {
-	if len(podSpec.Containers) == 0 {
-		return fmt.Errorf("no containers in pod spec")
+func replaceImage(ctx *devspacecontext.Context, devPod *latest.DevPod, devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
+	if devContainer.DevImage == "" {
+		return nil
 	}
 
-	imageStr, err := runtimevar.NewRuntimeResolver(ctx.WorkingDir, true).FillRuntimeVariablesAsString(ctx.Context, replaceImage, ctx.Config, ctx.Dependencies)
+	index, container, err := getPodTemplateContainer(ctx, devPod, devContainer, podTemplate)
 	if err != nil {
 		return err
 	}
 
-	if container != "" {
-		for i := range podSpec.Containers {
-			if podSpec.Containers[i].Name == container {
-				podSpec.Containers[i].Image = imageStr
-				break
-			}
-		}
-	} else if labelSelector != nil {
-		if len(podSpec.Containers) > 1 {
-			return fmt.Errorf("pod spec has more than 1 containers and containerName is an empty string")
-		}
-
-		// exchange image name
-		if len(podSpec.Containers) == 1 {
-			podSpec.Containers[0].Image = imageStr
-		}
-	} else if imageSelector != "" {
-		if len(podSpec.Containers) == 1 {
-			podSpec.Containers[0].Image = imageStr
-		} else {
-			var imageSelectorPtr *imageselector.ImageSelector
-			if imageSelector != "" {
-				imageSelectorPtr, err = runtimevar.NewRuntimeResolver(ctx.WorkingDir, true).FillRuntimeVariablesAsImageSelector(ctx.Context, replaceImage, ctx.Config, ctx.Dependencies)
-				if err != nil {
-					return err
-				}
-			}
-
-			// exchange image name
-			for i := range podSpec.Containers {
-				if imageSelectorPtr != nil && imageselector.CompareImageNames(imageSelectorPtr.Image, podSpec.Containers[i].Image) {
-					podSpec.Containers[i].Image = imageStr
-					break
-				}
-			}
-		}
+	imageStr, err := runtimevar.NewRuntimeResolver(ctx.WorkingDir, true).FillRuntimeVariablesAsString(ctx.Context, devContainer.DevImage, ctx.Config, ctx.Dependencies)
+	if err != nil {
+		return err
 	}
 
+	container.Image = imageStr
+	podTemplate.Spec.Containers[index] = *container
 	return nil
 }
 

pkg/devspace/services/podreplace/find.go

@@ -154,5 +154,4 @@ func matchesImageSelector(ctx *devspacecontext.Context, pod *corev1.PodTemplateS
 	}
 
 	return matchingContainers, nil
-
 }