Fix/edgemark (#24)

vcluster + k3s 下没有nodecidr
edgewize-io · Dec 18, 2024 · df9afac · df9afac
1 parent 80e33d9
commit df9afac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/edge/cmd/edgemarks/hollow_edgecore.go b/edge/cmd/edgemarks/hollow_edgecore.go
@@ -29,6 +29,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/featuregate"
+	"k8s.io/klog/v2"
 	kubeletapp "k8s.io/kubernetes/cmd/kubelet/app"
 	kubeletoptions "k8s.io/kubernetes/cmd/kubelet/app/options"
 	"k8s.io/kubernetes/pkg/kubelet"
@@ -98,6 +99,8 @@ func newHollowEdgeNodeCommand() *cobra.Command {
 
 	fs := cmd.Flags()
 	fs.AddGoFlagSet(flag.CommandLine) // for flags like --docker-only
+	klog.InitFlags(nil)               // 初始化 klog 的标志
+	fs.AddGoFlagSet(flag.CommandLine) // 添加 klog 的标志
 	s.addFlags(fs)
 
 	return cmd
@@ -156,14 +159,14 @@ func EdgeCoreConfig(config *hollowEdgeNodeConfig) *v1alpha2.EdgeCoreConfig {
 	edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.ProtectKernelDefaults = false
 
 	taint := corev1.Taint{
-		Key:    "node-role.kubernetes.io/edge",
+		Key:    "node-role.kubernetes.io/edgemark",
 		Effect: "NoSchedule",
 	}
 	edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.RegisterWithTaints = append(edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.RegisterWithTaints, taint)
 
-	edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.NodeLeaseDurationSeconds = 240
+	edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.NodeLeaseDurationSeconds = 60
 	edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.SyncFrequency = metav1.Duration{
-		Duration: time.Minute * 5,
+		Duration: time.Minute * 4,
 	}
 
 	edgeCoreConfig.Modules.DeviceTwin.Enable = falseFlag

diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go