Ensure the a local-only intercept is removed on quit.

Signed-off-by: Thomas Hallgren <[email protected]>

Author: thallgren

pkg/client/userd/trafficmgr/intercept.go

@@ -324,7 +324,8 @@ func (s *session) handleInterceptSnapshot(ctx context.Context, podIcepts *podInt
 	podIcepts.cancelUnwanted(ctx)
 }
 
-// getCurrentIntercepts returns a copy of the current intercept snapshot.
+// getCurrentIntercepts returns a copy of the current intercept snapshot. This snapshot does
+// not include any local-only intercepts.
 func (s *session) getCurrentIntercepts() []*intercept {
 	// Copy the current snapshot
 	s.currentInterceptsLock.Lock()
@@ -750,7 +751,8 @@ func (s *session) RemoveIntercept(c context.Context, name string) error {
 	dlog.Debugf(c, "Removing intercept %s", name)
 
 	if _, ok := s.localIntercepts[name]; ok {
-		return s.RemoveLocalOnlyIntercept(c, name)
+		s.RemoveLocalOnlyIntercept(c, name)
+		return nil
 	}
 
 	ii := s.getInterceptByName(name)
@@ -861,6 +863,10 @@ func (s *session) ClearIntercepts(c context.Context) error {
 			return err
 		}
 	}
+	for ic := range s.localIntercepts {
+		dlog.Debugf(c, "Clearing local-only intercept %s", ic)
+		s.RemoveLocalOnlyIntercept(c, ic)
+	}
 	return nil
 }
 
@@ -986,7 +992,7 @@ func (s *session) addLocalOnlyIntercept(c context.Context, spec *manager.Interce
 	}
 }
 
-func (s *session) RemoveLocalOnlyIntercept(c context.Context, name string) error {
+func (s *session) RemoveLocalOnlyIntercept(c context.Context, name string) {
 	dlog.Debugf(c, "removing local-only intercept %s", name)
 
 	// Ensure that namespace is removed from localInterceptedNamespaces if this was the last local intercept
@@ -998,5 +1004,4 @@ func (s *session) RemoveLocalOnlyIntercept(c context.Context, name string) error
 	}
 	s.currentInterceptsLock.Unlock()
 	s.updateDaemonNamespaces(c)
-	return nil
 }