Automated backport of #1472: Handle transient ServiceImport delete in the resolver

coredns/main.go

@@ -63,6 +63,7 @@ import (
 	_ "github.com/coredns/coredns/plugin/tls"
 	_ "github.com/coredns/coredns/plugin/trace"
 	_ "github.com/coredns/coredns/plugin/whoami"
+	"github.com/submariner-io/admiral/pkg/log/kzerolog"
 	"github.com/submariner-io/admiral/pkg/names"
 	admversion "github.com/submariner-io/admiral/pkg/version"
 	_ "github.com/submariner-io/lighthouse/coredns/plugin"
@@ -120,12 +121,16 @@ func init() {
 }
 
 func main() {
+	kzerolog.AddFlags(nil)
 	flag.Parse()
+
 	admversion.Print(names.LighthouseCoreDNSComponent, version)
 
 	if showVersion {
 		return
 	}
 
+	kzerolog.InitK8sLogging()
+
 	coremain.Run()
 }

coredns/plugin/lighthouse.go

@@ -24,9 +24,7 @@ import (
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/fall"
 	clog "github.com/coredns/coredns/plugin/pkg/log"
-	"github.com/go-logr/logr"
 	"github.com/submariner-io/lighthouse/coredns/resolver"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 const (
@@ -51,7 +49,3 @@ type Lighthouse struct {
 }
 
 var _ plugin.Handler = &Lighthouse{}
-
-func init() {
-	logf.SetLogger(logr.New(&corednsLogSink{log: log}))
-}

coredns/resolver/controller_test.go

@@ -69,23 +69,37 @@ var _ = Describe("Controller", func() {
 			})
 
 			Context("and then the EndpointSlice is deleted", func() {
-				Specify("GetDNSRecords should eventually return no DNS record", func() {
+				JustBeforeEach(func() {
 					t.awaitDNSRecordsFound(namespace1, service1, clusterID1, "", false, expDNSRecord)
 
 					err := t.endpointSlices.Namespace(namespace1).Delete(context.TODO(), endpointSlice.Name, metav1.DeleteOptions{})
 					Expect(err).To(Succeed())
+				})
 
+				Specify("GetDNSRecords should eventually return no DNS record", func() {
 					t.awaitDNSRecordsFound(namespace1, service1, "", "", false)
 				})
+
+				Specify("GetDNSRecords should eventually return not found after the ServiceImport is deleted", func() {
+					err := t.serviceImports.Namespace(namespace1).Delete(context.TODO(), service1, metav1.DeleteOptions{})
+					Expect(err).To(Succeed())
+
+					t.awaitDNSRecords(namespace1, service1, clusterID1, "", false)
+				})
 			})
 
 			Context("and then the ServiceImport is deleted", func() {
-				Specify("GetDNSRecords should eventually return not found", func() {
+				Specify("GetDNSRecords should eventually return not found after the EndpointSlice is deleted", func() {
 					t.awaitDNSRecordsFound(namespace1, service1, clusterID1, "", false, expDNSRecord)
 
 					err := t.serviceImports.Namespace(namespace1).Delete(context.TODO(), service1, metav1.DeleteOptions{})
 					Expect(err).To(Succeed())
 
+					t.ensureDNSRecordsFound(namespace1, service1, clusterID1, "", false, expDNSRecord)
+
+					err = t.endpointSlices.Namespace(namespace1).Delete(context.TODO(), endpointSlice.Name, metav1.DeleteOptions{})
+					Expect(err).To(Succeed())
+
 					t.awaitDNSRecords(namespace1, service1, clusterID1, "", false)
 				})
 			})

coredns/resolver/endpoint_slice.go

@@ -253,7 +253,9 @@ func (i *Interface) RemoveEndpointSlice(endpointSlice *discovery.EndpointSlice)
 
 	delete(serviceInfo.clusters, clusterID)
 
-	if !serviceInfo.isHeadless {
+	if len(serviceInfo.clusters) == 0 && !serviceInfo.isExported {
+		delete(i.serviceMap, key)
+	} else if !serviceInfo.isHeadless {
 		serviceInfo.mergePorts()
 		serviceInfo.resetLoadBalancing()
 	}

coredns/resolver/service_import.go

@@ -47,6 +47,8 @@ func (i *Interface) PutServiceImport(serviceImport *mcsv1a1.ServiceImport) {
 		i.serviceMap[key] = svcInfo
 	}
 
+	svcInfo.isExported = true
+
 	if svcInfo.isHeadless || !isLegacy {
 		return
 	}
@@ -82,7 +84,14 @@ func (i *Interface) RemoveServiceImport(serviceImport *mcsv1a1.ServiceImport) {
 	i.mutex.Lock()
 	defer i.mutex.Unlock()
 
-	delete(i.serviceMap, key)
+	svcInfo, found := i.serviceMap[key]
+	if found {
+		if len(svcInfo.clusters) == 0 {
+			delete(i.serviceMap, key)
+		} else {
+			svcInfo.isExported = false
+		}
+	}
 }
 
 func getServiceImportKey(from *mcsv1a1.ServiceImport) (string, bool) {

coredns/resolver/types.go

@@ -56,5 +56,6 @@ type serviceInfo struct {
 	clusters   map[string]*clusterInfo
 	balancer   loadbalancer.Interface
 	isHeadless bool
+	isExported bool
 	ports      []mcsv1a1.ServicePort
 }