Adjusted for new bool ptrs.

Author: Moritz Clasmeier

cmd/deploy.go

@@ -25,7 +25,6 @@ import (
 	"github.com/stackrox/roxie/internal/stackroxversions"
 	"gopkg.in/yaml.v3"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/utils/ptr"
 )
 
 const (
@@ -55,39 +54,39 @@ Examples:
 	registerFlag(cmd, settings, "olm", "Deploy operator via OLM (requires OLM installed)",
 		withNoOptDefVal("true"),
 		withApplyFnBool(func(config *deployer.Config, val bool) error {
-			config.Operator.DeployViaOlm = val
+			config.Operator.DeployViaOlm = new(val)
 			return nil
 		}),
 	)
 
 	registerFlag(cmd, settings, "konflux", "Use Konflux images",
 		withNoOptDefVal("true"),
 		withApplyFnBool(func(config *deployer.Config, val bool) error {
-			config.Roxie.KonfluxImages = val
+			config.Roxie.KonfluxImages = new(val)
 			return nil
 		}),
 	)
 
 	registerFlag(cmd, settings, "deploy-operator", "Whether to deploy and manage the operator",
 		withNoOptDefVal("true"),
 		withApplyFnBool(func(config *deployer.Config, val bool) error {
-			config.Operator.SkipDeployment = !val
+			config.Operator.SkipDeployment = new(!val)
 			return nil
 		}),
 	)
 
 	registerFlag(cmd, settings, "port-forwarding", "Enable localhost port-forward for Central",
 		withNoOptDefVal("true"),
 		withApplyFnBool(func(config *deployer.Config, val bool) error {
-			config.Central.PortForwarding = ptr.To(val)
+			config.Central.PortForwarding = new(val)
 			return nil
 		}),
 	)
 
 	registerFlag(cmd, settings, "pause-reconciliation", "Pause reconciliation after deployment",
 		withNoOptDefVal("true"),
 		withApplyFnBool(func(config *deployer.Config, val bool) error {
-			config.Central.PauseReconciliation = val
+			config.Central.PauseReconciliation = new(val)
 			config.SecuredCluster.PauseReconciliation = val
 			return nil
 		}),
@@ -120,7 +119,7 @@ Examples:
 			if err := yaml.Unmarshal([]byte(val), &exposure); err != nil {
 				return err
 			}
-			config.Central.Exposure = ptr.To(exposure)
+			config.Central.Exposure = new(exposure)
 			return nil
 		}),
 	)
