adaptive terway for lingjun

daemon/daemon.go

@@ -64,8 +64,6 @@
 	commandResDB   = "resdb"
 
 	IfEth0 = "eth0"
-
-	envEFLO = "eflo"
 )
 
 type networkService struct {
@@ -860,7 +858,7 @@
 	_ = netSrv.k8s.SetCustomStatefulWorkloadKinds(config.CustomStatefulWorkloadKinds)
 	netSrv.ipamType = config.IPAMType
 
-	if os.Getenv("TERWAY_DEPLOY_ENV") == envEFLO {
+	if lingjunNodeType := types.LingjunNodeTypeFromLables(netSrv.k8s.GetNodeLabels()); lingjunNodeType {
 		instance.SetPopulateFunc(instance.EfloPopulate)
 		client.SetGetLimit(client.EfloGetLimit)
 	}
@@ -892,7 +890,7 @@
 	}
 
 	instanceType := meta.InstanceType
-	if os.Getenv("TERWAY_DEPLOY_ENV") == envEFLO {
+	if lingjunNodeType := types.LingjunNodeTypeFromLables(netSrv.k8s.GetNodeLabels()); lingjunNodeType {
 		instanceType = meta.InstanceID
 	}
 	limit, err := client.GetLimit(aliyunClient, instanceType)
@@ -938,7 +936,7 @@
 	}
 
 	var factory factory.Factory
-	if os.Getenv("TERWAY_DEPLOY_ENV") == envEFLO {
+	if lingjunNodeType := types.LingjunNodeTypeFromLables(netSrv.k8s.GetNodeLabels()); lingjunNodeType {
 		factory = aliyun.NewEflo(ctx, aliyunClient, vswPool, eniConfig)
 	} else {
 		factory = aliyun.NewAliyun(ctx, aliyunClient, eni2.NewENIMetadata(enableIPv4, enableIPv6), vswPool, eniConfig)

pkg/eni/manager_test.go

@@ -166,6 +166,11 @@ func (f *FakeK8s) GetNodeDynamicConfigLabel() string {
 	panic("implement me")
 }
 
+func (f *FakeK8s) GetNodeLabels() map[string]string {
+	//TODO implement me
+	panic("implement me")
+}
+
 func (f *FakeK8s) GetDynamicConfigWithName(ctx context.Context, name string) (string, error) {
 	//TODO implement me
 	panic("implement me")

pkg/k8s/k8s.go

@@ -88,6 +88,7 @@ type Kubernetes interface {
 
 	GetServiceCIDR() *types.IPNetSet
 	GetNodeCidr() *types.IPNetSet
+	GetNodeLabels() map[string]string
 	SetNodeAllocatablePod(count int) error
 
 	PatchNodeAnnotations(anno map[string]string) error
@@ -517,6 +518,13 @@ func (k *k8s) RecordPodEvent(podName, podNamespace, eventType, reason, message s
 	return nil
 }
 
+func (k *k8s) GetNodeLabels() map[string]string {
+	if k.node.Labels == nil {
+		return map[string]string{}
+	}
+	return k.node.Labels
+}
+
 // GetNodeDynamicConfigLabel returns value with label config
 func (k *k8s) GetNodeDynamicConfigLabel() string {
 	// use node cached in newK8s()

types/lingjun.go

@@ -0,0 +1,13 @@
+package types
+
+const (
+	NodeTypeLabel = "alibabacloud.com/lingjun-worker"
+)
+
+func LingjunNodeTypeFromLables(labels map[string]string) bool {
+	nodeType, ok := labels[NodeTypeLabel]
+	if ok && nodeType == "true" {
+		return true
+	}
+	return false
+}