Merge pull request #721 from l1b0k/release-1.8

fix tag filter
AliyunContainerService · Nov 14, 2024 · 144428d · 144428d
2 parents 52209c9 + 8f7c2af
commit 144428d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/daemon/config.go b/daemon/config.go
@@ -43,6 +43,7 @@ func getENIConfig(cfg *daemon.Config) *types.ENIConfig {
 		VSwitchSelectionPolicy: policy,
 		ResourceGroupID:        cfg.ResourceGroupID,
 		EniTypeAttr:            0,
+		TagFilter:              cfg.ENITagFilter,
 	}
 
 	if cfg.VSwitches != nil {

diff --git a/pkg/factory/aliyun/aliyun.go b/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 --git a/types/config.go b/types/config.go
@@ -19,6 +19,8 @@ type ENIConfig struct {
 
 	EnableIPv4 bool
 	EnableIPv6 bool
+
+	TagFilter map[string]string
 }
 
 // PoolConfig configuration of pool and resource factory