From 4c6f7bfb08442b092ea6732a8d572cc2c6b8db74 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 13 Jul 2023 23:33:37 +0000 Subject: [PATCH] Make apiserver egress args conditional on egress-selector-mode Only configure enable-aggregator-routing and egress-selector-config-file if required by egress-selector-mode. Signed-off-by: Brad Davidson (cherry picked from commit f21ae1d9498d3dc4c1f6b478bd4ec93e982a43ad) Signed-off-by: Brad Davidson --- pkg/daemons/control/server.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/daemons/control/server.go b/pkg/daemons/control/server.go index 265185f2be..79c2b653fc 100644 --- a/pkg/daemons/control/server.go +++ b/pkg/daemons/control/server.go @@ -174,8 +174,10 @@ func apiServer(ctx context.Context, cfg *config.Control) error { } else { argsMap["bind-address"] = cfg.APIServerBindAddress } - argsMap["enable-aggregator-routing"] = "true" - argsMap["egress-selector-config-file"] = runtime.EgressSelectorConfig + if cfg.EgressSelectorMode != config.EgressSelectorModeDisabled { + argsMap["enable-aggregator-routing"] = "true" + argsMap["egress-selector-config-file"] = runtime.EgressSelectorConfig + } argsMap["tls-cert-file"] = runtime.ServingKubeAPICert argsMap["tls-private-key-file"] = runtime.ServingKubeAPIKey argsMap["service-account-key-file"] = runtime.ServiceKey