[navi] fmt replace klog library

Author: mfordjody

README.md

@@ -11,11 +11,11 @@ Provides support for building and deploying Dubbo applications in various enviro
 ## Repositories
 The main code repositories of Dubbo on Kubernetes include:
 
-- Dubbod — The Dubbo control plane. It is built on Istio to implement a proxyless service mesh and includes the following components:
+- [dubboctl](dubboctl/): This directory contains code for the command line utility.
+- [helm-charts](manifests/charts): This directory contains the [Helm chart](https://github.com/apache/dubbo-helm-charts) sources, which are versioned, built, and pushed to the following Helm repositories with each Dubbo release.
+- dubbod — The dubbo control plane. It is built on Istio to implement a proxyless service mesh and includes the following components:
   - [navigator](navigator/) (under development): Responsible for configuring proxies at runtime.
-- [dubboctl](dubboctl/). This directory contains code for the command line utility.
-- [operator](operator/). Dubbo operator provides user friendly options to operate the Dubbo proxyless mesh
-- [helm-charts](manifests/charts). This directory contains the [Helm chart](https://github.com/apache/dubbo-helm-charts) sources, which are versioned, built, and pushed to the following Helm repositories with each Dubbo release.
+- [Operator](operator/): Dubbo operator provides user friendly options to operate the Dubbo proxyless mesh.
 
 ## Quick Start
 Please refer to [official website](https://cn.dubbo.apache.org/zh-cn/overview/home/)

navigator/pkg/bootstrap/mesh.go

@@ -21,21 +21,27 @@ import (
 	"fmt"
 	"github.com/apache/dubbo-kubernetes/navigator/pkg/features"
 	"github.com/apache/dubbo-kubernetes/pkg/config/mesh/kubemesh"
+	"github.com/apache/dubbo-kubernetes/pkg/config/mesh/meshwatcher"
 	"github.com/apache/dubbo-kubernetes/pkg/filewatcher"
 	"github.com/apache/dubbo-kubernetes/pkg/kube/krt"
-	"github.com/apache/dubbo-kubernetes/pkg/mesh/meshwatcher"
 	"github.com/apache/dubbo-kubernetes/pkg/ptr"
+	"k8s.io/klog/v2"
 	"os"
+	"sigs.k8s.io/yaml"
 )
 
 const (
 	defaultMeshConfigMapName = "dubbo"
 )
 
 func (s *Server) initMeshConfiguration(args *NaviArgs, fileWatcher filewatcher.FileWatcher) {
-	fmt.Printf("\ninitializing mesh configuration %v\n", args.MeshConfigFile)
+	klog.Infof("initializing mesh configuration %v", args.MeshConfigFile)
 	col := s.getMeshConfiguration(args, fileWatcher)
 	col.AsCollection().WaitUntilSynced(s.internalStop)
+
+	klog.Infof("mesh configuration: %s", meshwatcher.PrettyFormatOfMeshConfig(s.environment.Mesh()))
+	argsdump, _ := yaml.Marshal(args)
+	klog.Infof("flags: \n%s", argsdump)
 }
 
 func (s *Server) getMeshConfiguration(args *NaviArgs, fileWatcher filewatcher.FileWatcher) krt.Singleton[meshwatcher.MeshConfigResource] {

navigator/pkg/bootstrap/server.go

@@ -25,15 +25,16 @@ import (
 	"github.com/apache/dubbo-kubernetes/navigator/pkg/serviceregistry/providers"
 	"github.com/apache/dubbo-kubernetes/navigator/pkg/xds"
 	"github.com/apache/dubbo-kubernetes/pkg/cluster"
+	"github.com/apache/dubbo-kubernetes/pkg/config/mesh"
 	"github.com/apache/dubbo-kubernetes/pkg/filewatcher"
 	"github.com/apache/dubbo-kubernetes/pkg/h2c"
 	dubbokeepalive "github.com/apache/dubbo-kubernetes/pkg/keepalive"
 	kubelib "github.com/apache/dubbo-kubernetes/pkg/kube"
-	"github.com/apache/dubbo-kubernetes/pkg/mesh"
 	"github.com/apache/dubbo-kubernetes/pkg/network"
 	"golang.org/x/net/http2"
 	"google.golang.org/grpc"
 	"k8s.io/client-go/rest"
+	"k8s.io/klog/v2"
 	"net"
 	"net/http"
 	"os"
@@ -92,7 +93,7 @@ func NewServer(args *NaviArgs, initFuncs ...func(*Server)) (*Server, error) {
 }
 
 func (s *Server) Start(stop <-chan struct{}) error {
-	fmt.Printf("\nStarting Dubbod Server with primary cluster %s\n", s.clusterID)
+	klog.Infof("Starting Dubbod Server with primary cluster %s", s.clusterID)
 	if err := s.server.Start(stop); err != nil {
 		return err
 	}
@@ -107,9 +108,9 @@ func (s *Server) Start(stop <-chan struct{}) error {
 			return err
 		}
 		go func() {
-			fmt.Printf("starting secure gRPC discovery service at %s", grpcListener.Addr())
+			klog.Infof("starting secure gRPC discovery service at %s", grpcListener.Addr())
 			if err := s.secureGrpcServer.Serve(grpcListener); err != nil {
-				fmt.Errorf("error serving secure GRPC server: %v", err)
+				klog.Errorf("error serving secure GRPC server: %v", err)
 			}
 		}()
 	}
@@ -120,9 +121,9 @@ func (s *Server) Start(stop <-chan struct{}) error {
 			return err
 		}
 		go func() {
-			fmt.Printf("starting gRPC discovery service at %s", grpcListener.Addr())
+			klog.Infof("starting gRPC discovery service at %s", grpcListener.Addr())
 			if err := s.grpcServer.Serve(grpcListener); err != nil {
-				fmt.Errorf("error serving GRPC server: %v", err)
+				klog.Errorf("error serving GRPC server: %v", err)
 			}
 		}()
 	}
@@ -133,9 +134,9 @@ func (s *Server) Start(stop <-chan struct{}) error {
 			return err
 		}
 		go func() {
-			fmt.Printf("starting webhook service at %s", httpsListener.Addr())
+			klog.Infof("starting webhook service at %s", httpsListener.Addr())
 			if err := s.httpsServer.ServeTLS(httpsListener, "", ""); network.IsUnexpectedListenerError(err) {
-				fmt.Errorf("error serving https server: %v", err)
+				klog.Errorf("error serving https server: %v", err)
 			}
 		}()
 		s.httpsAddr = httpsListener.Addr().String()
@@ -197,7 +198,7 @@ func (s *Server) initServers(args *NaviArgs) {
 	} else {
 		// This happens only if the GRPC port (15010) is disabled. We will multiplex
 		// it on the HTTP port. Does not impact the HTTPS gRPC or HTTPS.
-		fmt.Printf("multiplexing gRPC on http addr %v", args.ServerOptions.HTTPAddr)
+		klog.Infof("multiplexing gRPC on http addr %v", args.ServerOptions.HTTPAddr)
 		multiplexGRPC = true
 	}
 	h2s := &http2.Server{
@@ -233,9 +234,9 @@ func (s *Server) serveHTTP() error {
 		return err
 	}
 	go func() {
-		fmt.Printf("starting HTTP service at %s", httpListener.Addr())
+		klog.Infof("starting HTTP service at %s", httpListener.Addr())
 		if err := s.httpServer.Serve(httpListener); network.IsUnexpectedListenerError(err) {
-			fmt.Errorf("error serving http server: %v", err)
+			klog.Errorf("error serving http server: %v", err)
 		}
 	}()
 	s.httpAddr = httpListener.Addr().String()
@@ -261,12 +262,12 @@ func (s *Server) cachesSynced() bool {
 
 func (s *Server) waitForCacheSync(stop <-chan struct{}) bool {
 	start := time.Now()
-	fmt.Println("\nWaiting for caches to be synced")
+	klog.Info("Waiting for caches to be synced")
 	if !kubelib.WaitForCacheSync("server", stop, s.cachesSynced) {
-		fmt.Println("\nFailed waiting for cache sync")
+		klog.Info("Failed waiting for cache sync")
 		return false
 	}
-	fmt.Printf("\nAll controller caches have been synced up in %v\n", time.Since(start))
+	klog.Infof("All controller caches have been synced up in %v", time.Since(start))
 	// TODO XDSServer.InboundUpdates.Load
 	// TODO return kubelib.WaitForCacheSync("push context", stop, func() bool { return s.pushContextReady(expected) })
 	return false

navigator/pkg/model/context.go

@@ -19,9 +19,15 @@ package model
 
 import (
 	"github.com/apache/dubbo-kubernetes/navigator/pkg/features"
+	"github.com/apache/dubbo-kubernetes/pkg/config/mesh"
+	"github.com/apache/dubbo-kubernetes/pkg/config/mesh/meshwatcher"
+	meshconfig "istio.io/api/mesh/v1alpha1"
 )
 
+type Watcher = meshwatcher.WatcherCollection
+
 type Environment struct {
+	Watcher
 	Cache XdsCache
 }
 
@@ -43,3 +49,12 @@ func NewEnvironment() *Environment {
 		Cache: cache,
 	}
 }
+
+var _ mesh.Holder = &Environment{}
+
+func (e *Environment) Mesh() *meshconfig.MeshConfig {
+	if e != nil && e.Watcher != nil {
+		return e.Watcher.Mesh()
+	}
+	return nil
+}

pkg/config/mesh/kubemesh/watcher.go

@@ -19,10 +19,10 @@ package kubemesh
 
 import (
 	"fmt"
+	"github.com/apache/dubbo-kubernetes/pkg/config/mesh/meshwatcher"
 	"github.com/apache/dubbo-kubernetes/pkg/kube"
 	"github.com/apache/dubbo-kubernetes/pkg/kube/kclient"
 	"github.com/apache/dubbo-kubernetes/pkg/kube/krt"
-	"github.com/apache/dubbo-kubernetes/pkg/mesh/meshwatcher"
 	"github.com/apache/dubbo-kubernetes/pkg/ptr"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/mesh/mesh.go renamed to pkg/config/mesh/mesh.go

@@ -18,22 +18,17 @@
 package meshwatcher
 
 import (
-	"fmt"
+	"github.com/apache/dubbo-kubernetes/pkg/config/mesh"
 	"github.com/apache/dubbo-kubernetes/pkg/filewatcher"
 	"github.com/apache/dubbo-kubernetes/pkg/kube/krt"
 	krtfiles "github.com/apache/dubbo-kubernetes/pkg/kube/krt/files"
-	"github.com/apache/dubbo-kubernetes/pkg/mesh"
-	meshconfig "istio.io/api/mesh/v1alpha1"
+	"k8s.io/klog/v2"
 	"os"
 	"path"
 )
 
 type MeshConfigSource = krt.Singleton[string]
 
-type MeshConfigResource struct {
-	*meshconfig.MeshConfig
-}
-
 func NewFileSource(fileWatcher filewatcher.FileWatcher, filename string, opts krt.OptionsBuilder) (MeshConfigSource, error) {
 	return krtfiles.NewFileSingleton[string](fileWatcher, filename, func(filename string) (string, error) {
 		b, err := os.ReadFile(filename)
@@ -55,17 +50,17 @@ func NewCollection(opts krt.OptionsBuilder, sources ...MeshConfigSource) krt.Sin
 			for _, attempt := range sources {
 				s := krt.FetchOne(ctx, attempt.AsCollection())
 				if s == nil {
-					fmt.Println("mesh configuration source missing")
+					klog.Info("mesh configuration source missing")
 					continue
 				}
 				n, err := mesh.ApplyMeshConfig(*s, meshCfg)
 				if err != nil {
 					if len(sources) == 1 {
-						fmt.Errorf("invalid mesh config, using last known state: %v", err)
+						klog.Errorf("invalid mesh config, using last known state: %v", err)
 						ctx.DiscardResult()
 						return &MeshConfigResource{mesh.DefaultMeshConfig()}
 					}
-					fmt.Printf("invalid mesh config, ignoring: %v", err)
+					klog.Errorf("invalid mesh config, ignoring: %v", err)
 					continue
 				}
 				meshCfg = n

pkg/mesh/meshwatcher/collection.go renamed to pkg/config/mesh/meshwatcher/collection.go

@@ -18,11 +18,18 @@
 package meshwatcher
 
 import (
+	"github.com/apache/dubbo-kubernetes/pkg/config/mesh"
+	"github.com/apache/dubbo-kubernetes/pkg/kube/krt"
+	"github.com/apache/dubbo-kubernetes/pkg/util/protomarshal"
 	"google.golang.org/protobuf/proto"
-
 	meshconfig "istio.io/api/mesh/v1alpha1"
 )
 
+type WatcherCollection interface {
+	mesh.Watcher
+	krt.Singleton[MeshConfigResource]
+}
+
 // MeshConfigResource holds the current MeshConfig state
 type MeshConfigResource struct {
 	*meshconfig.MeshConfig
@@ -34,13 +41,7 @@ func (m MeshConfigResource) Equals(other MeshConfigResource) bool {
 	return proto.Equal(m.MeshConfig, other.MeshConfig)
 }
 
-// MeshNetworksResource holds the current MeshNetworks state
-type MeshNetworksResource struct {
-	*meshconfig.MeshNetworks
-}
-
-func (m MeshNetworksResource) ResourceName() string { return "MeshNetworksResource" }
-
-func (m MeshNetworksResource) Equals(other MeshNetworksResource) bool {
-	return proto.Equal(m.MeshNetworks, other.MeshNetworks)
+func PrettyFormatOfMeshConfig(meshConfig *meshconfig.MeshConfig) string {
+	meshConfigDump, _ := protomarshal.ToYAML(meshConfig)
+	return meshConfigDump
 }

pkg/config/mesh/meshwatcher/mesh.go

@@ -21,15 +21,6 @@ import (
 	"istio.io/api/mesh/v1alpha1"
 )
 
-// NetworksWatcher watches changes to the mesh networks config.
-type NetworksWatcher interface {
-	// AddNetworksHandler registers a callback handler for changes to the networks config.
-	AddNetworksHandler(func()) *WatcherHandlerRegistration
-
-	// DeleteNetworksHandler unregisters a callback handler when remote cluster is removed.
-	DeleteNetworksHandler(registration *WatcherHandlerRegistration)
-}
-
 // Holder of a mesh configuration.
 type Holder interface {
 	Mesh() *v1alpha1.MeshConfig

pkg/config/mesh/watchers.go

@@ -37,6 +37,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/clientcmd"
+	"k8s.io/klog/v2"
 	"net/http"
 	"time"
 )
@@ -243,9 +244,9 @@ func WaitForCacheSync(name string, stop <-chan struct{}, cacheSyncs ...cache.Inf
 	attempt := 0
 	defer func() {
 		if r {
-			fmt.Printf("\nsync complete: name=%s, time=%v", name, time.Since(t0))
+			klog.Infof("sync complete: name=%s, time=%v", name, time.Since(t0))
 		} else {
-			fmt.Printf("\nsync failed: name=%s, time=%v", name, time.Since(t0))
+			klog.Infof("sync failed: name=%s, time=%v", name, time.Since(t0))
 		}
 	}()
 	for {