Merge pull request #540 from timdengyun/remove_dup_sp_generation_from…

…_np_conversion Remove duplicated securitypolicies from networkpolicy conversion
vmware-tanzu · Apr 7, 2024 · ec9a5e5 · ec9a5e5
2 parents f6cd90c + 08d45ed
commit ec9a5e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pkg/controllers/networkpolicy/networkpolicy_controller.go b/pkg/controllers/networkpolicy/networkpolicy_controller.go
@@ -58,12 +58,12 @@ func deleteFail(r *NetworkPolicyReconciler, c *context.Context, o *networkingv1.
 }
 
 func updateSuccess(r *NetworkPolicyReconciler, c *context.Context, o *networkingv1.NetworkPolicy) {
-	r.Recorder.Event(o, v1.EventTypeNormal, common.ReasonSuccessfulUpdate, "NetworkPolicy CR has been successfully updated")
+	r.Recorder.Event(o, v1.EventTypeNormal, common.ReasonSuccessfulUpdate, "NetworkPolicy has been successfully updated")
 	metrics.CounterInc(r.Service.NSXConfig, metrics.ControllerUpdateSuccessTotal, MetricResType)
 }
 
 func deleteSuccess(r *NetworkPolicyReconciler, _ *context.Context, o *networkingv1.NetworkPolicy) {
-	r.Recorder.Event(o, v1.EventTypeNormal, common.ReasonSuccessfulDelete, "NetworkPolicy CR has been successfully deleted")
+	r.Recorder.Event(o, v1.EventTypeNormal, common.ReasonSuccessfulDelete, "NetworkPolicy has been successfully deleted")
 	metrics.CounterInc(r.Service.NSXConfig, metrics.ControllerDeleteSuccessTotal, MetricResType)
 }
 

diff --git a/pkg/nsx/services/securitypolicy/firewall.go b/pkg/nsx/services/securitypolicy/firewall.go
@@ -258,7 +258,6 @@ func (service *SecurityPolicyService) convertNetworkPolicyToInternalSecurityPoli
 			spAllow.Spec.Rules = append(spAllow.Spec.Rules, *rule)
 		}
 	}
-	securityPolicies = append(securityPolicies, spAllow, spIsolation)
 
 	if len(networkPolicy.Spec.Egress) > 0 {
 		spIsolation.Spec.Rules = append(spIsolation.Spec.Rules, v1alpha1.SecurityPolicyRule{