ingeg: Group Autopilot together

TODO: Let inttests run for this Does this break some startup behavior? Signed-off-by: Tom Wieczorek <[email protected]>
twz123 · Oct 1, 2024 · 6b1a253 · 6b1a253
1 parent 0d94b6c
commit 6b1a253
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/cmd/controller/controller.go b/cmd/controller/controller.go
@@ -426,16 +426,6 @@ func (c *command) start(ctx context.Context) error {
 		))
 	}
 
-	if !slices.Contains(c.DisableComponents, constant.AutopilotComponentName) {
-		logrus.Debug("starting manifest saver")
-		manifestsSaver, err := controller.NewManifestsSaver("autopilot", c.K0sVars.DataDir)
-		if err != nil {
-			logrus.Warnf("failed to initialize reconcilers manifests saver: %s", err.Error())
-			return err
-		}
-		clusterComponents.Add(ctx, controller.NewCRD(manifestsSaver, "autopilot"))
-	}
-
 	if !slices.Contains(c.DisableComponents, constant.APIEndpointReconcilerComponentName) && nodeConfig.Spec.API.ExternalAddress != "" {
 		clusterComponents.Add(ctx, controller.NewEndpointReconciler(
 			nodeConfig,
@@ -557,12 +547,21 @@ func (c *command) start(ctx context.Context) error {
 		logrus.Info("Telemetry is disabled")
 	}
 
-	clusterComponents.Add(ctx, &controller.Autopilot{
-		K0sVars:            c.K0sVars,
-		KubeletExtraArgs:   c.KubeletExtraArgs,
-		AdminClientFactory: adminClientFactory,
-		EnableWorker:       c.EnableWorker,
-	})
+	if !slices.Contains(c.DisableComponents, constant.AutopilotComponentName) {
+		logrus.Debug("starting manifest saver")
+		manifestsSaver, err := controller.NewManifestsSaver("autopilot", c.K0sVars.DataDir)
+		if err != nil {
+			logrus.Warnf("failed to initialize reconcilers manifests saver: %s", err.Error())
+			return err
+		}
+		clusterComponents.Add(ctx, controller.NewCRD(manifestsSaver, "autopilot"))
+		clusterComponents.Add(ctx, &controller.Autopilot{
+			K0sVars:            c.K0sVars,
+			KubeletExtraArgs:   c.KubeletExtraArgs,
+			AdminClientFactory: adminClientFactory,
+			EnableWorker:       c.EnableWorker,
+		})
+	}
 
 	apClientFactory, err := apclient.NewClientFactory(adminClientFactory.GetRESTConfig())
 	if err != nil {