Clean up and fix for NIC Pod failing to bind when NGINX exits unexpectedly (#7295)

Author: AlexFenlon

cmd/nginx-ingress/main.go

@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
+	"path/filepath"
 	"regexp"
 	"runtime"
 	"strings"
@@ -785,6 +786,21 @@ func handleTermination(lbc *k8s.LoadBalancerController, nginxManager nginx.Manag
 	select {
 	case err := <-cpcfg.nginxDone:
 		if err != nil {
+			// removes .sock files after nginx exits
+			socketPath := "/var/lib/nginx/"
+			files, readErr := os.ReadDir(socketPath)
+			if readErr != nil {
+				nl.Errorf(lbc.Logger, "error trying to read directory %s: %v", socketPath, readErr)
+			} else {
+				for _, f := range files {
+					if !f.IsDir() && strings.HasSuffix(f.Name(), ".sock") {
+						fullPath := filepath.Join(socketPath, f.Name())
+						if removeErr := os.Remove(fullPath); removeErr != nil {
+							nl.Errorf(lbc.Logger, "error trying to remove file %s: %v", fullPath, removeErr)
+						}
+					}
+				}
+			}
 			nl.Fatalf(lbc.Logger, "nginx command exited unexpectedly with status: %v", err)
 		} else {
 			nl.Info(lbc.Logger, "nginx command exited successfully")