Addressing merge issues for the PR

projectcalico · Dec 5, 2017 · 5ef6386 · 5ef6386
1 parent f51feb1
commit 5ef6386
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/dataplane/windows/policysets/policysets.go b/dataplane/windows/policysets/policysets.go
@@ -259,6 +259,12 @@ func (s *PolicySets) protoRuleToHnsRules(policyId string, pRule *proto.Rule, isI
 		return nil, SkipRule
 	}
 
+	// Skip rules with name port ipsets
+	if len(pRule.SrcNamedPortIpSetIds) > 0 || len(pRule.DstNamedPortIpSetIds) > 0 {
+		log.WithField("rule", pRule).Info("Skipping rule because it contains named port ipsets (currently unsupported).")
+		return nil, SkipRule
+	}
+
 	// Filter the Src and Dst CIDRs to only the IP version that we're rendering
 	var filteredAll bool
 	ruleCopy := *pRule