Skip to content

Commit 2e4965b

Browse files
committed
fix comments
1 parent ea72a45 commit 2e4965b

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

cni/network/network.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,8 @@ func (plugin *NetPlugin) createEndpointInternal(opt *createEndpointInternalOpt)
781781
NATInfo: opt.natInfo,
782782
}
783783

784-
epPolicies, err := getPoliciesFromRuntimeCfg(opt.nwCfg)
784+
isIPv6Enabled := opt.resultV6 != nil
785+
epPolicies, err := getPoliciesFromRuntimeCfg(opt.nwCfg, isIPv6Enabled)
785786
if err != nil {
786787
logger.Error("failed to get policies from runtime configurations", zap.Error(err))
787788
return epInfo, err

cni/network/network_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func getEndpointPolicies(PolicyArgs) ([]policy.Policy, error) {
123123

124124
// getPoliciesFromRuntimeCfg returns network policies from network config.
125125
// getPoliciesFromRuntimeCfg is a dummy function for Linux platform.
126-
func getPoliciesFromRuntimeCfg(_ *cni.NetworkConfig) ([]policy.Policy, error) {
126+
func getPoliciesFromRuntimeCfg(_ *cni.NetworkConfig, _ bool) ([]policy.Policy, error) {
127127
return nil, nil
128128
}
129129

cni/network/network_windows.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ func getEndpointDNSSettings(nwCfg *cni.NetworkConfig, result *cniTypesCurr.Resul
248248
}
249249

250250
// getPoliciesFromRuntimeCfg returns network policies from network config.
251-
func getPoliciesFromRuntimeCfg(nwCfg *cni.NetworkConfig) ([]policy.Policy, error) {
251+
func getPoliciesFromRuntimeCfg(nwCfg *cni.NetworkConfig, isIPv6Enabled bool) ([]policy.Policy, error) {
252252
logger.Info("Runtime Info", zap.Any("config", nwCfg.RuntimeConfig))
253253
var policies []policy.Policy
254254
var protocol uint32
@@ -265,7 +265,7 @@ func getPoliciesFromRuntimeCfg(nwCfg *cni.NetworkConfig) ([]policy.Policy, error
265265

266266
hostIP, err := netip.ParseAddr(mapping.HostIp)
267267
if err != nil {
268-
return nil, errors.Wrap(err, "failed to parse hostIP")
268+
return nil, errors.Wrapf(err, "failed to parse hostIP %v", hostIP)
269269
}
270270

271271
// To support hostport policy mapping
@@ -276,7 +276,7 @@ func getPoliciesFromRuntimeCfg(nwCfg *cni.NetworkConfig) ([]policy.Policy, error
276276
switch {
277277
case hostIP.Is4():
278278
flag = hnsv2.NatFlagsLocalRoutedVip
279-
case hostIP.Is6():
279+
case hostIP.Is6() && isIPv6Enabled:
280280
flag = hnsv2.NatFlagsIPv6
281281
}
282282

cni/network/network_windows_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,8 @@ func TestSetPoliciesFromNwCfg(t *testing.T) {
253253
for _, tt := range tests {
254254
tt := tt
255255
t.Run(tt.name, func(t *testing.T) {
256-
policies, err := getPoliciesFromRuntimeCfg(&tt.nwCfg)
256+
isIPv6Enabled := false
257+
policies, err := getPoliciesFromRuntimeCfg(&tt.nwCfg, isIPv6Enabled)
257258
require.NoError(t, err)
258259
require.Condition(t, assert.Comparison(func() bool {
259260
return len(policies) > 0 && policies[0].Type == policy.EndpointPolicy

0 commit comments

Comments
 (0)