Skip to content

Commit e75f0fc

Browse files
0xfornax0xfornax
authored
Merge pull request #1085 from rocket-pool/remove-api-container
Remove api container references
2 parents a410065 + a6f0836 commit e75f0fc

9 files changed

Lines changed: 23 additions & 27 deletions

File tree

‎rocketpool-cli/service/config/review-page.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ func NewReviewPage(md *MainDisplay, oldConfig *config.RocketPoolConfig, newConfi
5050
changedSettings, totalAffectedContainers, changeNetworks = newConfig.GetChanges(oldConfig)
5151

5252
if md.isUpdate {
53-
totalAffectedContainers[cfgtypes.ContainerID_Api] = true
5453
totalAffectedContainers[cfgtypes.ContainerID_Node] = true
5554
totalAffectedContainers[cfgtypes.ContainerID_Watchtower] = true
5655

‎rocketpool-cli/service/config/step-finished.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ func processConfigAfterQuit(md *MainDisplay) {
9393
_, totalAffectedContainers, changeNetworks := md.Config.GetChanges(md.PreviousConfig)
9494

9595
if md.isUpdate {
96-
totalAffectedContainers[cfgtypes.ContainerID_Api] = true
9796
totalAffectedContainers[cfgtypes.ContainerID_Node] = true
9897
totalAffectedContainers[cfgtypes.ContainerID_Watchtower] = true
9998
}

‎shared/services/config/consensus-common-config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func NewConsensusCommonConfig(cfg *RocketPoolConfig) *ConsensusCommonConfig {
113113
Description: "The port your Consensus client should run its HTTP API on.",
114114
Type: config.ParameterType_Uint16,
115115
Default: map[config.Network]interface{}{config.Network_All: defaultBnApiPort},
116-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth2, config.ContainerID_Validator, config.ContainerID_Prometheus},
116+
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth2, config.ContainerID_Validator, config.ContainerID_Prometheus},
117117
CanBeBlank: false,
118118
OverwriteOnUpgrade: false,
119119
},

‎shared/services/config/execution-common-config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func NewExecutionCommonConfig(cfg *RocketPoolConfig) *ExecutionCommonConfig {
6464
Description: "The port your Execution client should use for its HTTP API endpoint (also known as HTTP RPC API endpoint).",
6565
Type: config.ParameterType_Uint16,
6666
Default: map[config.Network]interface{}{config.Network_All: defaultEcHttpPort},
67-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth1, config.ContainerID_Eth2},
67+
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth1, config.ContainerID_Eth2},
6868
CanBeBlank: false,
6969
OverwriteOnUpgrade: false,
7070
},

‎shared/services/config/external-configs.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func NewExternalExecutionConfig(cfg *RocketPoolConfig) *ExternalExecutionConfig
166166
Description: "The URL of the HTTP RPC endpoint for your external Execution client.\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead, for example 'http://192.168.1.100:8545'.",
167167
Type: config.ParameterType_String,
168168
Default: map[config.Network]interface{}{config.Network_All: ""},
169-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Watchtower},
169+
AffectsContainers: []config.ContainerID{config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Watchtower},
170170
CanBeBlank: false,
171171
OverwriteOnUpgrade: false,
172172
},
@@ -177,7 +177,7 @@ func NewExternalExecutionConfig(cfg *RocketPoolConfig) *ExternalExecutionConfig
177177
Description: "The URL of the Websocket RPC endpoint for your external Execution client.\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead, for example 'http://192.168.1.100:8546'.",
178178
Type: config.ParameterType_String,
179179
Default: map[config.Network]interface{}{config.Network_All: ""},
180-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Watchtower},
180+
AffectsContainers: []config.ContainerID{config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Watchtower},
181181
CanBeBlank: false,
182182
OverwriteOnUpgrade: false,
183183
},
@@ -195,7 +195,7 @@ func NewExternalLighthouseConfig(cfg *RocketPoolConfig) *ExternalLighthouseConfi
195195
Description: "The URL of the HTTP Beacon API endpoint for your external client.\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
196196
Type: config.ParameterType_String,
197197
Default: map[config.Network]interface{}{config.Network_All: ""},
198-
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Api, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
198+
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
199199
CanBeBlank: false,
200200
OverwriteOnUpgrade: false,
201201
},
@@ -284,7 +284,7 @@ func NewExternalLodestarConfig(cfg *RocketPoolConfig) *ExternalLodestarConfig {
284284
Description: "The URL of the HTTP Beacon API endpoint for your external client.\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
285285
Type: config.ParameterType_String,
286286
Default: map[config.Network]interface{}{config.Network_All: ""},
287-
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Api, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
287+
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
288288
CanBeBlank: false,
289289
OverwriteOnUpgrade: false,
290290
},
@@ -374,7 +374,7 @@ func NewExternalNimbusConfig(cfg *RocketPoolConfig) *ExternalNimbusConfig {
374374
Description: "The URL of the HTTP Beacon API endpoint for your external client.\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
375375
Type: config.ParameterType_String,
376376
Default: map[config.Network]interface{}{config.Network_All: ""},
377-
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Api, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
377+
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
378378
CanBeBlank: false,
379379
OverwriteOnUpgrade: false,
380380
},
@@ -463,7 +463,7 @@ func NewExternalPrysmConfig(cfg *RocketPoolConfig) *ExternalPrysmConfig {
463463
Description: "The URL of the HTTP Beacon API endpoint for your external client.\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
464464
Type: config.ParameterType_String,
465465
Default: map[config.Network]interface{}{config.Network_All: ""},
466-
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Api, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
466+
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
467467
CanBeBlank: false,
468468
OverwriteOnUpgrade: false,
469469
},
@@ -563,7 +563,7 @@ func NewExternalTekuConfig(cfg *RocketPoolConfig) *ExternalTekuConfig {
563563
Description: "The URL of the HTTP Beacon API endpoint for your external client.\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
564564
Type: config.ParameterType_String,
565565
Default: map[config.Network]interface{}{config.Network_All: ""},
566-
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Api, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
566+
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
567567
CanBeBlank: false,
568568
OverwriteOnUpgrade: false,
569569
},

