Skip to content

Ensure that Autopilot can be disabled for real #6738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 4, 2025
+36 −22
Merged

Ensure that Autopilot can be disabled for real #6738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 14 additions & 13 deletions cmd/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,10 +447,6 @@ func (c *command) start(ctx context.Context, flags *config.ControllerOptions, de
))
}

if !slices.Contains(flags.DisableComponents, constant.AutopilotComponentName) {
clusterComponents.Add(ctx, controller.NewCRD(c.K0sVars.ManifestsDir, "autopilot"))
}

if enableK0sEndpointReconciler {
clusterComponents.Add(ctx, controller.NewEndpointReconciler(
nodeConfig,
Expand Down Expand Up @@ -512,13 +508,15 @@ func (c *command) start(ctx context.Context, flags *config.ControllerOptions, de
clusterComponents.Add(ctx, metrics)
}

disableAutopilot := slices.Contains(flags.DisableComponents, constant.AutopilotComponentName)

if !slices.Contains(flags.DisableComponents, constant.WorkerConfigComponentName) {
// Create new dedicated leasepool for worker config reconciler
leaseName := fmt.Sprintf("k0s-%s-%s", constant.WorkerConfigComponentName, constant.KubernetesMajorMinorVersion)
workerConfigLeasePool := leaderelector.NewLeasePool(c.K0sVars.InvocationID, adminClientFactory, leaseName)
clusterComponents.Add(ctx, workerConfigLeasePool)

reconciler, err := workerconfig.NewReconciler(c.K0sVars, nodeConfig.Spec, adminClientFactory, workerConfigLeasePool, enableKonnectivity)
reconciler, err := workerconfig.NewReconciler(c.K0sVars, nodeConfig.Spec, adminClientFactory, workerConfigLeasePool, enableKonnectivity, disableAutopilot)
if err != nil {
return err
}
Expand All @@ -528,7 +526,7 @@ func (c *command) start(ctx context.Context, flags *config.ControllerOptions, de
if !slices.Contains(flags.DisableComponents, constant.SystemRBACComponentName) {
clusterComponents.Add(ctx, &controller.SystemRBAC{
Clients: adminClientFactory,
ExcludeAutopilot: slices.Contains(flags.DisableComponents, constant.AutopilotComponentName),
ExcludeAutopilot: disableAutopilot,
})
}

Expand Down Expand Up @@ -577,13 +575,16 @@ func (c *command) start(ctx context.Context, flags *config.ControllerOptions, de
logrus.Info("Telemetry is disabled")
}

clusterComponents.Add(ctx, &controller.Autopilot{
K0sVars: c.K0sVars,
KubeletExtraArgs: c.KubeletExtraArgs,
KubeAPIPort: nodeConfig.Spec.API.Port,
AdminClientFactory: adminClientFactory,
Workloads: controllerMode.WorkloadsEnabled(),
})
if !disableAutopilot {
clusterComponents.Add(ctx, controller.NewCRD(c.K0sVars.ManifestsDir, "autopilot"))
clusterComponents.Add(ctx, &controller.Autopilot{
K0sVars: c.K0sVars,
KubeletExtraArgs: c.KubeletExtraArgs,
KubeAPIPort: nodeConfig.Spec.API.Port,
AdminClientFactory: adminClientFactory,
Workloads: controllerMode.WorkloadsEnabled(),
})
}

if !slices.Contains(flags.DisableComponents, constant.UpdateProberComponentName) {
clusterComponents.Add(ctx, controller.NewUpdateProber(
Expand Down
2 changes: 1 addition & 1 deletion cmd/worker/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ func (c *Command) Start(ctx context.Context, nodeName apitypes.NodeName, kubelet

certManager := worker.NewCertificateManager(kubeletKubeconfigPath)

addPlatformSpecificComponents(ctx, componentManager, c.K0sVars, controller, certManager)
addPlatformSpecificComponents(ctx, componentManager, c.K0sVars, workerConfig, controller, certManager)

if controller == nil {
// if running inside a controller, status component is already running
Expand Down
13 changes: 8 additions & 5 deletions cmd/worker/worker_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ import (

"github.com/k0sproject/k0s/pkg/component/manager"
"github.com/k0sproject/k0s/pkg/component/worker"
workerconfig "github.com/k0sproject/k0s/pkg/component/worker/config"
"github.com/k0sproject/k0s/pkg/config"
)

func initLogging(context.Context, string) error { return nil }

func addPlatformSpecificComponents(ctx context.Context, m *manager.Manager, k0sVars *config.CfgVars, controller EmbeddingController, certManager *worker.CertificateManager) {
m.Add(ctx, &worker.Autopilot{
K0sVars: k0sVars,
CertManager: certManager,
})
func addPlatformSpecificComponents(ctx context.Context, m *manager.Manager, k0sVars *config.CfgVars, workerConfig *workerconfig.Profile, controller EmbeddingController, certManager *worker.CertificateManager) {
if !workerConfig.AutopilotDisabled {
m.Add(ctx, &worker.Autopilot{
K0sVars: k0sVars,
CertManager: certManager,
})
}
}
3 changes: 2 additions & 1 deletion cmd/worker/worker_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/k0sproject/k0s/internal/pkg/log"
"github.com/k0sproject/k0s/pkg/component/manager"
"github.com/k0sproject/k0s/pkg/component/worker"
workerconfig "github.com/k0sproject/k0s/pkg/component/worker/config"
"github.com/k0sproject/k0s/pkg/config"
"github.com/k0sproject/k0s/pkg/constant"
"github.com/k0sproject/k0s/pkg/k0scontext"
Expand Down Expand Up @@ -45,6 +46,6 @@ func initLogging(ctx context.Context, logDir string) error {
return nil
}

func addPlatformSpecificComponents(ctx context.Context, m *manager.Manager, k0sVars *config.CfgVars, controller EmbeddingController, certManager *worker.CertificateManager) {
func addPlatformSpecificComponents(ctx context.Context, m *manager.Manager, k0sVars *config.CfgVars, workerConfig *workerconfig.Profile, controller EmbeddingController, certManager *worker.CertificateManager) {
// no-op
}
7 changes: 5 additions & 2 deletions pkg/component/controller/workerconfig/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ type Reconciler struct {
clientFactory kubeutil.ClientFactoryInterface
leaderElector leaderelector.Interface
konnectivityEnabled bool
autopilotDisabled bool

mu sync.Mutex
state reconcilerState
Expand Down Expand Up @@ -82,7 +83,7 @@ var (
)

// NewReconciler creates a new reconciler for worker configurations.
func NewReconciler(k0sVars *config.CfgVars, nodeSpec *v1beta1.ClusterSpec, clientFactory kubeutil.ClientFactoryInterface, leaderElector leaderelector.Interface, konnectivityEnabled bool) (*Reconciler, error) {
func NewReconciler(k0sVars *config.CfgVars, nodeSpec *v1beta1.ClusterSpec, clientFactory kubeutil.ClientFactoryInterface, leaderElector leaderelector.Interface, konnectivityEnabled, autopilotDisabled bool) (*Reconciler, error) {
log := logrus.WithFields(logrus.Fields{"component": "workerconfig.Reconciler"})

clusterDNSIPString, err := nodeSpec.Network.DNSAddress()
Expand All @@ -102,6 +103,7 @@ func NewReconciler(k0sVars *config.CfgVars, nodeSpec *v1beta1.ClusterSpec, clien
clientFactory: clientFactory,
leaderElector: leaderElector,
konnectivityEnabled: konnectivityEnabled,
autopilotDisabled: autopilotDisabled,

state: reconcilerCreated,
}
Expand Down Expand Up @@ -602,7 +604,8 @@ func (r *Reconciler) buildProfile(snapshot *snapshot) *workerconfig.Profile {
Enabled: r.konnectivityEnabled,
AgentPort: snapshot.konnectivityAgentPort,
},
DualStackEnabled: snapshot.dualStackEnabled,
DualStackEnabled: snapshot.dualStackEnabled,
AutopilotDisabled: r.autopilotDisabled,
}

if workerProfile.NodeLocalLoadBalancing != nil &&
Expand Down
4 changes: 4 additions & 0 deletions pkg/component/controller/workerconfig/reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ func TestReconciler_Lifecycle(t *testing.T) {
clients,
&leaderelector.Dummy{Leader: true},
true,
false,
)
require.NoError(t, err)
underTest.log = newTestLogger(t)
Expand Down Expand Up @@ -314,6 +315,7 @@ func TestReconciler_ResourceGeneration(t *testing.T) {
clients,
&leaderelector.Dummy{Leader: true},
true,
false,
)
require.NoError(t, err)
underTest.log = newTestLogger(t)
Expand Down Expand Up @@ -497,6 +499,7 @@ func TestReconciler_ReconcilesOnChangesOnly(t *testing.T) {
clients,
&leaderelector.Dummy{Leader: true},
true,
false,
)
require.NoError(t, err)
underTest.log = newTestLogger(t)
Expand Down Expand Up @@ -647,6 +650,7 @@ func TestReconciler_LeaderElection(t *testing.T) {
clients,
&le,
true,
false,
)
require.NoError(t, err)

Expand Down
2 changes: 2 additions & 0 deletions pkg/component/worker/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ type Profile struct {
Konnectivity Konnectivity
PauseImage *v1beta1.ImageSpec
DualStackEnabled bool
AutopilotDisabled bool
}

func (p *Profile) DeepCopy() *Profile {
Expand Down Expand Up @@ -143,6 +144,7 @@ func forEachConfigMapEntry(profile *Profile, f func(fieldName string, ptr any))
"konnectivity": &profile.Konnectivity,
"pauseImage": &profile.PauseImage,
"dualStackEnabled": &profile.DualStackEnabled,
"autopilotDisabled": &profile.AutopilotDisabled,
} {
f(fieldName, ptr)
}
Expand Down
Loading