penguin/monok8s
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Matches ctl version to upstream

Browse Source
This commit is contained in:
斟酌 鵬兄
2026-03-28 20:28:22 +08:00
parent 848daefffe
commit ecceff225f
25 changed files with 591 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
clitools/pkg/bootstrap/registry.go
View File

@@ -12,6 +12,7 @@ type Registry struct {
func NewRegistry(ctx *node.NodeContext) *Registry {
netCfg := node.NetworkConfig{
Hostname: ctx.Config.Spec.Network.Hostname,
MgmtIface: ctx.Config.Spec.Network.ManagementIface,
MgmtAddress: ctx.Config.Spec.Network.ManagementCIDR,
MgmtGateway: ctx.Config.Spec.Network.ManagementGW,
@@ -21,13 +22,10 @@ func NewRegistry(ctx *node.NodeContext) *Registry {
return &Registry{
steps: map[string]node.Step{
"check_prereqs": node.CheckPrereqs,
"validate_network_requirements": node.ValidateNetworkRequirements,
"install_cni_if_requested": node.InstallCNIIfRequested,
"configure_default_cni": node.ConfigureDefaultCNI,
"start_crio": node.StartCRIO,
"check_crio_running": node.CheckCRIORunning,
"wait_for_existing_cluster_if_needed": node.WaitForExistingClusterIfNeeded,
"decide_bootstrap_action": node.DecideBootstrapAction,
"check_required_images": node.CheckRequiredImages,
"generate_kubeadm_config": node.GenerateKubeadmConfig,
"run_kubeadm_init": node.RunKubeadmInit,
@@ -35,6 +33,7 @@ func NewRegistry(ctx *node.NodeContext) *Registry {
"apply_local_node_metadata_if_possible": node.ApplyLocalNodeMetadataIfPossible,
"allow_single_node_scheduling": node.AllowSingleNodeScheduling,
"ensure_ip_forward": node.EnsureIPForward,
"configure_hostname": node.ConfigureHostname(netCfg),
"configure_mgmt_interface": node.ConfigureMgmtInterface(netCfg),
"configure_dns": node.ConfigureDNS(netCfg),
"set_hostname_if_needed": node.SetHostnameIfNeeded,

12
clitools/pkg/bootstrap/runner.go
View File

@@ -16,8 +16,8 @@ type Runner struct {
func NewRunner(cfg *monov1alpha1.MonoKSConfig) *Runner {
runnerCfg := system.RunnerConfig{}
nctx := &node.NodeContext{
Config: cfg,
System: system.NewRunner(runnerCfg),
Config: cfg,
SystemRunner: system.NewRunner(runnerCfg),
}
return &Runner{
NodeCtx: nctx,
@@ -27,11 +27,13 @@ func NewRunner(cfg *monov1alpha1.MonoKSConfig) *Runner {
func (r *Runner) Init(ctx context.Context) error {
for _, name := range []string{
"check_prereqs",
"configure_hostname",
"configure_dns",
"configure_mgmt_interface",
"validate_network_requirements",
"install_cni_if_requested",
"configure_default_cni",
"start_crio",
"check_crio_running",
"check_container_images",
"wait_for_existing_cluster_if_needed",
"decide_bootstrap_action",
"check_required_images",