Merge pull request #924 from l1b0k/feat/node

feat(node): add NetworkCards field to NodeCap and implement deepcopy …

Author: BSWANG

pkg/apis/crds/network.alibabacloud.com_nodes.yaml

@@ -125,6 +125,15 @@ spec:
                     type: integer
                   memberAdapterLimit:
                     type: integer
+                  networkCards:
+                    items:
+                      properties:
+                        index:
+                          type: integer
+                      type: object
+                    type: array
+                  networkCardsCount:
+                    type: integer
                   totalAdapters:
                     type: integer
                 type: object

pkg/apis/crds/register.go

@@ -58,7 +58,7 @@ func getCRD(name string) apiextensionsv1.CustomResourceDefinition {
 		version = "v0.1.0"
 	case CRDNode:
 		crdBytes = crdsNode
-		version = "v0.5.0"
+		version = "v0.6.0"
 	case CRDNodeRuntime:
 		crdBytes = crdsNodeRuntime
 		version = "v0.1.0"

pkg/apis/network.alibabacloud.com/v1beta1/node_types.go

@@ -60,15 +60,21 @@ type NodeMetadata struct {
 }
 
 type NodeCap struct {
-	Adapters              int `json:"adapters,omitempty"`
-	EriQuantity           int `json:"eriQuantity,omitempty"`
-	TotalAdapters         int `json:"totalAdapters,omitempty"`
-	IPv4PerAdapter        int `json:"ipv4PerAdapter,omitempty"`
-	IPv6PerAdapter        int `json:"ipv6PerAdapter,omitempty"`
-	MemberAdapterLimit    int `json:"memberAdapterLimit,omitempty"`
-	MaxMemberAdapterLimit int `json:"maxMemberAdapterLimit,omitempty"`
-	InstanceBandwidthRx   int `json:"instanceBandwidthRx,omitempty"`
-	InstanceBandwidthTx   int `json:"instanceBandwidthTx,omitempty"`
+	Adapters              int           `json:"adapters,omitempty"`
+	EriQuantity           int           `json:"eriQuantity,omitempty"`
+	TotalAdapters         int           `json:"totalAdapters,omitempty"`
+	IPv4PerAdapter        int           `json:"ipv4PerAdapter,omitempty"`
+	IPv6PerAdapter        int           `json:"ipv6PerAdapter,omitempty"`
+	MemberAdapterLimit    int           `json:"memberAdapterLimit,omitempty"`
+	MaxMemberAdapterLimit int           `json:"maxMemberAdapterLimit,omitempty"`
+	InstanceBandwidthRx   int           `json:"instanceBandwidthRx,omitempty"`
+	InstanceBandwidthTx   int           `json:"instanceBandwidthTx,omitempty"`
+	NetworkCards          []NetworkCard `json:"networkCards,omitempty"`
+	NetworkCardsCount     *int          `json:"networkCardsCount,omitempty"`
+}
+
+type NetworkCard struct {
+	Index int `json:"index,omitempty"`
 }
 
 type ENISpec struct {

pkg/apis/network.alibabacloud.com/v1beta1/zz_generated.deepcopy.go

@@ -183,10 +183,7 @@ func (r *ReconcileNode) createOrUpdate(ctx context.Context, k8sNode *corev1.Node
 		return err
 	}
 
-	if node.Spec.NodeMetadata.InstanceType != nodeInfo.InstanceType ||
-		node.Spec.NodeMetadata.InstanceID != nodeInfo.InstanceID ||
-		node.Spec.NodeMetadata.ZoneID != nodeInfo.ZoneID ||
-		node.Spec.NodeMetadata.RegionID != nodeInfo.RegionID {
+	if needUpdate(node, nodeInfo) {
 
 		node.Spec.NodeMetadata = networkv1beta1.NodeMetadata{
 			InstanceType: nodeInfo.InstanceType,
@@ -210,7 +207,14 @@ func (r *ReconcileNode) createOrUpdate(ctx context.Context, k8sNode *corev1.Node
 			MemberAdapterLimit:    limit.MemberAdapterLimit,
 			IPv4PerAdapter:        limit.IPv4PerAdapter,
 			MaxMemberAdapterLimit: limit.MaxMemberAdapterLimit,
+			NetworkCards: lo.Map(limit.NetworkCards, func(item aliyunClient.NetworkCard, index int) networkv1beta1.NetworkCard {
+				return networkv1beta1.NetworkCard{
+					Index: item.Index,
+				}
+			}),
 		}
+
+		node.Spec.NodeCap.NetworkCardsCount = ptr.To(len(node.Spec.NodeCap.NetworkCards))
 	}
 
 	update := node.DeepCopy()
@@ -403,16 +407,16 @@ func (r *ReconcileNode) handleEFLO(ctx context.Context, k8sNode *corev1.Node, no
 		return reconcile.Result{}, err
 	}
 
-	if node.Spec.NodeMetadata.InstanceID != nodeInfo.InstanceID ||
-		node.Spec.NodeMetadata.InstanceType != nodeInfo.InstanceType ||
-		node.Spec.NodeMetadata.ZoneID != nodeInfo.ZoneID ||
-		node.Spec.NodeMetadata.RegionID != nodeInfo.RegionID {
+	if needUpdate(node, nodeInfo) {
 
 		node.Spec.NodeMetadata.InstanceID = nodeInfo.InstanceID
 		node.Spec.NodeMetadata.InstanceType = nodeInfo.InstanceType
 		node.Spec.NodeMetadata.ZoneID = nodeInfo.ZoneID
 		node.Spec.NodeMetadata.RegionID = nodeInfo.RegionID
 
+		node.Spec.NodeCap.NetworkCardsCount = ptr.To(0)
+		node.Spec.NodeCap.NetworkCards = nil
+
 		isEni, err := r.hasPrimaryENI(ctx, node.Spec.NodeMetadata.InstanceID)
 		if err != nil {
 			return reconcile.Result{}, err
@@ -532,3 +536,11 @@ func (r *ReconcileNode) delete(ctx context.Context, request reconcile.Request) (
 	l.Info("delete node finished")
 	return reconcile.Result{}, err
 }
+
+func needUpdate(node *networkv1beta1.Node, nodeInfo *common.NodeInfo) bool {
+	return node.Spec.NodeMetadata.InstanceType != nodeInfo.InstanceType ||
+		node.Spec.NodeMetadata.InstanceID != nodeInfo.InstanceID ||
+		node.Spec.NodeMetadata.ZoneID != nodeInfo.ZoneID ||
+		node.Spec.NodeMetadata.RegionID != nodeInfo.RegionID ||
+		node.Spec.NodeCap.NetworkCardsCount == nil
+}