Skip to content

Fix Merged Network Policy Deletions #551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2020
Merged

Fix Merged Network Policy Deletions #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions npm/iptm/iptm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,15 +283,6 @@ func (iptMgr *IptablesManager) DeleteChain(chain string) error {
func (iptMgr *IptablesManager) Add(entry *IptEntry) error {
log.Printf("Adding iptables entry: %+v.", entry)

exists, err := iptMgr.Exists(entry)
if err != nil {
return err
}

if exists {
return nil
}

if entry.IsJumpEntry {
iptMgr.OperationFlag = util.IptablesAppendFlag
} else {
Expand Down
3 changes: 1 addition & 2 deletions npm/nwpolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,14 @@ func (npMgr *NetworkPolicyManager) AddNetworkPolicy(npObj *networkingv1.NetworkP
}

if addedPolicy != nil {
sets, lists, iptEntries = translatePolicy(addedPolicy)
ns.processedNpMap[hashedSelector] = addedPolicy
} else {
sets, lists, iptEntries = translatePolicy(npObj)
ns.processedNpMap[hashedSelector] = npObj
}

ns.rawNpMap[npObj.ObjectMeta.Name] = npObj

sets, lists, iptEntries = translatePolicy(npObj)
ipsMgr := allNs.ipsMgr
for _, set := range sets {
log.Printf("Creating set: %v, hashedSet: %v", set, util.GetHashedName(set))
Expand Down
11 changes: 4 additions & 7 deletions npm/parsePolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,8 @@ func addPolicy(old, new *networkingv1.NetworkPolicy) (*networkingv1.NetworkPolic
}

spec := &(addedPolicy.Spec)
if len(old.Spec.PolicyTypes) == 1 && old.Spec.PolicyTypes[0] == networkingv1.PolicyTypeEgress &&
len(new.Spec.PolicyTypes) == 1 && new.Spec.PolicyTypes[0] == networkingv1.PolicyTypeEgress {
spec.PolicyTypes = []networkingv1.PolicyType{networkingv1.PolicyTypeEgress}
if len(old.Spec.PolicyTypes) == 1 && len(new.Spec.PolicyTypes) == 1 && old.Spec.PolicyTypes[0] == new.Spec.PolicyTypes[0] {
spec.PolicyTypes = []networkingv1.PolicyType{new.Spec.PolicyTypes[0]}
} else {
spec.PolicyTypes = []networkingv1.PolicyType{
networkingv1.PolicyTypeIngress,
Expand Down Expand Up @@ -126,10 +125,8 @@ func deductPolicy(old, new *networkingv1.NetworkPolicy) (*networkingv1.NetworkPo
deductedPolicy.Spec.Ingress = deductedIngress
deductedPolicy.Spec.Egress = deductedEgress

if len(old.Spec.PolicyTypes) == 1 && old.Spec.PolicyTypes[0] == networkingv1.PolicyTypeEgress &&
len(new.Spec.PolicyTypes) == 1 && new.Spec.PolicyTypes[0] == networkingv1.PolicyTypeEgress &&
len(deductedIngress) == 0 {
deductedPolicy.Spec.PolicyTypes = []networkingv1.PolicyType{networkingv1.PolicyTypeEgress}
if len(old.Spec.PolicyTypes) == 1 && len(new.Spec.PolicyTypes) == 1 && old.Spec.PolicyTypes[0] == new.Spec.PolicyTypes[0] {
deductedPolicy.Spec.PolicyTypes = []networkingv1.PolicyType{new.Spec.PolicyTypes[0]}
} else {
deductedPolicy.Spec.PolicyTypes = []networkingv1.PolicyType{
networkingv1.PolicyTypeIngress,
Expand Down