Update control plane code logic (#857)

Author: mfordjody

dubbod/discovery/pkg/bootstrap/options.go

@@ -28,6 +28,7 @@ import (
 var (
 	PodNamespace = env.Register("POD_NAMESPACE", constants.DubboSystemNamespace, "").Get()
 	PodName      = env.Register("POD_NAME", "", "").Get()
+	Revision     = env.Register("REVISION", "", "").Get()
 )
 
 type RegistryOptions struct {
@@ -73,6 +74,14 @@ type TLSOptions struct {
 	CipherSuits     []uint16 // This is the parsed cipher suites
 }
 
+func (p *DubboArgs) applyDefaults() {
+	p.Namespace = PodNamespace
+	p.PodName = PodName
+	p.Revision = Revision
+	p.KeepaliveOptions = keepalive.DefaultOption()
+	p.RegistryOptions.ClusterRegistriesNamespace = p.Namespace
+}
+
 func NewDubboArgs(initFuncs ...func(*DubboArgs)) *DubboArgs {
 	p := &DubboArgs{}
 
@@ -86,13 +95,3 @@ func NewDubboArgs(initFuncs ...func(*DubboArgs)) *DubboArgs {
 
 	return p
 }
-
-var Revision = env.Register("REVISION", "", "").Get()
-
-func (p *DubboArgs) applyDefaults() {
-	p.Namespace = PodNamespace
-	p.PodName = PodName
-	p.Revision = Revision
-	p.KeepaliveOptions = keepalive.DefaultOption()
-	p.RegistryOptions.ClusterRegistriesNamespace = p.Namespace
-}

dubbod/discovery/pkg/bootstrap/server.go

@@ -219,11 +219,6 @@ func NewServer(args *DubboArgs, initFuncs ...func(*Server)) (*Server, error) {
 	s.initMeshHandlers(nil)
 
 	s.environment.Init()
-	if err := s.environment.InitNetworksManager(s.XDSServer); err != nil {
-		return nil, err
-	}
-
-	// TODO MultiRootMesh
 
 	// Options based on the current 'defaults' in dubbo.
 	caOpts := &caOptions{
@@ -453,11 +448,11 @@ func (s *Server) initRegistryEventHandlers() {
 	log.Info("initializing registry event handlers")
 
 	if s.configController == nil {
-		log.Warnf("initRegistryEventHandlers: configController is nil, cannot register event handlers")
+		log.Warnf("configController is nil, cannot register event handlers")
 		return
 	}
 
-	log.Debugf("initRegistryEventHandlers: configController is available, registering event handlers")
+	log.Debugf("configController is available, registering event handlers")
 
 	configHandler := func(prev config.Config, curr config.Config, event model.Event) {
 		// Log ALL events at INFO level to ensure visibility
@@ -534,17 +529,17 @@ func (s *Server) initRegistryEventHandlers() {
 	if features.EnableGatewayAPI {
 		schemas = collections.DubboGatewayAPI().All()
 	}
-	log.Debugf("initRegistryEventHandlers: found %d schemas to register", len(schemas))
+	log.Debugf("found %d schemas to register", len(schemas))
 	registeredCount := 0
 	for _, schema := range schemas {
 		gvk := schema.GroupVersionKind()
 		schemaID := schema.Identifier()
-		log.Debugf("initRegistryEventHandlers: registering event handler for %s (GVK: %v)", schemaID, gvk)
+		log.Debugf("registering event handler for %s (GVK: %v)", schemaID, gvk)
 		s.configController.RegisterEventHandler(gvk, configHandler)
 		registeredCount++
-		log.Debugf("initRegistryEventHandlers: successfully registered event handler for %s (GVK: %v)", schemaID, gvk)
+		log.Debugf("successfully registered event handler for %s (GVK: %v)", schemaID, gvk)
 	}
-	log.Debugf("initRegistryEventHandlers: successfully registered event handlers for %d schemas", registeredCount)
+	log.Debugf("successfully registered event handlers for %d schemas", registeredCount)
 }
 
 func (s *Server) addReadinessProbe(name string, fn readinessProbe) {

dubbod/discovery/pkg/bootstrap/service_controller.go

@@ -82,3 +82,12 @@ func (s *Server) initKubeRegistry(args *DubboArgs) (err error) {
 		s.multiclusterController)
 	return
 }
+
+func hasKubeRegistry(registries []string) bool {
+	for _, r := range registries {
+		if provider.ID(r) == provider.Kubernetes {
+			return true
+		}
+	}
+	return false
+}

dubbod/discovery/pkg/bootstrap/util.go

@@ -88,7 +88,6 @@ type Environment struct {
 	ConfigStore
 	mutex                sync.RWMutex
 	pushContext          *PushContext
-	NetworkManager       *NetworkManager
 	clusterLocalServices ClusterLocalProvider
 	DomainSuffix         string
 	EndpointIndex        *EndpointIndex
@@ -161,29 +160,6 @@ func (e *Environment) AddMeshHandler(h func()) {
 	}
 }
 
-// NetworkGateways returns all known network gateways from the underlying registries.
-// This is delegated to the embedded ServiceDiscovery if it implements NetworkGatewaysWatcher.
-func (e *Environment) NetworkGateways() []NetworkGateway {
-	if e == nil || e.ServiceDiscovery == nil {
-		return nil
-	}
-	if w, ok := e.ServiceDiscovery.(NetworkGatewaysWatcher); ok {
-		return w.NetworkGateways()
-	}
-	return nil
-}
-
-// AppendNetworkGatewayHandler registers a handler that is invoked when network gateways change
-// in any of the underlying service registries.
-func (e *Environment) AppendNetworkGatewayHandler(h func()) {
-	if e == nil || e.ServiceDiscovery == nil {
-		return
-	}
-	if w, ok := e.ServiceDiscovery.(NetworkGatewaysWatcher); ok {
-		w.AppendNetworkGatewayHandler(h)
-	}
-}
-
 func (e *Environment) GetDiscoveryAddress() (host.Name, string, error) {
 	proxyConfig := mesh.DefaultProxyConfig()
 	if e.Mesh().DefaultConfig != nil {
@@ -216,11 +192,6 @@ func (e *Environment) Init() {
 	e.clusterLocalServices = NewClusterLocalProvider(e)
 }
 
-func (e *Environment) InitNetworksManager(updater XDSUpdater) (err error) {
-	e.NetworkManager, err = NewNetworkManager(e, updater)
-	return
-}
-
 type Proxy struct {
 	sync.RWMutex
 	XdsResourceGenerator XdsResourceGenerator