Skip to content

Commit cafd69d

Browse files
committed
fix(NRC): reduce logging for egress cleanup errors
Errors can happen here for a lot of reasons, the user may not have been running the controller, the definitions may have already been deleted, the ipset may not be around to be referenced because the user already cleaned up before. Reduced the logging to trim user confusion over error statements in the logs.
1 parent fb07026 commit cafd69d

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

pkg/controllers/routing/network_routes_controller.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -676,15 +676,19 @@ func (nrc *NetworkRoutingController) setupOverlayTunnel(tunnelName string, nextH
676676

677677
// Cleanup performs the cleanup of configurations done
678678
func (nrc *NetworkRoutingController) Cleanup() {
679+
klog.Infof("Cleaning up NetworkRoutesController configurations")
680+
679681
// Pod egress cleanup
680682
err := nrc.deletePodEgressRule()
681683
if err != nil {
682-
klog.Warningf("Error deleting Pod egress iptables rule: %s", err.Error())
684+
// Changing to level 1 logging as errors occur when ipsets have already been cleaned and needlessly worries users
685+
klog.V(1).Infof("Error deleting Pod egress iptables rule: %v", err)
683686
}
684687

685688
err = nrc.deleteBadPodEgressRules()
686689
if err != nil {
687-
klog.Warningf("Error deleting Pod egress iptables rule: %s", err.Error())
690+
// Changing to level 1 logging as errors occur when ipsets have already been cleaned and needlessly worries users
691+
klog.V(1).Infof("Error deleting Pod egress iptables rule: %s", err.Error())
688692
}
689693

690694
// delete all ipsets created by kube-router
@@ -713,6 +717,8 @@ func (nrc *NetworkRoutingController) Cleanup() {
713717
if err != nil {
714718
klog.Warningf("Error deleting ipset: %s", err.Error())
715719
}
720+
721+
klog.Infof("Successfully cleaned the NetworkRoutesController configuration done by kube-router")
716722
}
717723

718724
func (nrc *NetworkRoutingController) syncNodeIPSets() error {

0 commit comments

Comments
 (0)