‎shared/services/config/fallback-configs.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func NewFallbackNormalConfig(cfg *RocketPoolConfig) *FallbackNormalConfig {
4040
Description: "The URL of the HTTP API endpoint for your fallback Execution client.\n\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
4141
Type: config.ParameterType_String,
4242
Default: map[config.Network]interface{}{config.Network_All: ""},
43-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower},
43+
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower},
4444
CanBeBlank: false,
4545
OverwriteOnUpgrade: false,
4646
},
@@ -51,7 +51,7 @@ func NewFallbackNormalConfig(cfg *RocketPoolConfig) *FallbackNormalConfig {
5151
Description: "The URL of the HTTP Beacon API endpoint for your fallback Consensus client.\n\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
5252
Type: config.ParameterType_String,
5353
Default: map[config.Network]interface{}{config.Network_All: ""},
54-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Validator, config.ContainerID_Watchtower},
54+
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Validator, config.ContainerID_Watchtower},
5555
CanBeBlank: false,
5656
OverwriteOnUpgrade: false,
5757
},
@@ -69,7 +69,7 @@ func NewFallbackPrysmConfig(cfg *RocketPoolConfig) *FallbackPrysmConfig {
6969
Description: "The URL of the HTTP API endpoint for your fallback Execution client.\n\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
7070
Type: config.ParameterType_String,
7171
Default: map[config.Network]interface{}{config.Network_All: ""},
72-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower},
72+
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower},
7373
CanBeBlank: false,
7474
OverwriteOnUpgrade: false,
7575
},
@@ -80,7 +80,7 @@ func NewFallbackPrysmConfig(cfg *RocketPoolConfig) *FallbackPrysmConfig {
8080
Description: "The URL of the HTTP Beacon API endpoint for your fallback Prysm client.\n\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
8181
Type: config.ParameterType_String,
8282
Default: map[config.Network]interface{}{config.Network_All: ""},
83-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Validator, config.ContainerID_Watchtower},
83+
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Validator, config.ContainerID_Watchtower},
8484
CanBeBlank: false,
8585
OverwriteOnUpgrade: false,
8686
},

