Skip to content

Prevent multiple deletions of pods #563

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 2 commits into from
May 20, 2020
Merged

Prevent multiple deletions of pods #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51197e7
Prevent multiple deletions of pods
jaer-tsun May 19, 2020
3e2b74f
fix deduct policy test
jaer-tsun May 19, 2020
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
2 changes: 2 additions & 0 deletions npm/npm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ type NetworkPolicyManager struct {

nodeName string
nsMap map[string]*namespace
podMap map[string]bool
isAzureNpmChainCreated bool
isSafeToCleanUpAzureNpmChain bool

Expand Down Expand Up @@ -233,6 +234,7 @@ func NewNetworkPolicyManager(clientset *kubernetes.Clientset, informerFactory in
npInformer: npInformer,
nodeName: os.Getenv("HOSTNAME"),
nsMap: make(map[string]*namespace),
podMap: make(map[string]bool),
isAzureNpmChainCreated: false,
isSafeToCleanUpAzureNpmChain: false,
clusterState: telemetry.ClusterState{
Expand Down
4 changes: 1 addition & 3 deletions npm/parsePolicy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"testing"

"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
Expand Down Expand Up @@ -287,7 +287,6 @@ func TestDeductPolicy(t *testing.T) {

expectedPolicy := oldPolicy
expectedPolicy.Spec.PolicyTypes = []networkingv1.PolicyType{
networkingv1.PolicyTypeIngress,
networkingv1.PolicyTypeEgress,
}
deductedPolicy, err := deductPolicy(&oldPolicy, &newPolicy)
Expand Down Expand Up @@ -342,7 +341,6 @@ func TestDeductPolicy(t *testing.T) {
expectedPolicy = oldPolicy
expectedPolicy.Spec.Egress = []networkingv1.NetworkPolicyEgressRule{}
expectedPolicy.Spec.PolicyTypes = []networkingv1.PolicyType{
networkingv1.PolicyTypeIngress,
networkingv1.PolicyTypeEgress,
}
deductedPolicy, err = deductPolicy(&oldPolicy, &newPolicy)
Expand Down
9 changes: 9 additions & 0 deletions npm/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ func (npMgr *NetworkPolicyManager) AddPod(podObj *corev1.Pod) error {
}
}

npMgr.podMap[podNs+podName] = true

return nil
}

Expand Down Expand Up @@ -162,6 +164,11 @@ func (npMgr *NetworkPolicyManager) DeletePod(podObj *corev1.Pod) error {
ipsMgr = npMgr.nsMap[util.KubeAllNamespacesFlag].ipsMgr
)

_, exists := npMgr.podMap[podNs+podName]
if !exists {
return nil
}

log.Printf("POD DELETING: [%s/%s/%s%+v%s]", podNs, podName, podNodeName, podLabels, podIP)

// Delete the pod from its namespace's ipset.
Expand Down Expand Up @@ -199,5 +206,7 @@ func (npMgr *NetworkPolicyManager) DeletePod(podObj *corev1.Pod) error {
}
}

delete(npMgr.podMap, podNs+podName)

return nil
}
15 changes: 11 additions & 4 deletions npm/pod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ func TestisSystemPod(t *testing.T) {
func TestAddPod(t *testing.T) {
npMgr := &NetworkPolicyManager{
nsMap: make(map[string]*namespace),
podMap: make(map[string]bool),
TelemetryEnabled: false,
}

Expand All @@ -59,7 +60,8 @@ func TestAddPod(t *testing.T) {

podObj := &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test-pod",
Name: "test-pod",
Namespace: "test-namespace",
Labels: map[string]string{
"app": "test-pod",
},
Expand All @@ -80,6 +82,7 @@ func TestAddPod(t *testing.T) {
func TestUpdatePod(t *testing.T) {
npMgr := &NetworkPolicyManager{
nsMap: make(map[string]*namespace),
podMap: make(map[string]bool),
TelemetryEnabled: false,
}

Expand All @@ -102,7 +105,8 @@ func TestUpdatePod(t *testing.T) {

oldPodObj := &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Namespace: "old-test-pod",
Name: "old-test-pod",
Namespace: "test-namespace",
Labels: map[string]string{
"app": "old-test-pod",
},
Expand All @@ -115,7 +119,8 @@ func TestUpdatePod(t *testing.T) {

newPodObj := &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Namespace: "new-test-pod",
Name: "new-test-pod",
Namespace: "test-namespace",
Labels: map[string]string{
"app": "new-test-pod",
},
Expand All @@ -140,6 +145,7 @@ func TestUpdatePod(t *testing.T) {
func TestDeletePod(t *testing.T) {
npMgr := &NetworkPolicyManager{
nsMap: make(map[string]*namespace),
podMap: make(map[string]bool),
TelemetryEnabled: false,
}

Expand All @@ -162,7 +168,8 @@ func TestDeletePod(t *testing.T) {

podObj := &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test-pod",
Name: "test-pod",
Namespace: "test-namespace",
Labels: map[string]string{
"app": "test-pod",
},
Expand Down