Correct the handling of images in different scenarios (#2268)

Author: johscheuer

e2e/fixtures/factory.go

@@ -224,26 +224,22 @@ func (factory *Factory) GetMainContainerOverrides(debugSymbols bool, unifiedImag
 		image = factory.GetUnifiedFoundationDBImage()
 	}
 
-	mainImage, tag := GetBaseImageAndTag(
-		GetDebugImage(debugSymbols, image),
-	)
+	mainImage, tag := GetBaseImageAndTag(image)
 
 	return fdbv1beta2.ContainerOverrides{
 		EnableTLS:    false,
-		ImageConfigs: factory.options.getImageVersionConfig(mainImage, tag, false),
+		ImageConfigs: factory.options.getImageVersionConfig(mainImage, tag, false, debugSymbols),
 	}
 }
 
 // GetSidecarContainerOverrides will return the sidecar container overrides. If the unified image should be used an empty
 // container override will be returned.
 func (factory *Factory) GetSidecarContainerOverrides(debugSymbols bool) fdbv1beta2.ContainerOverrides {
-	image, tag := GetBaseImageAndTag(
-		GetDebugImage(debugSymbols, factory.GetSidecarImage()),
-	)
+	image, tag := GetBaseImageAndTag(factory.GetSidecarImage())
 
 	return fdbv1beta2.ContainerOverrides{
 		EnableTLS:    false,
-		ImageConfigs: factory.options.getImageVersionConfig(image, tag, true),
+		ImageConfigs: factory.options.getImageVersionConfig(image, tag, true, debugSymbols),
 	}
 }
 

e2e/fixtures/images.go

@@ -43,12 +43,3 @@ func GetBaseImageAndTag(image string) (string, string) {
 
 	return parts[0], parts[1]
 }
-
-// GetDebugImage returns the debugging image if enabled.
-func GetDebugImage(debug bool, image string) string {
-	if debug && !strings.Contains(image, "-debug") {
-		return image + "-debug"
-	}
-
-	return image
-}