@@ -228,7 +227,7 @@ Examples:
 	registerFlag(cmd, settings, "early-readiness", "Only wait for essential workloads (central/sensor) to be ready",
 		withNoOptDefVal("true"),
 		withApplyFnBool(func(config *deployer.Config, val bool) error {
-			config.Central.EarlyReadiness = val
+			config.Central.EarlyReadiness = new(val)
 			config.SecuredCluster.EarlyReadiness = val
 			return nil
 		}),
@@ -282,7 +281,7 @@ func runDeploy(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	if !deploySettings.Central.EarlyReadiness || !deploySettings.SecuredCluster.EarlyReadiness {
+	if !deploySettings.Central.EarlyReadinessEnabled() || !deploySettings.SecuredCluster.EarlyReadiness {
 		// Explanation on the versions involved here:
 		// Deploying StackRox begins with picking a "main image tag" -- this is a version identifier, which cannot be reliably parsed as a semver.
 		// But there is a derived version from that -- the operator version -- which can be parsed as a semver.
@@ -411,7 +410,7 @@ func configureConfig(log *logger.Logger, components component.Component, deployS
 
 	if !deploySettings.Central.PortForwardingSet() && !deploySettings.Central.ExposureEnabled() {
 		log.Info("Enabling port-forwarding due to no exposure")
-		deploySettings.Central.PortForwarding = ptr.To(true)
+		deploySettings.Central.PortForwarding = new(true)
 	}
 
 	return nil
@@ -448,12 +447,12 @@ func deployValidate(components component.Component, deploySettings *deployer.Con
 		}
 	}
 
-	if deploySettings.Operator.SkipDeployment && deploySettings.Operator.DeployViaOlm {
+	if deploySettings.Operator.SkipDeploymentEnabled() && deploySettings.Operator.DeployViaOlmEnabled() {
 		return errors.New("skipping operator deployment while also requesting deploying via OLM at the same time does not make sense")
 	}
 
-	if deploySettings.Roxie.KonfluxImages {
-		if deploySettings.Operator.DeployViaOlm {
+	if deploySettings.Roxie.KonfluxImagesEnabled() {
+		if deploySettings.Operator.DeployViaOlmEnabled() {
 			return errors.New("using Konflux images while deploying operator via OLM is not supported")
 		}
 		if !clusterType.IsOpenShift() {

internal/deployer/deploy_via_operator.go

@@ -46,7 +46,7 @@ func (d *Deployer) deployOperatorOnly(ctx context.Context) error {
 // ensureOperatorDeployed ensures the operator is deployed with the correct version and mode
 func (d *Deployer) ensureOperatorDeployed(ctx context.Context) error {
 	// Skip operator deployment/checks if flag is set to false
-	if d.config.Operator.SkipDeployment {
+	if d.config.Operator.SkipDeploymentEnabled() {
 		d.logger.Info("ℹ️  Skipping operator deployment checks (--deploy-operator=false)")
 		d.logger.Info("   Assuming operator is already running...")
 		return nil
@@ -66,12 +66,12 @@ func (d *Deployer) ensureOperatorDeployed(ctx context.Context) error {
 
 	if !operatorExists {
 		needsDeployment = true
-	} else if d.config.Operator.DeployViaOlm && currentMode == OperatorModeNonOLM {
+	} else if d.config.Operator.DeployViaOlmEnabled() && currentMode == OperatorModeNonOLM {
 		// Switching from non-OLM to OLM
 		d.logger.Info("🔄 Switching operator from non-OLM to OLM mode...")
 		needsTeardown = true
 		needsDeployment = true
-	} else if !d.config.Operator.DeployViaOlm && currentMode == OperatorModeOLM {
+	} else if !d.config.Operator.DeployViaOlmEnabled() && currentMode == OperatorModeOLM {
 		// Switching from OLM to non-OLM
 		d.logger.Info("🔄 Switching operator from OLM to non-OLM mode...")
 		needsTeardown = true
@@ -101,7 +101,7 @@ func (d *Deployer) ensureOperatorDeployed(ctx context.Context) error {
 	}
 
 	if needsDeployment {
-		if d.config.Operator.DeployViaOlm {
+		if d.config.Operator.DeployViaOlmEnabled() {
 			if err := d.deployOperatorViaOLM(ctx); err != nil {
 				return fmt.Errorf("failed to deploy operator via OLM: %w", err)
 			}
@@ -141,7 +141,7 @@ func (d *Deployer) deployCentralOperator(ctx context.Context) error {
 		return fmt.Errorf("failed waiting for Central: %w", err)
 	}
 
-	if d.config.Central.PauseReconciliation {
+	if d.config.Central.PauseReconciliationEnabled() {
 		d.logger.Infof("Adding pause-reconcile annotation to Central")
 		err := d.addPauseReconcileAnnotation(ctx, "Central", centralCrName, d.config.Central.Namespace)
 		if err != nil {

internal/deployer/deployer.go

@@ -727,7 +727,7 @@ func (d *Deployer) writeEnvrcFile(ctx context.Context) error {
 func (d *Deployer) PrintCentralDeploymentSummary() {
 	component := "Central"
 	mainImageTag := d.config.Roxie.Version
-	olm := d.config.Operator.DeployViaOlm
+	olm := d.config.Operator.DeployViaOlmEnabled()
 	exposure := d.config.Central.GetExposure()
 	portForwarding := d.config.Central.PortForwardingEnabled()
 	log := d.logger
@@ -908,7 +908,7 @@ func (d *Deployer) checkPodProgressInNamespace(ctx context.Context, namespace st
 func (d *Deployer) PrintSecuredClusterDeploymentSummary() {
 	component := "Secured Cluster"
 	mainImageTag := d.config.Roxie.Version
-	olm := d.config.Operator.DeployViaOlm
+	olm := d.config.Operator.DeployViaOlmEnabled()
 	log := d.logger
 	kubeContext := d.kubeContext
 

internal/deployer/operator.go

@@ -35,7 +35,7 @@ var requiredCRDs = []string{
 // deployOperatorNonOLM deploys the RHACS operator without OLM
 func (d *Deployer) deployOperatorNonOLM(ctx context.Context) error {
 	d.logger.Infof("Operator tag: %s", d.config.Operator.Version)
-	if d.config.Roxie.KonfluxImages {
+	if d.config.Roxie.KonfluxImagesEnabled() {
 		if err := d.ensureKonfluxImageRewriting(ctx); err != nil {
 			return fmt.Errorf("failed to configure Konflux image rewriting: %w", err)
 		}
@@ -191,7 +191,7 @@ func (d *Deployer) ensureCRDsInstalled(ctx context.Context) error {
 }
 
 func (d *Deployer) getOperatorBundleImage() string {
-	if d.config.Roxie.KonfluxImages {
+	if d.config.Roxie.KonfluxImagesEnabled() {
 		d.logger.Infof("Using Konflux-built operator bundle image")
 		return fmt.Sprintf(operatorBundleImageReleaseRepo+":v%s", d.config.Operator.Version)
 	}
@@ -318,7 +318,7 @@ func (d *Deployer) deployOperatorFromCSV(ctx context.Context, bundleDir string)
 	}
 
 	serviceAccountName := deploymentSpec["service_account"].(string)
-	d.useOperatorPullSecrets = d.config.Roxie.KonfluxImages && d.config.Roxie.ClusterType.NeedsPullSecrets()
+	d.useOperatorPullSecrets = d.config.Roxie.KonfluxImagesEnabled() && d.config.Roxie.ClusterType.NeedsPullSecrets()
 
 	d.logger.Info("📋 Operator deployment plan:")
 	d.logger.Dim(fmt.Sprintf("  • Namespace: %s", operatorNamespace))