‎shared/services/config/rocket-pool-config.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
const (
3030
rootConfigName string = "root"
3131

32-
ApiContainerName string = "api"
3332
Eth1ContainerName string = "eth1"
3433
Eth1FallbackContainerName string = "eth1-fallback"
3534
Eth2ContainerName string = "eth2"
@@ -223,7 +222,7 @@ func NewRocketPoolConfig(rpDir string, isNativeMode bool) *RocketPoolConfig {
223222
Description: "Choose which mode to use for your Execution client - locally managed (Docker Mode), or externally managed (Hybrid Mode).",
224223
Type: config.ParameterType_Choice,
225224
Default: map[config.Network]interface{}{},
226-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Eth1, config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Watchtower},
225+
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Watchtower},
227226
CanBeBlank: false,
228227
OverwriteOnUpgrade: false,
229228
Options: clientModes,
@@ -263,7 +262,7 @@ func NewRocketPoolConfig(rpDir string, isNativeMode bool) *RocketPoolConfig {
263262
Description: "Enable this if you would like to specify a fallback Execution and Consensus Client, which will temporarily be used by the Smart Node and your Validator Client if your primary Execution / Consensus client pair ever go offline (e.g. if you switch, prune, or resync your clients).",
264263
Type: config.ParameterType_Bool,
265264
Default: map[config.Network]interface{}{config.Network_All: false},
266-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Validator, config.ContainerID_Node, config.ContainerID_Watchtower},
265+
AffectsContainers: []config.ContainerID{config.ContainerID_Validator, config.ContainerID_Node, config.ContainerID_Watchtower},
267266
CanBeBlank: false,
268267
OverwriteOnUpgrade: false,
269268
},
@@ -274,7 +273,7 @@ func NewRocketPoolConfig(rpDir string, isNativeMode bool) *RocketPoolConfig {
274273
Description: "The delay to wait after your primary Execution or Consensus clients fail before trying to reconnect to them. An example format is \"10h20m30s\" - this would make it 10 hours, 20 minutes, and 30 seconds.",
275274
Type: config.ParameterType_String,
276275
Default: map[config.Network]interface{}{config.Network_All: "60s"},
277-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower},
276+
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower},
278277
CanBeBlank: false,
279278
OverwriteOnUpgrade: false,
280279
},
@@ -285,7 +284,7 @@ func NewRocketPoolConfig(rpDir string, isNativeMode bool) *RocketPoolConfig {
285284
Description: "Choose which mode to use for your Consensus client - locally managed (Docker Mode), or externally managed (Hybrid Mode).",
286285
Type: config.ParameterType_Choice,
287286
Default: map[config.Network]interface{}{config.Network_All: config.Mode_Local},
288-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Prometheus, config.ContainerID_Validator, config.ContainerID_Watchtower},
287+
AffectsContainers: []config.ContainerID{config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Prometheus, config.ContainerID_Validator, config.ContainerID_Watchtower},
289288
CanBeBlank: false,
290289
OverwriteOnUpgrade: false,
291290
Options: clientModes,
@@ -297,7 +296,7 @@ func NewRocketPoolConfig(rpDir string, isNativeMode bool) *RocketPoolConfig {
297296
Description: "Select which Consensus client you would like to use.",
298297
Type: config.ParameterType_Choice,
299298
Default: map[config.Network]interface{}{config.Network_All: config.ConsensusClient_Nimbus},
300-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth2, config.ContainerID_Validator},
299+
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth2, config.ContainerID_Validator},
301300
CanBeBlank: false,
302301
OverwriteOnUpgrade: false,
303302
Options: []config.ParameterOption{{
@@ -329,7 +328,7 @@ func NewRocketPoolConfig(rpDir string, isNativeMode bool) *RocketPoolConfig {
329328
Description: "Select which Consensus client your externally managed client is.",
330329
Type: config.ParameterType_Choice,
331330
Default: map[config.Network]interface{}{config.Network_All: config.ConsensusClient_Lighthouse},
332-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth2, config.ContainerID_Validator},
331+
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth2, config.ContainerID_Validator},
333332
CanBeBlank: false,
334333
OverwriteOnUpgrade: false,
335334
Options: []config.ParameterOption{{
@@ -361,7 +360,7 @@ func NewRocketPoolConfig(rpDir string, isNativeMode bool) *RocketPoolConfig {
361360
Description: "Enables dual-stack (IPv4 + IPv6) networking for the Smart Node. When enabled, your Ethereum clients will listen on both IPv4 and IPv6 and can peer with IPv6 nodes in addition to IPv4. Enable this if your machine has only an IPv6 address, or if you want your node to participate in IPv6 peering.",
362361
Type: config.ParameterType_Bool,
363362
Default: map[config.Network]interface{}{config.Network_All: false},
364-
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth1, config.ContainerID_Eth2, config.ContainerID_Validator, config.ContainerID_Grafana, config.ContainerID_Prometheus, config.ContainerID_Alertmanager, config.ContainerID_Exporter, config.ContainerID_MevBoost, config.ContainerID_CommitBoost},
363+
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth1, config.ContainerID_Eth2, config.ContainerID_Validator, config.ContainerID_Grafana, config.ContainerID_Prometheus, config.ContainerID_Alertmanager, config.ContainerID_Exporter, config.ContainerID_MevBoost, config.ContainerID_CommitBoost},
365364
CanBeBlank: false,
366365
OverwriteOnUpgrade: false,
367366
},

0 commit comments

Comments
 (0)