feat(ui): validate admin console and lam port are not the same as manager (#2308)

Author: emosbaugh

api/internal/managers/installation/config.go

@@ -111,6 +111,10 @@ func (m *installationManager) validateAdminConsolePort(config *types.Installatio
 		return errors.New("adminConsolePort and localArtifactMirrorPort cannot be equal")
 	}
 
+	if config.AdminConsolePort == m.rc.ManagerPort() {
+		return errors.New("adminConsolePort cannot be the same as the manager port")
+	}
+
 	return nil
 }
 
@@ -128,6 +132,10 @@ func (m *installationManager) validateLocalArtifactMirrorPort(config *types.Inst
 		return errors.New("adminConsolePort and localArtifactMirrorPort cannot be equal")
 	}
 
+	if config.LocalArtifactMirrorPort == m.rc.ManagerPort() {
+		return errors.New("localArtifactMirrorPort cannot be the same as the manager port")
+	}
+
 	return nil
 }
 

api/internal/managers/installation/config_test.go

@@ -13,12 +13,14 @@ import (
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
 	"github.com/replicatedhq/embedded-cluster/pkg-new/hostutils"
+	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
 )
 
 func TestValidateConfig(t *testing.T) {
 	// Create test cases for validation
 	tests := []struct {
 		name        string
+		rc          runtimeconfig.RuntimeConfig
 		config      *types.InstallationConfig
 		expectedErr bool
 	}{
@@ -139,11 +141,52 @@ func TestValidateConfig(t *testing.T) {
 			},
 			expectedErr: true,
 		},
+		{
+			name: "same ports for admin console and manager",
+			rc: func() runtimeconfig.RuntimeConfig {
+				rc := runtimeconfig.New(nil)
+				rc.SetManagerPort(8800)
+				return rc
+			}(),
+			config: &types.InstallationConfig{
+				GlobalCIDR:              "10.0.0.0/16",
+				NetworkInterface:        "eth0",
+				AdminConsolePort:        8800,
+				LocalArtifactMirrorPort: 8888,
+				DataDirectory:           "/var/lib/embedded-cluster",
+			},
+			expectedErr: true,
+		},
+		{
+			name: "same ports for artifact mirror and manager",
+			rc: func() runtimeconfig.RuntimeConfig {
+				rc := runtimeconfig.New(nil)
+				rc.SetManagerPort(8888)
+				return rc
+			}(),
+			config: &types.InstallationConfig{
+				GlobalCIDR:              "10.0.0.0/16",
+				NetworkInterface:        "eth0",
+				AdminConsolePort:        8800,
+				LocalArtifactMirrorPort: 8888,
+				DataDirectory:           "/var/lib/embedded-cluster",
+			},
+			expectedErr: true,
+		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			manager := NewInstallationManager()
+			var rc runtimeconfig.RuntimeConfig
+			if tt.rc != nil {
+				rc = tt.rc
+			} else {
+				rc = runtimeconfig.New(nil)
+			}
+			rc.SetDataDir(t.TempDir())
+
+			manager := NewInstallationManager(WithRuntimeConfig(rc))
+
 			err := manager.ValidateConfig(tt.config)
 
 			if tt.expectedErr {

pkg/runtimeconfig/interface.go

@@ -26,6 +26,7 @@ type RuntimeConfig interface {
 	WriteToDisk() error
 	LocalArtifactMirrorPort() int
 	AdminConsolePort() int
+	ManagerPort() int
 	HostCABundlePath() string
 	SetDataDir(dataDir string)
 	SetLocalArtifactMirrorPort(port int)

pkg/runtimeconfig/mock.go

@@ -133,6 +133,12 @@ func (m *MockRuntimeConfig) AdminConsolePort() int {
 	return args.Int(0)
 }
 
+// ManagerPort mocks the ManagerPort method
+func (m *MockRuntimeConfig) ManagerPort() int {
+	args := m.Called()
+	return args.Int(0)
+}
+
 // HostCABundlePath mocks the HostCABundlePath method
 func (m *MockRuntimeConfig) HostCABundlePath() string {
 	args := m.Called()

pkg/runtimeconfig/runtimeconfig.go

@@ -207,6 +207,15 @@ func (rc *runtimeConfig) AdminConsolePort() int {
 	return ecv1beta1.DefaultAdminConsolePort
 }
 
+// ManagerPort returns the configured port for the manager or the default if not
+// configured.
+func (rc *runtimeConfig) ManagerPort() int {
+	if rc.spec.Manager.Port > 0 {
+		return rc.spec.Manager.Port
+	}
+	return ecv1beta1.DefaultManagerPort
+}
+
 // HostCABundlePath returns the path to the host CA bundle.
 func (rc *runtimeConfig) HostCABundlePath() string {
 	return rc.spec.HostCABundlePath