Merge pull request #47 from akwi-github/add-metrics

minor fixes

Author: k8s-ci-robot

main.go

@@ -441,6 +441,13 @@ func syncInterface(v4net, v6net, podIPNet *net.IPNet) error {
 		return err
 	}
 
+	if !metricsEnabled {
+		// override, if !metricsEnabled then possibly bpffs not mounted and can't pin
+		// by name
+		spec.Maps["ip64_metrics"].Pinning = ebpf.PinNone
+		spec.Maps["ip46_metrics"].Pinning = ebpf.PinNone
+	}
+
 	for _, prog := range spec.Programs {
 		klog.Infof("eBPF program spec section %s name %s", prog.SectionName, prog.Name)
 	}

tests/e2e/e2e.bats

@@ -170,7 +170,6 @@
 
   kubectl wait --for=condition=ready pod/test-bpfmap1 --timeout=30s
   kubectl exec -i test-bpfmap1 -- sh -c "
-    apt-get update > /dev/null
     ping -c 7 64:ff9b::$ip_address >&2
   "
   #gather metrics before the second ping
@@ -182,7 +181,6 @@
       --restart=Never \
       --command \
       -- sh -c "
-  apt-get update >/dev/null 2>&1
   sleep 20
   get_icmp6_count() {
     curl --silent localhost:8881/metrics | grep protocol=\\\"ICMPv6\\\" | cut -d ' ' -f2
@@ -205,7 +203,6 @@
         --restart=Never \
         --command \
         -- sh -c "
-    apt-get update >/dev/null 2>&1
     get_icmp6_count() {
       curl --silent localhost:8881/metrics | grep protocol=\\\"ICMPv6\\\" | cut -d ' ' -f2
     }