ROX-35662: Support konflux deployments on non-OCP

cmd/deploy.go

@@ -449,6 +449,10 @@ func configureConfig(log *logger.Logger, components component.Component, deployS
 		return fmt.Errorf("configuring operator configuration: %w", err)
 	}
 
+	if deploySettings.Roxie.KonfluxImagesEnabled() {
+		deployer.PopulateKonfluxEnvVars(deploySettings)
+	}
+
 	if components.IncludesCentral() {
 		if err := deploySettings.Central.ConfigureSpec(&deploySettings.Roxie); err != nil {
 			return fmt.Errorf("configuring Central spec: %w", err)
@@ -511,9 +515,6 @@ func deployValidate(components component.Component, deploySettings *deployer.Con
 		if deploySettings.Operator.DeployViaOlmEnabled() {
 			return errors.New("using Konflux images while deploying operator via OLM is not supported")
 		}
-		if !clusterType.IsOpenShift() {
-			return fmt.Errorf("--konflux flag is only supported on OpenShift 4 clusters (current cluster type: %s)", clusterType)
-		}
 	}
 
 	return nil

internal/deployer/konflux.go

@@ -0,0 +1,45 @@
+package deployer
+
+import (
+	"fmt"
+
+	"github.com/stackrox/roxie/internal/constants"
+)
+
+var konfluxRelatedImages = map[string]string{
+	"RELATED_IMAGE_MAIN":            "main",
+	"RELATED_IMAGE_CENTRAL_DB":      "central-db",
+	"RELATED_IMAGE_SCANNER":         "scanner",
+	"RELATED_IMAGE_SCANNER_SLIM":    "scanner-slim",
+	"RELATED_IMAGE_SCANNER_DB":      "scanner-db",
+	"RELATED_IMAGE_SCANNER_DB_SLIM": "scanner-db-slim",
+	"RELATED_IMAGE_COLLECTOR":       "collector",
+	"RELATED_IMAGE_SCANNER_V4_DB":   "scanner-v4-db",
+	"RELATED_IMAGE_SCANNER_V4":      "scanner-v4",
+	"RELATED_IMAGE_FACT":            "fact",
+}
+
+// KonfluxOperatorImage returns the Konflux-built operator image reference.
+func KonfluxOperatorImage(config *Config) string {
+	return fmt.Sprintf("%s/release-operator:%s", constants.DefaultRegistry, config.Operator.Version)
+}
+
+// PopulateKonfluxEnvVars populates config.Operator.EnvVars with RELATED_IMAGE_*
+// entries for Konflux image rewriting. Explicitly-provided env vars (e.g. from
+// --operator-env) take precedence and are not overwritten.
+func PopulateKonfluxEnvVars(config *Config) {
+	if config.Operator.EnvVars == nil {
+		config.Operator.EnvVars = make(map[string]string)
+	}
+	for envName, imageSuffix := range konfluxRelatedImages {
+		if _, exists := config.Operator.EnvVars[envName]; exists {
+			continue
+		}
+		config.Operator.EnvVars[envName] = fmt.Sprintf(
+			"%s/release-%s:%s",
+			constants.DefaultRegistry,
+			imageSuffix,
+			config.Operator.Version, // Konflux built images use the "operator tag".
+		)
+	}
+}

internal/deployer/konflux_test.go

@@ -0,0 +1,73 @@
+package deployer
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stackrox/roxie/internal/constants"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestKonfluxOperatorImage(t *testing.T) {
+	config := &Config{
+		Operator: OperatorConfig{Version: "4.9.2"},
+	}
+	expected := fmt.Sprintf("%s/release-operator:4.9.2", constants.DefaultRegistry)
+	assert.Equal(t, expected, KonfluxOperatorImage(config))
+}
+
+func TestPopulateKonfluxEnvVars_AllEntries(t *testing.T) {
+	config := &Config{
+		Operator: OperatorConfig{Version: "4.9.2"},
+	}
+
+	PopulateKonfluxEnvVars(config)
+
+	require.Len(t, config.Operator.EnvVars, len(konfluxRelatedImages))
+
+	for envName, imageSuffix := range konfluxRelatedImages {
+		expected := fmt.Sprintf("%s/release-%s:%s", constants.DefaultRegistry, imageSuffix, "4.9.2")
+		assert.Equal(t, expected, config.Operator.EnvVars[envName], "mismatch for %s", envName)
+	}
+}
+
+func TestPopulateKonfluxEnvVars_UserOverridePreserved(t *testing.T) {
+	userValue := "quay.io/custom/my-main:latest"
+	config := &Config{
+		Operator: OperatorConfig{
+			Version: "4.9.2",
+			EnvVars: map[string]string{
+				"RELATED_IMAGE_MAIN": userValue,
+			},
+		},
+	}
+
+	PopulateKonfluxEnvVars(config)
+
+	assert.Equal(t, userValue, config.Operator.EnvVars["RELATED_IMAGE_MAIN"],
+		"user override should be preserved")
+
+	assert.Len(t, config.Operator.EnvVars, len(konfluxRelatedImages),
+		"all other entries should be populated")
+
+	for envName, imageSuffix := range konfluxRelatedImages {
+		if envName == "RELATED_IMAGE_MAIN" {
+			continue
+		}
+		expected := fmt.Sprintf("%s/release-%s:%s", constants.DefaultRegistry, imageSuffix, "4.9.2")
+		assert.Equal(t, expected, config.Operator.EnvVars[envName], "mismatch for %s", envName)
+	}
+}
+
+func TestPopulateKonfluxEnvVars_NilEnvVarsMap(t *testing.T) {
+	config := &Config{
+		Operator: OperatorConfig{Version: "4.9.2"},
+	}
+	assert.Nil(t, config.Operator.EnvVars)
+
+	PopulateKonfluxEnvVars(config)
+
+	require.NotNil(t, config.Operator.EnvVars)
+	assert.Len(t, config.Operator.EnvVars, len(konfluxRelatedImages))
+}