Skip to content

Commit c6c23a7

Browse files
author
Yongli Chen
authored
This PR moves cni related code from network package to cni. (#130)
* configure dnssuffix & dnsServerList * add dns info to conflist * change case for dns info * remove hardcoding * remove hardcoding * parse k8s pod info * add AdditionalArgs and Dns info to conflist * serialize policies * program route info * start addressign ipam ip leak * fix 1) ip inconsistency in k8s & pod. 2) IP leak in IPAM. * remove comments * separate windows & linux * remove dnsServers * remove comments * address comments * add dns verification * abstract linux policy struct * remove setPolicies * separte Windows & Linux code * change package
1 parent f1f65e7 commit c6c23a7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cni/network/network.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) error {
179179

180180
// Initialize values from network config.
181181
networkId := nwCfg.Name
182-
endpointId := network.GetEndpointID(args)
182+
endpointId := GetEndpointID(args)
183183

184184
nwInfo, nwInfoErr := plugin.nm.GetNetworkInfo(networkId)
185185

@@ -365,7 +365,7 @@ func (plugin *netPlugin) Delete(args *cniSkel.CmdArgs) error {
365365

366366
// Initialize values from network config.
367367
networkId := nwCfg.Name
368-
endpointId := network.GetEndpointID(args)
368+
endpointId := GetEndpointID(args)
369369

370370
// Query the network.
371371
nwInfo, err := plugin.nm.GetNetworkInfo(networkId)

0 commit comments

Comments
 (0)