[BPF] fv test for prog cleanups

felix/docker-image/calico-felix-wrapper

@@ -42,6 +42,8 @@ while true; do
     done
   fi
 
+  source /extra-env.sh
+
   echo "calico-felix-wrapper: Starting calico-felix"
   calico-felix &
   pid=$!

felix/fv/bpf_attach_test.go

@@ -35,8 +35,8 @@ var _ = infrastructure.DatastoreDescribe("_BPF-SAFE_ Felix bpf reattach object",
 	}
 
 	var (
-		infra   infrastructure.DatastoreInfra
-		felixes []*infrastructure.Felix
+		infra infrastructure.DatastoreInfra
+		felix *infrastructure.Felix
 	)
 
 	BeforeEach(func() {
@@ -51,7 +51,8 @@ var _ = infrastructure.DatastoreDescribe("_BPF-SAFE_ Felix bpf reattach object",
 			},
 		}
 
-		felixes, _ = infrastructure.StartNNodeTopology(1, opts, infra)
+		felixes, _ := infrastructure.StartNNodeTopology(1, opts, infra)
+		felix = felixes[0]
 
 		err := infra.AddAllowToDatastore("host-endpoint=='true'")
 		Expect(err).NotTo(HaveOccurred())
@@ -62,15 +63,11 @@ var _ = infrastructure.DatastoreDescribe("_BPF-SAFE_ Felix bpf reattach object",
 			infra.DumpErrorData()
 		}
 
-		for _, felix := range felixes {
-			felix.Stop()
-		}
-
+		felix.Stop()
 		infra.Stop()
 	})
 
 	It("should not reattach bpf programs", func() {
-		felix := felixes[0]
 
 		// This should not happen at initial execution of felix, since there is no program attached
 		firstRunBase := felix.WatchStdoutFor(regexp.MustCompile("Program already attached, skip reattaching"))
@@ -94,4 +91,28 @@ var _ = infrastructure.DatastoreDescribe("_BPF-SAFE_ Felix bpf reattach object",
 		Eventually(secondRunProg2, "10s", "100ms").Should(BeClosed())
 		Expect(secondRunBase).NotTo(BeClosed())
 	})
+
+	It("should clean up programs when BPFDataIfacePattern changes", func() {
+		By("Starting Felix")
+		felix.TriggerDelayedStart()
+
+		By("Checking that eth0 has a program")
+
+		Eventually(func() string {
+			out, _ := felix.ExecOutput("bpftool", "-jp", "net")
+			return out
+		}, "15s", "1s").Should(ContainSubstring("eth0"))
+
+		By("Changing env and restarting felix")
+
+		felix.SetEvn(map[string]string{"FELIX_BPFDataIfacePattern": "eth1"})
+		felix.Restart()
+
+		By("Checking that eth0 does not have a program anymore")
+
+		Eventually(func() string {
+			out, _ := felix.ExecOutput("bpftool", "-jp", "net")
+			return out
+		}, "15s", "1s").ShouldNot(ContainSubstring("eth0"))
+	})
 })

felix/fv/infrastructure/felix.go

@@ -15,6 +15,7 @@
 package infrastructure
 
 import (
+	"bufio"
 	"fmt"
 	"os"
 	"path"
@@ -229,6 +230,25 @@ func (f *Felix) Restart() {
 	Eventually(f.GetFelixPID, "10s", "100ms").ShouldNot(Equal(oldPID))
 }
 
+func (f *Felix) SetEvn(env map[string]string) {
+	fn := "extra-env.sh"
+
+	file, err := os.OpenFile("./"+fn, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0644)
+	Expect(err).NotTo(HaveOccurred())
+
+	fw := bufio.NewWriter(file)
+
+	for k, v := range env {
+		fmt.Fprintf(fw, "export %s=%v\n", k, v)
+	}
+
+	fw.Flush()
+	file.Close()
+
+	err = f.CopyFileIntoContainer("./"+fn, "/"+fn)
+	Expect(err).NotTo(HaveOccurred())
+}
+
 // AttachTCPDump returns tcpdump attached to the container
 func (f *Felix) AttachTCPDump(iface string) *tcpdump.TCPDump {
 	return tcpdump.Attach(f.Container.Name, "", iface)