Skip to content

Respect k3s experimental agentless server option #8289

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Respect k3s experimental agentless server option #8289

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
25 changes: 23 additions & 2 deletions pkg/rke2/rke2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ const (
)

func Server(clx *cli.Context, cfg Config) error {
disableAgent := clx.Bool("disable-agent")
if disableAgent {
cmds.ServerConfig.DisableAgent = true
}
if err := setup(clx, cfg, true); err != nil {
return err
}
Expand All @@ -114,13 +118,26 @@ func Server(clx *cli.Context, cfg Config) error {
metav1.NamespaceDefault,
metav1.NamespacePublic,
}

dataDir := clx.String("data-dir")

if !disableAgent {
cmds.ServerConfig.StartupHooks = append(cmds.ServerConfig.StartupHooks,
reconcileStaticPods(cmds.AgentConfig.ContainerRuntimeEndpoint, dataDir),
)
}
cmds.ServerConfig.StartupHooks = append(cmds.ServerConfig.StartupHooks,
setNetworkPolicies(cisMode, defaultNamespaces),
setClusterRoles(),
restrictServiceAccounts(cisMode, defaultNamespaces),
setKubeProxyDisabled(),
cleanupStaticPodsOnSelfDelete(dataDir),
)
if !disableAgent {
cmds.ServerConfig.StartupHooks = append(cmds.ServerConfig.StartupHooks,
cleanupStaticPodsOnSelfDelete(dataDir),
)
}
cmds.ServerConfig.StartupHooks = append(cmds.ServerConfig.StartupHooks,
setRuntimes(),
)

Expand Down Expand Up @@ -190,7 +207,11 @@ func setup(clx *cli.Context, cfg Config, isServer bool) error {
}
}

return removeDisabledPods(dataDir, containerRuntimeEndpoint, disabledItems, clusterReset)
if !clx.Bool("disable-agent") {
return removeDisabledPods(dataDir, containerRuntimeEndpoint, disabledItems, clusterReset)
}

return nil
}

func ForceRestartFile(dataDir string) string {
Expand Down