Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkg/daemons/control/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,7 @@ func apiServer(ctx context.Context, cfg *config.Control) error {
argsMap["advertise-address"] = cfg.AdvertiseIP
}
argsMap["secure-port"] = strconv.Itoa(cfg.APIServerPort)
if cfg.APIServerBindAddress == "" {
argsMap["bind-address"] = cfg.Loopback(false)
} else {
argsMap["bind-address"] = cfg.APIServerBindAddress
}
argsMap["bind-address"] = cfg.APIServerBindAddress
if cfg.EgressSelectorMode != config.EgressSelectorModeDisabled {
argsMap["enable-aggregator-routing"] = "true"
argsMap["egress-selector-config-file"] = runtime.EgressSelectorConfig
Expand Down Expand Up @@ -300,6 +296,10 @@ func defaults(config *config.Control) {
}
}

if config.APIServerBindAddress == "" {
config.APIServerBindAddress = config.Loopback(false)
}

if config.DataDir == "" {
config.DataDir = "./management-state"
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,8 @@ func coreControllers(ctx context.Context, sc *Context, config *Config) error {
metav1.NamespaceAll,
helmcommon.Name,
"cluster-admin",
strconv.Itoa(config.ControlConfig.HTTPSPort),
config.ControlConfig.APIServerBindAddress,
strconv.Itoa(config.ControlConfig.APIServerPort),
k8s,
apply,
util.BuildControllerEventRecorder(k8s, helmcommon.Name, metav1.NamespaceAll),
Expand Down