Skip to content

Commit 5df3e56

Browse files
sgalsalehsgalsaleh
authored
Remove admin console port option in v3 installations (#3239)
* Remove admin console port option in v3 installations
1 parent 0e0f954 commit 5df3e56

File tree

27 files changed

+89
-323
lines changed

27 files changed

+89
-323
lines changed

‎api/client/client_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ func TestLinuxGetInstallationConfig(t *testing.T) {
115115
w.WriteHeader(http.StatusOK)
116116
json.NewEncoder(w).Encode(types.LinuxInstallationConfigResponse{
117117
Values: types.LinuxInstallationConfig{
118-
GlobalCIDR: "10.0.0.0/24",
119-
AdminConsolePort: 8080,
118+
GlobalCIDR: "10.0.0.0/24",
119+
LocalArtifactMirrorPort: 8080,
120120
},
121121
})
122122
}))
@@ -127,7 +127,7 @@ func TestLinuxGetInstallationConfig(t *testing.T) {
127127
config, err := c.GetLinuxInstallationConfig(context.Background())
128128
assert.NoError(t, err)
129129
assert.Equal(t, "10.0.0.0/24", config.Values.GlobalCIDR)
130-
assert.Equal(t, 8080, config.Values.AdminConsolePort)
130+
assert.Equal(t, 8080, config.Values.LocalArtifactMirrorPort)
131131

132132
// Test error response
133133
errorServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

‎api/controllers/linux/install/controller_test.go‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,19 @@ func TestGetInstallationConfig(t *testing.T) {
6060
name: "successful read with values and defaults",
6161
setupMock: func(m *installation.MockInstallationManager, rc runtimeconfig.RuntimeConfig) {
6262
values := types.LinuxInstallationConfig{
63-
AdminConsolePort: 9000,
64-
GlobalCIDR: "10.0.0.1/16",
63+
LocalArtifactMirrorPort: 9000,
64+
GlobalCIDR: "10.0.0.1/16",
6565
}
6666

6767
defaults := types.LinuxInstallationConfig{
68-
AdminConsolePort: 30000,
6968
DataDirectory: rc.EmbeddedClusterHomeDirectory(),
7069
LocalArtifactMirrorPort: 50000,
7170
GlobalCIDR: "10.244.0.0/16",
7271
}
7372

7473
resolvedConfig := types.LinuxInstallationConfig{
75-
AdminConsolePort: 9000,
7674
DataDirectory: rc.EmbeddedClusterHomeDirectory(),
77-
LocalArtifactMirrorPort: 50000,
75+
LocalArtifactMirrorPort: 9000,
7876
GlobalCIDR: "10.0.0.1/16",
7977
}
8078

@@ -88,19 +86,17 @@ func TestGetInstallationConfig(t *testing.T) {
8886
expectedValue: func(tempDir string) types.LinuxInstallationConfigResponse {
8987
return types.LinuxInstallationConfigResponse{
9088
Values: types.LinuxInstallationConfig{
91-
AdminConsolePort: 9000,
92-
GlobalCIDR: "10.0.0.1/16",
89+
LocalArtifactMirrorPort: 9000,
90+
GlobalCIDR: "10.0.0.1/16",
9391
},
9492
Defaults: types.LinuxInstallationConfig{
95-
AdminConsolePort: 30000,
9693
DataDirectory: tempDir,
9794
LocalArtifactMirrorPort: 50000,
9895
GlobalCIDR: "10.244.0.0/16",
9996
},
10097
Resolved: types.LinuxInstallationConfig{
101-
AdminConsolePort: 9000,
10298
DataDirectory: tempDir,
103-
LocalArtifactMirrorPort: 50000,
99+
LocalArtifactMirrorPort: 9000,
104100
GlobalCIDR: "10.0.0.1/16",
105101
},
106102
}

‎api/controllers/linux/install/installation.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ func (c *InstallController) configureInstallation(_ context.Context, logger logr
129129
// update the runtime config
130130
c.rc.SetDataDir(resolvedConfig.DataDirectory)
131131
c.rc.SetLocalArtifactMirrorPort(resolvedConfig.LocalArtifactMirrorPort)
132-
c.rc.SetAdminConsolePort(resolvedConfig.AdminConsolePort)
133132
c.rc.SetProxySpec(proxy)
134133
c.rc.SetNetworkSpec(networkSpec)
135134

‎api/docs/docs.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/docs/swagger.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎api/docs/swagger.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,8 +1008,6 @@ components:
10081008
type: object
10091009
types.LinuxInstallationConfig:
10101010
properties:
1011-
adminConsolePort:
1012-
type: integer
10131011
dataDirectory:
10141012
type: string
10151013
globalCidr:

‎api/internal/managers/linux/infra/install.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ func (m *infraManager) getAddonInstallOpts(ctx context.Context, license *kotsv1b
280280
opts := addons.InstallOptions{
281281
ClusterID: m.clusterID,
282282
AdminConsolePwd: m.password,
283-
AdminConsolePort: rc.AdminConsolePort(),
284283
License: license,
285284
IsAirgap: m.airgapBundle != "",
286285
TLSCertBytes: m.tlsConfig.CertBytes,

‎api/internal/managers/linux/installation/config.go‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ func (m *installationManager) SetConfigValues(config types.LinuxInstallationConf
5050
// GetDefaults returns the default values for installation configuration
5151
func (m *installationManager) GetDefaults(rc runtimeconfig.RuntimeConfig) (types.LinuxInstallationConfig, error) {
5252
defaults := types.LinuxInstallationConfig{
53-
AdminConsolePort: ecv1beta1.DefaultAdminConsolePort,
5453
DataDirectory: rc.EmbeddedClusterHomeDirectory(),
5554
LocalArtifactMirrorPort: ecv1beta1.DefaultLocalArtifactMirrorPort,
5655
GlobalCIDR: ecv1beta1.DefaultNetworkCIDR,
@@ -77,9 +76,6 @@ func (m *installationManager) setConfigDefaults(config *types.LinuxInstallationC
7776
if err != nil {
7877
return fmt.Errorf("get defaults: %w", err)
7978
}
80-
if config.AdminConsolePort == 0 {
81-
config.AdminConsolePort = defaults.AdminConsolePort
82-
}
8379

8480
if config.DataDirectory == "" {
8581
config.DataDirectory = defaults.DataDirectory
@@ -148,10 +144,6 @@ func (m *installationManager) ValidateConfig(config types.LinuxInstallationConfi
148144
ve = types.AppendFieldError(ve, "networkInterface", err)
149145
}
150146

151-
if err := m.validateAdminConsolePort(config, managerPort); err != nil {
152-
ve = types.AppendFieldError(ve, "adminConsolePort", err)
153-
}
154-
155147
if err := m.validateLocalArtifactMirrorPort(config, managerPort); err != nil {
156148
ve = types.AppendFieldError(ve, "localArtifactMirrorPort", err)
157149
}
@@ -205,41 +197,11 @@ func (m *installationManager) validateNetworkInterface(config types.LinuxInstall
205197
return nil
206198
}
207199

208-
func (m *installationManager) validateAdminConsolePort(config types.LinuxInstallationConfig, managerPort int) error {
209-
if config.AdminConsolePort == 0 {
210-
return errors.New("adminConsolePort is required")
211-
}
212-
213-
lamPort := config.LocalArtifactMirrorPort
214-
if lamPort == 0 {
215-
lamPort = ecv1beta1.DefaultLocalArtifactMirrorPort
216-
}
217-
218-
if config.AdminConsolePort == lamPort {
219-
return errors.New("adminConsolePort and localArtifactMirrorPort cannot be equal")
220-
}
221-
222-
if config.AdminConsolePort == managerPort {
223-
return errors.New("adminConsolePort cannot be the same as the manager port")
224-
}
225-
226-
return nil
227-
}
228-
229200
func (m *installationManager) validateLocalArtifactMirrorPort(config types.LinuxInstallationConfig, managerPort int) error {
230201
if config.LocalArtifactMirrorPort == 0 {
231202
return errors.New("localArtifactMirrorPort is required")
232203
}
233204

234-
acPort := config.AdminConsolePort
235-
if acPort == 0 {
236-
acPort = ecv1beta1.DefaultAdminConsolePort
237-
}
238-
239-
if config.LocalArtifactMirrorPort == acPort {
240-
return errors.New("adminConsolePort and localArtifactMirrorPort cannot be equal")
241-
}
242-
243205
if config.LocalArtifactMirrorPort == managerPort {
244206
return errors.New("localArtifactMirrorPort cannot be the same as the manager port")
245207
}

‎api/internal/managers/linux/installation/config_test.go‎

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ func TestValidateConfig(t *testing.T) {
2828
config: types.LinuxInstallationConfig{
2929
GlobalCIDR: "10.0.0.0/16",
3030
NetworkInterface: "eth0",
31-
AdminConsolePort: 8800,
3231
LocalArtifactMirrorPort: 8888,
3332
DataDirectory: "/var/lib/embedded-cluster",
3433
},
@@ -40,7 +39,6 @@ func TestValidateConfig(t *testing.T) {
4039
PodCIDR: "10.0.0.0/17",
4140
ServiceCIDR: "10.0.128.0/17",
4241
NetworkInterface: "eth0",
43-
AdminConsolePort: 8800,
4442
LocalArtifactMirrorPort: 8888,
4543
DataDirectory: "/var/lib/embedded-cluster",
4644
},
@@ -50,7 +48,6 @@ func TestValidateConfig(t *testing.T) {
5048
name: "missing network interface",
5149
config: types.LinuxInstallationConfig{
5250
GlobalCIDR: "10.0.0.0/16",
53-
AdminConsolePort: 8800,
5451
LocalArtifactMirrorPort: 8888,
5552
DataDirectory: "/var/lib/embedded-cluster",
5653
},
@@ -60,7 +57,6 @@ func TestValidateConfig(t *testing.T) {
6057
name: "missing global CIDR and pod/service CIDRs",
6158
config: types.LinuxInstallationConfig{
6259
NetworkInterface: "eth0",
63-
AdminConsolePort: 8800,
6460
LocalArtifactMirrorPort: 8888,
6561
DataDirectory: "/var/lib/embedded-cluster",
6662
},
@@ -71,7 +67,6 @@ func TestValidateConfig(t *testing.T) {
7167
config: types.LinuxInstallationConfig{
7268
ServiceCIDR: "10.0.128.0/17",
7369
NetworkInterface: "eth0",
74-
AdminConsolePort: 8800,
7570
LocalArtifactMirrorPort: 8888,
7671
DataDirectory: "/var/lib/embedded-cluster",
7772
},
@@ -82,7 +77,6 @@ func TestValidateConfig(t *testing.T) {
8277
config: types.LinuxInstallationConfig{
8378
PodCIDR: "10.0.0.0/17",
8479
NetworkInterface: "eth0",
85-
AdminConsolePort: 8800,
8680
LocalArtifactMirrorPort: 8888,
8781
DataDirectory: "/var/lib/embedded-cluster",
8882
},
@@ -93,17 +87,6 @@ func TestValidateConfig(t *testing.T) {
9387
config: types.LinuxInstallationConfig{
9488
GlobalCIDR: "10.0.0.0/24", // Not a /16
9589
NetworkInterface: "eth0",
96-
AdminConsolePort: 8800,
97-
LocalArtifactMirrorPort: 8888,
98-
DataDirectory: "/var/lib/embedded-cluster",
99-
},
100-
expectedErr: true,
101-
},
102-
{
103-
name: "missing admin console port",
104-
config: types.LinuxInstallationConfig{
105-
GlobalCIDR: "10.0.0.0/16",
106-
NetworkInterface: "eth0",
10790
LocalArtifactMirrorPort: 8888,
10891
DataDirectory: "/var/lib/embedded-cluster",
10992
},
@@ -114,7 +97,6 @@ func TestValidateConfig(t *testing.T) {
11497
config: types.LinuxInstallationConfig{
11598
GlobalCIDR: "10.0.0.0/16",
11699
NetworkInterface: "eth0",
117-
AdminConsolePort: 8800,
118100
DataDirectory: "/var/lib/embedded-cluster",
119101
},
120102
expectedErr: true,
@@ -124,35 +106,7 @@ func TestValidateConfig(t *testing.T) {
124106
config: types.LinuxInstallationConfig{
125107
GlobalCIDR: "10.0.0.0/16",
126108
NetworkInterface: "eth0",
127-
AdminConsolePort: 8800,
128-
LocalArtifactMirrorPort: 8888,
129-
},
130-
expectedErr: true,
131-
},
132-
{
133-
name: "same ports for admin console and artifact mirror",
134-
config: types.LinuxInstallationConfig{
135-
GlobalCIDR: "10.0.0.0/16",
136-
NetworkInterface: "eth0",
137-
AdminConsolePort: 8800,
138-
LocalArtifactMirrorPort: 8800, // Same as admin console
139-
DataDirectory: "/var/lib/embedded-cluster",
140-
},
141-
expectedErr: true,
142-
},
143-
{
144-
name: "same ports for admin console and manager",
145-
rc: func() runtimeconfig.RuntimeConfig {
146-
rc := runtimeconfig.New(nil)
147-
rc.SetManagerPort(8800)
148-
return rc
149-
}(),
150-
config: types.LinuxInstallationConfig{
151-
GlobalCIDR: "10.0.0.0/16",
152-
NetworkInterface: "eth0",
153-
AdminConsolePort: 8800,
154109
LocalArtifactMirrorPort: 8888,
155-
DataDirectory: "/var/lib/embedded-cluster",
156110
},
157111
expectedErr: true,
158112
},
@@ -166,7 +120,6 @@ func TestValidateConfig(t *testing.T) {
166120
config: types.LinuxInstallationConfig{
167121
GlobalCIDR: "10.0.0.0/16",
168122
NetworkInterface: "eth0",
169-
AdminConsolePort: 8800,
170123
LocalArtifactMirrorPort: 8888,
171124
DataDirectory: "/var/lib/embedded-cluster",
172125
},
@@ -216,7 +169,6 @@ func TestSetConfigDefaults(t *testing.T) {
216169
name: "empty config",
217170
inputConfig: types.LinuxInstallationConfig{},
218171
expectedConfig: types.LinuxInstallationConfig{
219-
AdminConsolePort: ecv1beta1.DefaultAdminConsolePort,
220172
DataDirectory: testDataDir,
221173
LocalArtifactMirrorPort: ecv1beta1.DefaultLocalArtifactMirrorPort,
222174
NetworkInterface: "eth0",
@@ -226,11 +178,9 @@ func TestSetConfigDefaults(t *testing.T) {
226178
{
227179
name: "partial config",
228180
inputConfig: types.LinuxInstallationConfig{
229-
AdminConsolePort: 9000,
230-
DataDirectory: "/custom/dir",
181+
DataDirectory: "/custom/dir",
231182
},
232183
expectedConfig: types.LinuxInstallationConfig{
233-
AdminConsolePort: 9000,
234184
DataDirectory: "/custom/dir",
235185
LocalArtifactMirrorPort: ecv1beta1.DefaultLocalArtifactMirrorPort,
236186
NetworkInterface: "eth0",
@@ -244,7 +194,6 @@ func TestSetConfigDefaults(t *testing.T) {
244194
ServiceCIDR: "10.1.128.0/17",
245195
},
246196
expectedConfig: types.LinuxInstallationConfig{
247-
AdminConsolePort: ecv1beta1.DefaultAdminConsolePort,
248197
DataDirectory: testDataDir,
249198
LocalArtifactMirrorPort: ecv1beta1.DefaultLocalArtifactMirrorPort,
250199
NetworkInterface: "eth0",
@@ -258,7 +207,6 @@ func TestSetConfigDefaults(t *testing.T) {
258207
GlobalCIDR: "192.168.0.0/16",
259208
},
260209
expectedConfig: types.LinuxInstallationConfig{
261-
AdminConsolePort: ecv1beta1.DefaultAdminConsolePort,
262210
DataDirectory: testDataDir,
263211
LocalArtifactMirrorPort: ecv1beta1.DefaultLocalArtifactMirrorPort,
264212
NetworkInterface: "eth0",
@@ -272,7 +220,6 @@ func TestSetConfigDefaults(t *testing.T) {
272220
HTTPSProxy: "https://proxy.example.com:3128",
273221
},
274222
expectedConfig: types.LinuxInstallationConfig{
275-
AdminConsolePort: ecv1beta1.DefaultAdminConsolePort,
276223
DataDirectory: testDataDir,
277224
LocalArtifactMirrorPort: ecv1beta1.DefaultLocalArtifactMirrorPort,
278225
NetworkInterface: "eth0",
@@ -287,7 +234,6 @@ func TestSetConfigDefaults(t *testing.T) {
287234
DataDirectory: "/existing/custom/path",
288235
},
289236
expectedConfig: types.LinuxInstallationConfig{
290-
AdminConsolePort: ecv1beta1.DefaultAdminConsolePort,
291237
DataDirectory: "/existing/custom/path",
292238
LocalArtifactMirrorPort: ecv1beta1.DefaultLocalArtifactMirrorPort,
293239
NetworkInterface: "eth0",
@@ -347,7 +293,6 @@ func TestGetDefaults(t *testing.T) {
347293
t.Setenv("no_proxy", "")
348294
},
349295
expectedDefaults: types.LinuxInstallationConfig{
350-
AdminConsolePort: ecv1beta1.DefaultAdminConsolePort,
351296
DataDirectory: "/test/data/dir",
352297
LocalArtifactMirrorPort: ecv1beta1.DefaultLocalArtifactMirrorPort,
353298
GlobalCIDR: ecv1beta1.DefaultNetworkCIDR,
@@ -370,7 +315,6 @@ func TestGetDefaults(t *testing.T) {
370315
t.Setenv("NO_PROXY", "localhost,127.0.0.1")
371316
},
372317
expectedDefaults: types.LinuxInstallationConfig{
373-
AdminConsolePort: ecv1beta1.DefaultAdminConsolePort,
374318
DataDirectory: "/test/data/dir",
375319
LocalArtifactMirrorPort: ecv1beta1.DefaultLocalArtifactMirrorPort,
376320
GlobalCIDR: ecv1beta1.DefaultNetworkCIDR,
@@ -397,7 +341,6 @@ func TestGetDefaults(t *testing.T) {
397341
t.Setenv("NO_PROXY", "localhost,127.0.0.1")
398342
},
399343
expectedDefaults: types.LinuxInstallationConfig{
400-
AdminConsolePort: ecv1beta1.DefaultAdminConsolePort,
401344
DataDirectory: "/test/data/dir",
402345
LocalArtifactMirrorPort: ecv1beta1.DefaultLocalArtifactMirrorPort,
403346
GlobalCIDR: ecv1beta1.DefaultNetworkCIDR,
@@ -419,7 +362,6 @@ func TestGetDefaults(t *testing.T) {
419362
t.Setenv("NO_PROXY", "localhost,127.0.0.1")
420363
},
421364
expectedDefaults: types.LinuxInstallationConfig{
422-
AdminConsolePort: ecv1beta1.DefaultAdminConsolePort,
423365
DataDirectory: "/test/data/dir",
424366
LocalArtifactMirrorPort: ecv1beta1.DefaultLocalArtifactMirrorPort,
425367
GlobalCIDR: ecv1beta1.DefaultNetworkCIDR,
@@ -474,7 +416,6 @@ func TestConfigSetAndGet(t *testing.T) {
474416

475417
// Test writing config values
476418
configToWrite := types.LinuxInstallationConfig{
477-
AdminConsolePort: 8800,
478419
DataDirectory: "/var/lib/embedded-cluster",
479420
LocalArtifactMirrorPort: 8888,
480421
NetworkInterface: "eth0",
@@ -489,7 +430,6 @@ func TestConfigSetAndGet(t *testing.T) {
489430
assert.NoError(t, err)
490431

491432
// Verify the user values match
492-
assert.Equal(t, configToWrite.AdminConsolePort, readValues.AdminConsolePort)
493433
assert.Equal(t, configToWrite.DataDirectory, readValues.DataDirectory)
494434
assert.Equal(t, configToWrite.LocalArtifactMirrorPort, readValues.LocalArtifactMirrorPort)
495435
assert.Equal(t, configToWrite.NetworkInterface, readValues.NetworkInterface)
@@ -504,7 +444,6 @@ func TestConfigSetAndGet(t *testing.T) {
504444
assert.NoError(t, err)
505445

506446
// Verify the resolved config has user values
507-
assert.Equal(t, configToWrite.AdminConsolePort, resolvedConfig.AdminConsolePort)
508447
assert.Equal(t, configToWrite.DataDirectory, resolvedConfig.DataDirectory)
509448
assert.Equal(t, configToWrite.LocalArtifactMirrorPort, resolvedConfig.LocalArtifactMirrorPort)
510449
assert.Equal(t, configToWrite.NetworkInterface, resolvedConfig.NetworkInterface)

‎api/internal/managers/linux/preflight/hostpreflight.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ func buildPrepareHostPreflightOptions(rc runtimeconfig.RuntimeConfig, opts Prepa
7878
TCPConnectionsRequired: opts.TCPConnectionsRequired,
7979
IsJoin: opts.IsJoin,
8080
IsUI: opts.IsUI,
81+
IsV3: true,
8182
ControllerAirgapStorageSpace: controllerAirgapStorageSpace,
8283
}
8384
if cidr := rc.GlobalCIDR(); cidr != "" {

0 commit comments

Comments
 (0)