fix: address code review findings

- Remove misleading "Exported for testing" comment from unexported function
- Remove redundant length check and magic number in ExtractKindClusterName
- Fix stale comments about image counts (9 total, not 10)
- Update tests to use realistic scanner-v4 image references
- Change test to use quay.io paths instead of localhost

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

Author: GrimmiMeloni

internal/cluster/kind.go

@@ -13,7 +13,6 @@ func IsKindCluster() bool {
 }
 
 // isKindContext checks if the given context name indicates a kind cluster.
-// Exported for testing.
 func isKindContext(contextName string) bool {
 	if contextName == "" {
 		return false
@@ -27,8 +26,8 @@ func isKindContext(contextName string) bool {
 // For context "kind", returns "kind".
 func ExtractKindClusterName(contextName string) string {
 	// Remove "kind-" prefix if present
-	if len(contextName) > 5 && strings.HasPrefix(strings.ToLower(contextName), "kind-") {
-		return contextName[5:]
+	if strings.HasPrefix(strings.ToLower(contextName), "kind-") {
+		return contextName[len("kind-"):]
 	}
 	// If just "kind", return as-is
 	return contextName

internal/deployer/deployer.go

@@ -490,7 +490,7 @@ func (d *Deployer) detectAndLoadLocalImages(ctx context.Context) error {
 		return nil
 	}
 
-	// Calculate total images needed (7 main + 3 operator = 10)
+	// Calculate total images needed (7 main + 2 operator = 9)
 	totalExpected := totalRequiredImages
 	d.logger.Infof("Found %d/%d images locally in podman", len(localImages), totalExpected)
 
@@ -516,7 +516,7 @@ func (d *Deployer) shouldSkipCredentialVerification() bool {
 	}
 
 	// If using some local images but not all, don't skip (need creds for remote pulls)
-	// Total expected: 7 main + 3 operator = 10
+	// Total expected: 7 main + 2 operator = 9
 	totalExpected := totalRequiredImages
 	if len(d.localImages) < totalExpected {
 		d.logger.Dimf("Using %d/%d local images, remaining images will be pulled from quay.io",

internal/deployer/operator_test.go

@@ -175,7 +175,7 @@ spec:
 		"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",
+		"scanner-v4:4.0.0":              "quay.io/rhacs-eng/scanner-v4:4.0.0",
 	}
 
 	// Patch the CSV
@@ -222,7 +222,7 @@ spec:
 		"RELATED_IMAGE_SCANNER_DB":     "quay.io/rhacs-eng/scanner-db:4.0.0",
 		"RELATED_IMAGE_CENTRAL_DB":     "quay.io/rhacs-eng/central-db:4.0.0",
 		"RELATED_IMAGE_SCANNER_V4_DB":  "quay.io/rhacs-eng/scanner-v4-db:4.0.0",
-		"RELATED_IMAGE_SCANNER_V4":     "quay.io/rhacs-eng/scanner-v4-matcher:4.0.0",
+		"RELATED_IMAGE_SCANNER_V4":     "quay.io/rhacs-eng/scanner-v4:4.0.0",
 		"RELATED_IMAGE_COLLECTOR":      "quay.io/rhacs-eng/collector:4.0.0", // Not in local images, stays unchanged
 		"OTHER_ENV":                    "some-value",
 	}

internal/localimages/loading_test.go

@@ -36,9 +36,9 @@ func TestBuildKindLoadCommand(t *testing.T) {
 	}{
 		{
 			name:        "basic load",
-			imageRef:    "localhost/stackrox/main:4.10.0",
+			imageRef:    "quay.io/rhacs-eng/main:4.10.0",
 			clusterName: "acs",
-			expected:    []string{"kind", "load", "docker-image", "localhost/stackrox/main:4.10.0", "-n", "acs"},
+			expected:    []string{"kind", "load", "docker-image", "quay.io/rhacs-eng/main:4.10.0", "-n", "acs"},
 		},
 	}