Make central's exposure a pointer

Author: Moritz Clasmeier

cmd/deploy.go

@@ -186,7 +186,7 @@ Examples:
 				if err := yaml.Unmarshal([]byte(val), &exposure); err != nil {
 					return err
 				}
-				settings.Central.Exposure = exposure
+				settings.Central.Exposure = ptr.To(exposure)
 				return nil
 			},
 		), "exposure", "Central exposure backend (loadbalancer, none)")
@@ -432,11 +432,11 @@ func runDeploy(cmd *cobra.Command, args []string) error {
 		return errors.New("cannot use --envrc with central port-forwarding enabled. The --envrc flag is for non-interactive mode with remote cluster access")
 	}
 
-	if envrc != "" && deploySettings.Central.Exposure == types.ExposureNone {
-		return errors.New("cannot use --envrc with --exposure=none. The --envrc flag requires a remotely accessible endpoint (e.g., --exposure=loadbalancer)")
+	if envrc != "" && !deploySettings.Central.ExposureEnabled() {
+		return errors.New("cannot use --envrc without central exposure. The --envrc flag requires a remotely accessible endpoint (e.g., --exposure=loadbalancer)")
 	}
 
-	if !deploySettings.Central.PortForwardingSet() && deploySettings.Central.Exposure == types.ExposureNone {
+	if !deploySettings.Central.PortForwardingSet() && !deploySettings.Central.ExposureEnabled() {
 		log.Info("Enabling port-forwarding due to no exposure")
 		deploySettings.Central.PortForwarding = ptr.To(true)
 	}
@@ -446,7 +446,7 @@ func runDeploy(cmd *cobra.Command, args []string) error {
 		if deploySettings.Central.PortForwardingEnabled() {
 			return errors.New("containerized mode does not support port-forwarding")
 		}
-		if deploySettings.Central.Exposure == types.ExposureNone {
+		if !deploySettings.Central.ExposureEnabled() {
 			return errors.New("containerized mode requires Central exposure")
 		}
 

internal/clusterdefaults/clusterdefaults_test.go

@@ -6,76 +6,88 @@ import (
 	"github.com/stackrox/roxie/internal/deployer"
 	"github.com/stackrox/roxie/internal/logger"
 	"github.com/stackrox/roxie/internal/types"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"k8s.io/utils/ptr"
 )
 
 func TestClusterDefaults(t *testing.T) {
 	tests := []struct {
 		name                string
 		clusterType         types.ClusterType
 		wantResourceProfile types.ResourceProfile
-		wantExposure        types.Exposure
-		wantPortForwarding  bool
+		wantExposure        *types.Exposure
+		wantPortForwarding  *bool
 	}{
 		{
 			name:                "kind cluster with default params",
 			clusterType:         types.ClusterTypeKind,
 			wantResourceProfile: types.ResourceProfileSmall,
-			wantExposure:        types.ExposureNone,
-			wantPortForwarding:  true,
+			wantExposure:        ptr.To(types.ExposureNone),
+			wantPortForwarding:  ptr.To(true),
 		},
 		{
 			name:                "kind cluster with already correct params",
 			clusterType:         types.ClusterTypeKind,
 			wantResourceProfile: types.ResourceProfileSmall,
-			wantExposure:        types.ExposureNone,
-			wantPortForwarding:  true,
+			wantExposure:        ptr.To(types.ExposureNone),
+			wantPortForwarding:  ptr.To(true),
 		},
 		{
 			name:                "kind cluster with partial match",
 			clusterType:         types.ClusterTypeKind,
 			wantResourceProfile: types.ResourceProfileSmall,
-			wantExposure:        types.ExposureNone,
-			wantPortForwarding:  true,
+			wantExposure:        ptr.To(types.ExposureNone),
+			wantPortForwarding:  ptr.To(true),
 		},
 		{
 			name:                "unknown cluster type",
 			clusterType:         types.ClusterTypeUnknown,
 			wantResourceProfile: types.ResourceProfileAcsDefaults,
-			wantExposure:        types.ExposureNone,
-			wantPortForwarding:  false,
+			wantExposure:        nil,
+			wantPortForwarding:  nil,
 		},
 		{
 			name:                "minikube cluster",
 			clusterType:         types.ClusterTypeMinikube,
 			wantResourceProfile: types.ResourceProfileSmall,
-			wantExposure:        types.ExposureNone,
-			wantPortForwarding:  true,
+			wantExposure:        ptr.To(types.ExposureNone),
+			wantPortForwarding:  ptr.To(true),
 		},
 		{
 			name:                "crc cluster",
 			clusterType:         types.ClusterTypeCRC,
 			wantResourceProfile: types.ResourceProfileSmall,
-			wantExposure:        types.ExposureNone,
-			wantPortForwarding:  true,
+			wantExposure:        ptr.To(types.ExposureNone),
+			wantPortForwarding:  ptr.To(true),
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			config := deployer.Config{}
+			config := deployer.NewConfig()
 			err := ApplyClusterDefaults(logger.New(), tt.clusterType, &config)
 			require.NoError(t, err)
 
 			gotResourceProfile := ResolveAutoResourceProfile(tt.clusterType)
 			if gotResourceProfile != tt.wantResourceProfile {
 				t.Errorf("Apply() resources = %v, want %v", gotResourceProfile, tt.wantResourceProfile)
 			}
-			if config.Central.Exposure != tt.wantExposure {
-				t.Errorf("Apply() exposure = %v, want %v", config.Central.Exposure, tt.wantExposure)
+
+			if tt.wantExposure == nil {
+				assert.Nil(t, config.Central.Exposure, "central exposure is not nil")
+			} else {
+				require.NotNil(t, config.Central.Exposure, "central exposure is nil")
+				assert.Equal(t, *tt.wantExposure, *config.Central.Exposure,
+					"exposure = %v, want %v", *config.Central.Exposure, *tt.wantExposure)
 			}
-			if config.Central.PortForwardingEnabled() != tt.wantPortForwarding {
-				t.Errorf("Apply() portForward = %v, want %v", config.Central.PortForwardingEnabled(), tt.wantPortForwarding)
+
+			if tt.wantPortForwarding == nil {
+				assert.Nil(t, config.Central.PortForwarding, "central port forwarding is not nil")
+			} else {
+				require.NotNil(t, config.Central.PortForwarding, "central port forwarding is nil")
+				assert.Equal(t, *tt.wantPortForwarding, *config.Central.PortForwarding,
+					"portForward = %v, want %v", *config.Central.PortForwarding, *tt.wantPortForwarding)
 			}
 		})
 	}

internal/deployer/config.go

@@ -158,7 +158,7 @@ type CentralConfig struct {
 	Namespace           string                 `yaml:"namespace"`
 	ResourceProfile     types.ResourceProfile  `yaml:"resourceProfile"`
 	PauseReconciliation bool                   `yaml:"pauseReconciliation"`
-	Exposure            types.Exposure         `yaml:"exposure"`
+	Exposure            *types.Exposure        `yaml:"exposure"`
 	DeployTimeout       time.Duration          `yaml:"deployTimeout"`
 	PortForwarding      *bool                  `yaml:"portForwarding"`
 	EarlyReadiness      bool                   `yaml:"earlyReadiness"`
@@ -173,6 +173,21 @@ func (c *CentralConfig) PortForwardingEnabled() bool {
 	return c.PortForwarding != nil && *c.PortForwarding
 }
 
+func (c *CentralConfig) ExposureSet() bool {
+	return c.Exposure != nil
+}
+
+func (c *CentralConfig) ExposureEnabled() bool {
+	return c.Exposure != nil && *c.Exposure != types.ExposureNone
+}
+
+func (c *CentralConfig) GetExposure() types.Exposure {
+	if c.Exposure == nil {
+		return types.ExposureNone
+	}
+	return *c.Exposure
+}
+
 type SecuredClusterConfig struct {
 	Namespace           string                 `yaml:"namespace"`
 	ResourceProfile     types.ResourceProfile  `yaml:"resourceProfile"`
@@ -200,7 +215,6 @@ func DefaultCentralConfig() CentralConfig {
 	return CentralConfig{
 		DeployTimeout: DefaultCentralWaitTimeout,
 		Namespace:     "acs-central",
-		Exposure:      types.ExposureLoadBalancer,
 		Spec: map[string]interface{}{
 			"central": map[string]interface{}{
 				"telemetry": map[string]interface{}{

internal/deployer/deploy_via_operator.go

@@ -528,7 +528,7 @@ func (d *Deployer) fetchCentralCACert(ctx context.Context) error {
 
 // configureCentralEndpoint configures the central endpoint in the Deployer based on exposure settings.
 func (d *Deployer) configureCentralEndpoint(ctx context.Context) error {
-	exposure := d.config.Central.Exposure
+	exposure := d.config.Central.GetExposure()
 	if d.config.Central.PortForwardingEnabled() {
 		// Start port-forward for CLI tool access via localhost:8443
 		serviceName := "central"

internal/deployer/deployer.go

@@ -828,7 +828,7 @@ func (d *Deployer) PrintCentralDeploymentSummary() {
 	component := "Central"
 	mainImageTag := d.config.Roxie.Version
 	olm := d.config.Operator.DeployViaOlm
-	exposure := d.config.Central.Exposure
+	exposure := d.config.Central.GetExposure()
 	portForwarding := d.config.Central.PortForwardingEnabled()
 	log := d.logger
 	kubeContext := d.kubeContext
@@ -1073,7 +1073,7 @@ func (d *Deployer) GetCentralDeploymentInfo() CentralDeploymentInfo {
 		Endpoint:    d.centralEndpoint,
 		Password:    d.centralPassword,
 		KubeContext: d.kubeContext,
-		Exposure:    d.config.Central.Exposure,
+		Exposure:    d.config.Central.GetExposure(),
 		CACertFile:  d.roxCACertFile,
 	}
 }