fix merge

Author: mazdakn

felix/bpf/proxy/proxy_test.go

@@ -610,83 +610,6 @@ var _ = Describe("BPF Proxy", func() {
 			})
 		})
 	})
-
-	Context("with terminating workloads", func() {
-		var (
-			p   proxy.Proxy
-			dp  *mockSyncer
-			k8s *fake.Clientset
-		)
-
-		BeforeEach(func() {
-			By("creating proxy with fake client and mock syncer", func() {
-				var err error
-
-				k8s = fake.NewSimpleClientset(testSvc, testSvcEpsSlice)
-				syncStop = make(chan struct{})
-				dp = newMockSyncer(syncStop)
-
-				opts := []proxy.Option{proxy.WithImmediateSync()}
-
-				p, err = proxy.New(k8s, dp, "test-node", opts...)
-				Expect(err).NotTo(HaveOccurred())
-			})
-		})
-
-		AfterEach(func() {
-			By("stopping the proxy", func() {
-				close(syncStop)
-				p.Stop()
-			})
-		})
-
-		It("should see IsReady=false and IsTerminating=true", func() {
-			By("getting the initial sync")
-
-			dp.checkState(func(s proxy.DPSyncerState) {
-				Expect(len(s.SvcMap)).To(Equal(1))
-				Expect(len(s.EpsMap)).To(Equal(1))
-
-			})
-
-			By("placing one endpoint to terminating state")
-
-			falsePtr := new(bool)
-			*falsePtr = false
-
-			truePtr := new(bool)
-			*truePtr = true
-
-			testSvcEpsSlice.Endpoints[0].Conditions.Ready = falsePtr
-			testSvcEpsSlice.Endpoints[0].Conditions.Terminating = truePtr
-			err := k8s.Tracker().Update(discovery.SchemeGroupVersion.WithResource("endpointslices"),
-				testSvcEpsSlice, "default")
-			Expect(err).NotTo(HaveOccurred())
-
-			dp.checkState(func(s proxy.DPSyncerState) {
-				Expect(len(s.SvcMap)).To(Equal(1))
-				Expect(len(s.EpsMap)).To(Equal(1))
-
-				var key k8sp.ServicePortName
-
-				for key = range s.EpsMap {
-				}
-
-				isReady := 0
-				isTerminating := 0
-				for _, ep := range s.EpsMap[key] {
-					if ep.IsReady() {
-						isReady++
-					}
-					if ep.IsTerminating() {
-						isTerminating++
-					}
-				}
-				Expect(isReady).To(Equal(1))
-				Expect(isTerminating).To(Equal(1))
-			})
-		})
-	})
 })
 
 type mockSyncer struct {

felix/calc/calc_graph.go

@@ -16,7 +16,6 @@ package calc
 
 import (
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/sirupsen/logrus"
 	log "github.com/sirupsen/logrus"
 
 	v3 "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
@@ -393,7 +392,6 @@ func NewCalculationGraph(callbacks PipelineCallbacks, conf *config.Config, liveC
 		//         |
 		//      <dataplane>
 		//
-		logrus.Info("Marmar")
 		l3RR := NewL3RouteResolver(hostname, callbacks, conf.UseNodeResourceUpdates(), conf.RouteSource)
 		l3RR.RegisterWith(allUpdDispatcher, localEndpointDispatcher)
 		l3RR.OnAlive = liveCallback

felix/dataplane/linux/bpf_ep_mgr.go

@@ -3423,7 +3423,6 @@ func (m *bpfEndpointManager) loadPolicyProgram(
 	log.WithFields(log.Fields{
 		"progName": progName,
 		"ipFamily": ipFamily,
-		"rules":    rules,
 	}).Debug("Generating policy program...")
 
 	ipsetsMapFD := m.v4.IpsetsMap.MapFD()

felix/dataplane/linux/int_dataplane.go

@@ -2054,7 +2054,6 @@ func (d *InternalDataplane) apply() {
 	for _, mgr := range d.allManagers {
 		err := mgr.CompleteDeferredWork()
 		if err != nil {
-			log.Infof("Marva: %v", mgr)
 			log.WithField("manager", reflect.TypeOf(mgr).Name()).WithError(err).Debug(
 				"couldn't complete deferred work for manager, will try again later")
 			d.dataplaneNeedsSync = true

felix/fv/ipip_test.go

@@ -65,7 +65,6 @@ var _ = infrastructure.DatastoreDescribe("_BPF-SAFE_ IPIP topology before adding
 		if BPFMode() && getDataStoreType(infra) == "etcdv3" {
 			Skip("Skipping BPF test for etcdv3 backend.")
 		}
-
 		tc, client = infrastructure.StartNNodeTopology(2, infrastructure.DefaultTopologyOptions(), infra)
 
 		// Install a default profile that allows all ingress and egress, in the absence of any Policy.