Skip to content

Commit 144428d

Browse files
authored
Merge pull request #721 from l1b0k/release-1.8
fix tag filter
2 parents 52209c9 + 8f7c2af commit 144428d

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

Diff for: daemon/config.go

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ func getENIConfig(cfg *daemon.Config) *types.ENIConfig {
4343
VSwitchSelectionPolicy: policy,
4444
ResourceGroupID: cfg.ResourceGroupID,
4545
EniTypeAttr: 0,
46+
TagFilter: cfg.ENITagFilter,
4647
}
4748

4849
if cfg.VSwitches != nil {

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

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ func NewAliyun(ctx context.Context, openAPI *client.OpenAPI, getter eni.ENIInfoG
7373
eniTags: cfg.ENITags,
7474
eniTypeAttr: cfg.EniTypeAttr,
7575
selectionPolicy: cfg.VSwitchSelectionPolicy,
76+
eniTagFilter: cfg.TagFilter,
7677
}
7778
}
7879

Diff for: types/config.go

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ type ENIConfig struct {
1919

2020
EnableIPv4 bool
2121
EnableIPv6 bool
22+
23+
TagFilter map[string]string
2224
}
2325

2426
// PoolConfig configuration of pool and resource factory

0 commit comments

Comments
 (0)