Merge pull request #723 from l1b0k/fix/tag_filter

fix tag filter

Author: jzwlqx

Diff for: daemon/config.go

@@ -49,6 +49,7 @@ func getENIConfig(cfg *daemon.Config) *types.ENIConfig {
 		EniSelectionPolicy:     eniSelectionPolicy,
 		ResourceGroupID:        cfg.ResourceGroupID,
 		EniTypeAttr:            0,
+		TagFilter:              cfg.ENITagFilter,
 	}
 
 	if cfg.VSwitches != nil {

Diff for: pkg/controller/multi-ip/node/pool.go

@@ -1152,6 +1152,12 @@ func (n *ReconcileNode) createENI(ctx context.Context, node *networkv1beta1.Node
 	}
 	bo := backoff.Backoff(backoff.ENICreate)
 
+	tags := node.Spec.ENISpec.Tag
+	if tags == nil {
+		tags = map[string]string{}
+	}
+	// keep the ds behave
+	tags[types.NetworkInterfaceTagCreatorKey] = types.NetworkInterfaceTagCreatorValue
 	createOpts := &aliyunClient.CreateNetworkInterfaceOptions{
 		NetworkInterfaceOptions: &aliyunClient.NetworkInterfaceOptions{
 			VSwitchID:        vsw.ID,

Diff for: pkg/factory/aliyun/aliyun.go

@@ -73,6 +73,7 @@ func NewAliyun(ctx context.Context, openAPI *client.OpenAPI, getter eni.ENIInfoG
 		eniTags:          cfg.ENITags,
 		eniTypeAttr:      cfg.EniTypeAttr,
 		selectionPolicy:  cfg.VSwitchSelectionPolicy,
+		eniTagFilter:     cfg.TagFilter,
 	}
 }
 

Diff for: types/config.go

@@ -28,6 +28,8 @@ type ENIConfig struct {
 
 	EnableIPv4 bool
 	EnableIPv6 bool
+
+	TagFilter map[string]string
 }
 
 // PoolConfig configuration of pool and resource factory