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

Removed old conf var

Browse Source
This commit is contained in:
斟酌 鵬兄
2026-03-30 19:40:47 +08:00
parent d9ffd1b446
commit fcf7371e9e
2 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
clitools/pkg/templates/templates.go
View File

@@ -21,8 +21,8 @@ func DefaultMonoKSConfig(v TemplateValues) types.MonoKSConfig {
KubernetesVersion: v.KubernetesVersion, KubernetesVersion: v.KubernetesVersion,
NodeName: firstNonEmpty(v.NodeName, v.Hostname), NodeName: firstNonEmpty(v.NodeName, v.Hostname),
ClusterRole: clusterRoleFromTemplateValues(v), ClusterRole: v.ClusterRole,
InitControlPlane: initControlPlaneFromTemplateValues(v), InitControlPlane: v.InitControlPlane,
ClusterName: v.ClusterName, ClusterName: v.ClusterName,
ClusterDomain: v.ClusterDomain, ClusterDomain: v.ClusterDomain,
@@ -84,24 +84,6 @@ func DefaultOSUpgrade(v TemplateValues) types.OSUpgrade {
} }
} }
func clusterRoleFromTemplateValues(v TemplateValues) string {
switch strings.ToLower(strings.TrimSpace(v.BootstrapMode)) {
case "init":
return "control-plane"
case "join":
if strings.EqualFold(strings.TrimSpace(v.JoinKind), "control-plane") {
return "control-plane"
}
return "worker"
default:
return "control-plane"
}
}
func initControlPlaneFromTemplateValues(v TemplateValues) bool {
return strings.EqualFold(strings.TrimSpace(v.BootstrapMode), "init")
}
func firstNonEmpty(xs ...string) string { func firstNonEmpty(xs ...string) string {
for _, x := range xs { for _, x := range xs {
if strings.TrimSpace(x) != "" { if strings.TrimSpace(x) != "" {
@@ -129,4 +111,4 @@ func copyStringMap(in map[string]string) map[string]string {
out[k] = v out[k] = v
} }
return out return out
} }

12
clitools/pkg/templates/values.go
View File

@@ -23,8 +23,8 @@ type TemplateValues struct {
ContainerRuntimeEndpoint string ContainerRuntimeEndpoint string
CNIPlugin string CNIPlugin string
BootstrapMode string // init, join ClusterRole string // worker, control-plane
JoinKind string // worker, control-plane InitControlPlane bool
AllowSchedulingOnControlPlane bool AllowSchedulingOnControlPlane bool
SkipImageCheck bool SkipImageCheck bool
@@ -57,8 +57,8 @@ func defaultTemplateValues() TemplateValues {
ContainerRuntimeEndpoint: "unix:///var/run/crio/crio.sock", ContainerRuntimeEndpoint: "unix:///var/run/crio/crio.sock",
CNIPlugin: "default", CNIPlugin: "default",
BootstrapMode: "init", InitControlPlane: true,
JoinKind: "worker", ClusterRole: "control-plane",
AllowSchedulingOnControlPlane: true, AllowSchedulingOnControlPlane: true,
SkipImageCheck: false, SkipImageCheck: false,
@@ -103,8 +103,8 @@ func LoadTemplateValuesFromEnv() TemplateValues {
v.ContainerRuntimeEndpoint = getenvDefault("MKS_CONTAINER_RUNTIME_ENDPOINT", v.ContainerRuntimeEndpoint) v.ContainerRuntimeEndpoint = getenvDefault("MKS_CONTAINER_RUNTIME_ENDPOINT", v.ContainerRuntimeEndpoint)
v.CNIPlugin = getenvDefault("MKS_CNI_PLUGIN", v.CNIPlugin) v.CNIPlugin = getenvDefault("MKS_CNI_PLUGIN", v.CNIPlugin)
v.BootstrapMode = getenvDefault("MKS_BOOTSTRAP_MODE", v.BootstrapMode) v.InitControlPlane = getenvBoolDefault("MKS_INIT_CONTROL_PLANE", v.InitControlPlane)
v.JoinKind = getenvDefault("MKS_JOIN_KIND", v.JoinKind) v.ClusterRole = getenvDefault("MKS_CLUSTER_ROLE", v.ClusterRole)
v.AllowSchedulingOnControlPlane = getenvBoolDefault("MKS_ALLOW_SCHEDULING_ON_CONTROL_PLANE", v.AllowSchedulingOnControlPlane) v.AllowSchedulingOnControlPlane = getenvBoolDefault("MKS_ALLOW_SCHEDULING_ON_CONTROL_PLANE", v.AllowSchedulingOnControlPlane)
v.SkipImageCheck = getenvBoolDefault("MKS_SKIP_IMAGE_CHECK", v.SkipImageCheck) v.SkipImageCheck = getenvBoolDefault("MKS_SKIP_IMAGE_CHECK", v.SkipImageCheck)