Merge pull request #9002 from mazdakn/remove-aof

Remove ApplyOnForward for network policy resource
projectcalico · Jul 12, 2024 · 37f05f4 · 37f05f4
2 parents 2f3485f + d9fe0e0
commit 37f05f4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/libcalico-go/lib/backend/syncersv1/updateprocessors/networkpolicyprocessor.go b/libcalico-go/lib/backend/syncersv1/updateprocessors/networkpolicyprocessor.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2018 Tigera, Inc. All rights reserved.
+// Copyright (c) 2017-2024 Tigera, Inc. All rights reserved.
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -68,7 +68,7 @@ func convertNetworkPolicyV2ToV1Value(val interface{}) (interface{}, error) {
 		OutboundRules:    RulesAPIV2ToBackend(spec.Egress, v3res.Namespace),
 		Selector:         selector,
 		Types:            policyTypesAPIV2ToBackend(spec.Types),
-		ApplyOnForward:   true,
+		ApplyOnForward:   false,
 		PerformanceHints: v3res.Spec.PerformanceHints,
 	}
 

diff --git a/libcalico-go/lib/backend/syncersv1/updateprocessors/networkpolicyprocessor_test.go b/libcalico-go/lib/backend/syncersv1/updateprocessors/networkpolicyprocessor_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020 Tigera, Inc. All rights reserved.
+// Copyright (c) 2017-2024 Tigera, Inc. All rights reserved.
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -81,7 +81,7 @@ var _ = Describe("Test the NetworkPolicy update processor", func() {
 				Value: &model.Policy{
 					Namespace:      ns1,
 					Selector:       "projectcalico.org/namespace == 'namespace1'",
-					ApplyOnForward: true,
+					ApplyOnForward: false,
 				},
 				Revision: testRev,
 			}))
@@ -193,7 +193,7 @@ var (
 				Order:          &testDefaultPolicyOrder,
 				Selector:       "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'default'",
 				Types:          []string{"egress"},
-				ApplyOnForward: true,
+				ApplyOnForward: false,
 				OutboundRules: []model.Rule{
 					{
 						Action:      "allow",
@@ -238,7 +238,7 @@ var expected2 = []*model.KVPair{
 			Order:          &testDefaultPolicyOrder,
 			Selector:       "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'default'",
 			Types:          []string{"ingress"},
-			ApplyOnForward: true,
+			ApplyOnForward: false,
 			InboundRules: []model.Rule{
 				{
 					Action:                       "allow",

diff --git a/libcalico-go/lib/backend/syncersv1/updateprocessors/shared_test.go b/libcalico-go/lib/backend/syncersv1/updateprocessors/shared_test.go
@@ -208,7 +208,7 @@ func fullNPv1(namespace string) (p model.Policy) {
 		Order:          &testPolicyOrder101,
 		InboundRules:   []model.Rule{ir},
 		OutboundRules:  []model.Rule{or},
-		ApplyOnForward: true,
+		ApplyOnForward: false,
 		Types:          []string{"ingress", "egress"},
 	}
 }