Use actual image references from detection in CSV patching

Previously, CSV patching reconstructed image paths using the current
branding organization. This broke for collector, which only builds
with stackrox-io but would be patched with rhacs-eng when that was
the current branding.

Now, CSV patching uses the actual image reference from the localImages
map that was detected. This handles fallback branding correctly - if
collector was detected at quay.io/stackrox-io, that's the exact path
used in the CSV.

Also updated tests to use quay.io paths instead of localhost paths,
matching the removal of localhost support in detection.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: GrimmiMeloni

internal/deployer/operator.go

@@ -16,7 +16,6 @@ import (
 	"gopkg.in/yaml.v3"
 
 	"github.com/stackrox/roxie/internal/helpers"
-	"github.com/stackrox/roxie/internal/localimages"
 )
 
 const (
@@ -361,11 +360,10 @@ func patchCSVWithLocalImages(csvFile, mainImageTag string, localImages map[strin
 	}
 
 	// Patch operator image if it exists in localImages
-	// We construct the quay.io path to avoid Kubernetes prepending docker.io/ to localhost/ references
+	// Use the actual detected image reference to handle fallback branding cases
 	operatorImageKey := "stackrox-operator:" + mainImageTag
-	if _, ok := localImages[operatorImageKey]; ok {
-		brandingOrg := localimages.GetBrandingOrganization()
-		container["image"] = fmt.Sprintf("quay.io/%s/stackrox-operator:%s", brandingOrg, mainImageTag)
+	if imageRef, ok := localImages[operatorImageKey]; ok {
+		container["image"] = imageRef
 	}
 
 	// Patch RELATED_IMAGE_* environment variables
@@ -374,16 +372,14 @@ func patchCSVWithLocalImages(csvFile, mainImageTag string, localImages map[strin
 		return errors.New("CSV missing container env variables")
 	}
 
-	// Get branding organization for constructing image paths
-	brandingOrg := localimages.GetBrandingOrganization()
-
-	// Build a reverse map from image name to local image refs for quick lookup
-	imageNameToKey := make(map[string]string)
-	for imageKey := range localImages {
+	// Build a reverse map from image name to full image reference for quick lookup
+	// Map[imagename] -> "quay.io/org/imagename:tag"
+	imageNameToRef := make(map[string]string)
+	for imageKey, imageRef := range localImages {
 		// Extract image name from "imagename:tag"
 		parts := strings.SplitN(imageKey, ":", 2)
 		if len(parts) == 2 {
-			imageNameToKey[parts[0]] = imageKey
+			imageNameToRef[parts[0]] = imageRef
 		}
 	}
 
@@ -413,17 +409,10 @@ func patchCSVWithLocalImages(csvFile, mainImageTag string, localImages map[strin
 			imageName = "scanner-v4"
 		}
 
-		// Check if we have this image locally
-		if imageKey, found := imageNameToKey[imageName]; found {
-			// Extract the tag from the imageKey
-			parts := strings.SplitN(imageKey, ":", 2)
-			if len(parts) != 2 {
-				continue
-			}
-			tag := parts[1]
-
-			// Construct quay.io path to avoid Kubernetes prepending docker.io/ to localhost/ references
-			envMap["value"] = fmt.Sprintf("quay.io/%s/%s:%s", brandingOrg, imageName, tag)
+		// Check if we have this image locally and use the actual detected reference
+		// This handles cases where an image was found at a fallback branding org
+		if imageRef, found := imageNameToRef[imageName]; found {
+			envMap["value"] = imageRef
 		}
 	}
 

internal/deployer/operator_test.go

@@ -69,7 +69,7 @@ spec:
 
 	// Only have scanner-v4 locally (not separate indexer/matcher)
 	localImages := map[string]string{
-		"scanner-v4:4.0.0-local": "localhost/stackrox/scanner-v4:4.0.0-local",
+		"scanner-v4:4.0.0-local": "quay.io/rhacs-eng/scanner-v4:4.0.0-local",
 	}
 
 	err := patchCSVWithLocalImages(csvFile, "4.0.0-local", localImages)
@@ -169,13 +169,13 @@ spec:
 
 	// Create local images map with all images
 	localImages := map[string]string{
-		"stackrox-operator:4.0.0":       "localhost/stackrox/stackrox-operator:4.0.0",
-		"main:4.0.0":                    "localhost/stackrox/main:4.0.0",
-		"scanner:4.0.0":                 "localhost/stackrox/scanner:4.0.0",
-		"scanner-db:4.0.0":              "localhost/stackrox/scanner-db:4.0.0",
-		"central-db:4.0.0":              "localhost/stackrox/central-db:4.0.0",
-		"scanner-v4-db:4.0.0":           "localhost/stackrox/scanner-v4-db:4.0.0",
-		"scanner-v4-matcher:4.0.0":      "localhost/stackrox/scanner-v4-matcher:4.0.0",
+		"stackrox-operator:4.0.0":       "quay.io/rhacs-eng/stackrox-operator:4.0.0",
+		"main:4.0.0":                    "quay.io/rhacs-eng/main:4.0.0",
+		"scanner:4.0.0":                 "quay.io/rhacs-eng/scanner:4.0.0",
+		"scanner-db:4.0.0":              "quay.io/rhacs-eng/scanner-db:4.0.0",
+		"central-db:4.0.0":              "quay.io/rhacs-eng/central-db:4.0.0",
+		"scanner-v4-db:4.0.0":           "quay.io/rhacs-eng/scanner-v4-db:4.0.0",
+		"scanner-v4-matcher:4.0.0":      "quay.io/rhacs-eng/scanner-v4-matcher:4.0.0",
 	}
 
 	// Patch the CSV
@@ -274,8 +274,8 @@ spec:
 
 	// Only main and scanner are local
 	localImages := map[string]string{
-		"main:4.0.0":    "localhost/stackrox/main:4.0.0",
-		"scanner:4.0.0": "localhost/stackrox/scanner:4.0.0",
+		"main:4.0.0":    "quay.io/rhacs-eng/main:4.0.0",
+		"scanner:4.0.0": "quay.io/rhacs-eng/scanner:4.0.0",
 	}
 
 	err := patchCSVWithLocalImages(csvFile, "4.0.0", localImages)
@@ -419,7 +419,7 @@ func TestPatchCSVWithLocalImages_MalformedCSV(t *testing.T) {
 	}
 
 	localImages := map[string]string{
-		"main:4.0.0": "localhost/stackrox/main:4.0.0",
+		"main:4.0.0": "quay.io/rhacs-eng/main:4.0.0",
 	}
 
 	err := patchCSVWithLocalImages(csvFile, "4.0.0", localImages)
@@ -431,7 +431,7 @@ func TestPatchCSVWithLocalImages_MalformedCSV(t *testing.T) {
 // TestPatchCSVWithLocalImages_MissingFile tests error handling for missing CSV file
 func TestPatchCSVWithLocalImages_MissingFile(t *testing.T) {
 	localImages := map[string]string{
-		"main:4.0.0": "localhost/stackrox/main:4.0.0",
+		"main:4.0.0": "quay.io/rhacs-eng/main:4.0.0",
 	}
 
 	err := patchCSVWithLocalImages("/nonexistent/file.yaml", "4.0.0", localImages)
@@ -484,7 +484,7 @@ spec:
 	}
 
 	localImages := map[string]string{
-		"main:4.0.0": "localhost/stackrox/main:4.0.0",
+		"main:4.0.0": "quay.io/rhacs-eng/main:4.0.0",
 	}
 
 	err := patchCSVWithLocalImages(csvFile, "4.0.0", localImages)