k8s, operator: Move enable-k8s option to clientset config

The enable-k8s option has been introduced to avoid some operator code paths that assumed to run in a k8s environment. Instead of passing around the flag, we use it to configure the clientset, so that the check `clientset.IsEnabled()` will keep that too into account and avoid the execution of kubernetes-specific code. The operator api server cell and tests have been updated accordingly. Related: #21344 Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
cilium · Apr 13, 2023 · d5005bf · d5005bf
1 parent fe4da68
commit d5005bf
Show file tree

Hide file tree

Showing 31 changed files with 63 additions and 73 deletions.
diff --git a/Documentation/cmdref/cilium-agent.md b/Documentation/cmdref/cilium-agent.md
diff --git a/Documentation/cmdref/cilium-agent_hive.md b/Documentation/cmdref/cilium-agent_hive.md
diff --git a/Documentation/cmdref/cilium-agent_hive_dot-graph.md b/Documentation/cmdref/cilium-agent_hive_dot-graph.md
diff --git a/Documentation/cmdref/cilium-operator-alibabacloud.md b/Documentation/cmdref/cilium-operator-alibabacloud.md
diff --git a/Documentation/cmdref/cilium-operator-alibabacloud_hive.md b/Documentation/cmdref/cilium-operator-alibabacloud_hive.md
diff --git a/Documentation/cmdref/cilium-operator-alibabacloud_hive_dot-graph.md b/Documentation/cmdref/cilium-operator-alibabacloud_hive_dot-graph.md
diff --git a/Documentation/cmdref/cilium-operator-aws.md b/Documentation/cmdref/cilium-operator-aws.md
diff --git a/Documentation/cmdref/cilium-operator-aws_hive.md b/Documentation/cmdref/cilium-operator-aws_hive.md
diff --git a/Documentation/cmdref/cilium-operator-aws_hive_dot-graph.md b/Documentation/cmdref/cilium-operator-aws_hive_dot-graph.md
diff --git a/Documentation/cmdref/cilium-operator-azure.md b/Documentation/cmdref/cilium-operator-azure.md
diff --git a/Documentation/cmdref/cilium-operator-azure_hive.md b/Documentation/cmdref/cilium-operator-azure_hive.md
diff --git a/Documentation/cmdref/cilium-operator-azure_hive_dot-graph.md b/Documentation/cmdref/cilium-operator-azure_hive_dot-graph.md
diff --git a/Documentation/cmdref/cilium-operator-generic.md b/Documentation/cmdref/cilium-operator-generic.md
diff --git a/Documentation/cmdref/cilium-operator-generic_hive.md b/Documentation/cmdref/cilium-operator-generic_hive.md
diff --git a/Documentation/cmdref/cilium-operator-generic_hive_dot-graph.md b/Documentation/cmdref/cilium-operator-generic_hive_dot-graph.md
diff --git a/Documentation/cmdref/cilium-operator.md b/Documentation/cmdref/cilium-operator.md
diff --git a/Documentation/cmdref/cilium-operator_hive.md b/Documentation/cmdref/cilium-operator_hive.md
diff --git a/Documentation/cmdref/cilium-operator_hive_dot-graph.md b/Documentation/cmdref/cilium-operator_hive_dot-graph.md
diff --git a/Documentation/cmdref/cilium_build-config.md b/Documentation/cmdref/cilium_build-config.md
diff --git a/Documentation/cmdref/cilium_preflight_migrate-identity.md b/Documentation/cmdref/cilium_preflight_migrate-identity.md
diff --git a/Documentation/cmdref/cilium_preflight_validate-cnp.md b/Documentation/cmdref/cilium_preflight_validate-cnp.md
diff --git a/operator/api/cell.go b/operator/api/cell.go
@@ -39,11 +39,3 @@ type Config struct {
 func (def Config) Flags(flags *pflag.FlagSet) {
 	flags.String(OperatorAPIServeAddr, OperatorAPIServeAddrDefault, "Address to serve API requests")
 }
-
-// SharedConfig contains the configuration that is shared between
-// this module and others.
-// This is done to avoid polluting this module with a direct dependency
-// on global operator configuration.
-type SharedConfig struct {
-	EnableK8s bool
-}
diff --git a/operator/api/health.go b/operator/api/health.go
@@ -30,9 +30,8 @@ func HealthHandlerCell(
 		cell.Provide(func(
 			clientset k8sClient.Clientset,
 			logger logrus.FieldLogger,
-			cfg SharedConfig,
 		) operator.GetHealthzHandler {
-			if !cfg.EnableK8s || !clientset.IsEnabled() {
+			if !clientset.IsEnabled() {
 				return &healthHandler{
 					enabled: false,
 				}

diff --git a/operator/api/health_test.go b/operator/api/health_test.go
@@ -30,10 +30,8 @@ func TestHealthHandlerK8sDisabled(t *testing.T) {
 
 	hive := hive.New(
 		k8sClient.FakeClientCell,
-		cell.Provide(func() SharedConfig {
-			return SharedConfig{
-				EnableK8s: false,
-			}
+		cell.Invoke(func(cs *k8sClient.FakeClientset) {
+			cs.Disable()
 		}),
 
 		HealthHandlerCell(
@@ -84,11 +82,6 @@ func TestHealthHandlerK8sEnabled(t *testing.T) {
 
 	hive := hive.New(
 		k8sClient.FakeClientCell,
-		cell.Provide(func() SharedConfig {
-			return SharedConfig{
-				EnableK8s: true,
-			}
-		}),
 
 		HealthHandlerCell(
 			func() bool {

diff --git a/operator/api/server.go b/operator/api/server.go
@@ -33,8 +33,7 @@ type Server interface {
 type params struct {
 	cell.In
 
-	Cfg       Config
-	SharedCfg SharedConfig
+	Cfg Config
 
 	HealthHandler  operator.GetHealthzHandler
 	MetricsHandler metrics.GetMetricsHandler
@@ -66,10 +65,6 @@ type httpServer struct {
 func newServer(
 	p params,
 ) (Server, error) {
-	if !p.SharedCfg.EnableK8s {
-		return nil, nil
-	}
-
 	server := &server{
 		logger:         p.Logger,
 		shutdowner:     p.Shutdowner,