fix: resolve operator version and Konflux selection at read time

cmd/deploy.go

@@ -462,13 +462,6 @@ func configureConfig(components component.Component, deploySettings *deployer.Co
 		log.Warning("You are deploying SecuredCluster to a local cluster, it is recommended to specify a resource profile (or --resources=auto)")
 	}
 
-	// We need to do this regardless of whether the operator is deployed or not, because
-	// this includes the transformation of StackRox main image tags to semver compatible versions,
-	// which we will make use of later for checking version constraints.
-	if err := deploySettings.Operator.Configure(&deploySettings.Roxie); err != nil {
-		return fmt.Errorf("configuring operator configuration: %w", err)
-	}
-
 	if components.IncludesCentral() {
 		if err := deploySettings.Central.ConfigureSpec(&deploySettings.Roxie); err != nil {
 			return fmt.Errorf("configuring Central spec: %w", err)

internal/deployer/config.go

@@ -167,15 +167,6 @@ func (c *OperatorConfig) DeployViaOlmEnabled() bool {
 	return c.DeployViaOlm != nil && *c.DeployViaOlm
 }
 
-// Configure derives the operator version from the roxie configuration.
-func (c *OperatorConfig) Configure(roxieConfig *RoxieConfig) error {
-	c.Version = roxieConfig.Version
-	if c.KonfluxImages == nil {
-		c.KonfluxImages = roxieConfig.KonfluxImages
-	}
-	return nil
-}
-
 // WaitConfig describes how to wait for a component to become ready.
 type WaitConfig struct {
 	Namespace      string

internal/deployer/operator_instances.go

@@ -31,21 +31,27 @@ var AllOperatorNamespaces = []string{
 }
 
 // CentralVersion returns the main image tag for Central.
-// Uses central.operator.version if set, otherwise falls back to operator.version.
+// Resolution order: central.operator.version, then operator.version, then roxie.version.
 func (c *Config) CentralVersion() imagetag.MainTag {
 	if c.Central.Operator.Version != "" {
 		return c.Central.Operator.Version
 	}
-	return c.Operator.Version
+	if c.Operator.Version != "" {
+		return c.Operator.Version
+	}
+	return c.Roxie.Version
 }
 
 // SecuredClusterVersion returns the main image tag for SecuredCluster.
-// Uses securedCluster.operator.version if set, otherwise falls back to operator.version.
+// Resolution order: securedCluster.operator.version, then operator.version, then roxie.version.
 func (c *Config) SecuredClusterVersion() imagetag.MainTag {
 	if c.SecuredCluster.Operator.Version != "" {
 		return c.SecuredCluster.Operator.Version
 	}
-	return c.Operator.Version
+	if c.Operator.Version != "" {
+		return c.Operator.Version
+	}
+	return c.Roxie.Version
 }
 
 // HasMixedVersions reports whether Central and SecuredCluster use different operator versions.
@@ -113,13 +119,17 @@ func (c *Config) OperatorInstances() ([]OperatorInstanceConfig, bool, error) {
 	}, false, err
 }
 
-// resolveKonfluxImages returns the effective KonfluxImages setting for a per-component
-// operator config, falling back to Operator.KonfluxImages if not set at the component level.
+// resolveKonfluxImages returns the effective KonfluxImages setting for an operator
+// instance. Resolution order: the per-component value, then operator.konfluxImages,
+// then roxie.konfluxImages.
 func (c *Config) resolveKonfluxImages(instanceCfg *OperatorInstanceConfig) *bool {
 	if instanceCfg.KonfluxImagesSet() {
 		return instanceCfg.KonfluxImages
 	}
-	return c.Operator.KonfluxImages
+	if c.Operator.KonfluxImagesSet() {
+		return c.Operator.KonfluxImages
+	}
+	return c.Roxie.KonfluxImages
 }
 
 // NewestOperatorInstance returns the operator instance with the highest version.

internal/deployer/operator_instances_test.go

@@ -9,18 +9,44 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestConfigure_PropagatesRoxieVersion(t *testing.T) {
+// With nothing but roxie.version set, the operator versions resolve to it.
+func TestVersionResolvesFromRoxieVersion(t *testing.T) {
 	cfg := Config{
 		Roxie: RoxieConfig{Version: "4.11.1"},
 	}
-	err := cfg.Operator.Configure(&cfg.Roxie)
-	require.NoError(t, err)
-
-	assert.Equal(t, imagetag.MainTag("4.11.1"), cfg.Operator.Version)
 	assert.Equal(t, imagetag.MainTag("4.11.1"), cfg.CentralVersion())
 	assert.Equal(t, imagetag.MainTag("4.11.1"), cfg.SecuredClusterVersion())
 }
 
+// An explicit operator.version must take precedence over roxie.version.
+func TestExplicitOperatorVersionHonoredOverRoxieVersion(t *testing.T) {
+	cfg := Config{
+		Roxie:    RoxieConfig{Version: "5.1.0-rcd", ImageRegistry: constants.DefaultRegistry},
+		Operator: OperatorConfig{OperatorInstanceConfig: OperatorInstanceConfig{Version: "5.1.0"}},
+	}
+
+	assert.Equal(t, imagetag.MainTag("5.1.0"), cfg.CentralVersion())
+	assert.Equal(t, imagetag.MainTag("5.1.0"), cfg.SecuredClusterVersion())
+
+	inst := cfg.NewestOperatorInstance()
+	assert.Equal(t, constants.DefaultRegistry+"/stackrox-operator-bundle:v5.1.0", inst.BundleImage())
+}
+
+// KonfluxImages must resolve from roxie.konfluxImages when not set at the
+// operator or per-component level.
+func TestKonfluxImagesResolveFromRoxie(t *testing.T) {
+	konflux := true
+	cfg := Config{
+		Roxie:    RoxieConfig{Version: "4.8.0", KonfluxImages: &konflux},
+		Operator: OperatorConfig{OperatorInstanceConfig: OperatorInstanceConfig{Version: "4.8.0"}},
+	}
+
+	instances, _, err := cfg.OperatorInstances()
+	require.NoError(t, err)
+	require.Len(t, instances, 1)
+	assert.True(t, instances[0].KonfluxImagesEnabled())
+}
+
 func TestVersions_DefaultToRoxieVersion(t *testing.T) {
 	cfg := Config{
 		Roxie:    RoxieConfig{Version: "4.9.0"},