Update pre-0.3.6 version (#873)

Author: mfordjody

README.md

@@ -36,8 +36,11 @@ Dubbo component composition:
 
 Projects are distributed across the code directory repositories:
 
+
 - [dubbo/api](./api). — Defines the component level APIs for the Dubbo control plane.
 
+- [dubbo/xds-api](https://github.com/dubbo-kubernetes/xds-api). — Define the xDS API for the Dubbo control plane.
+
 - [dubbo/client-go](./client-go). — Defines the Kubernetes clients automatically generated for Dubbo control plane resources.
 
 - [dubbo/dubboctl](./dubboctl). — Provides command line tools for control plane management and other operations.

dubbod/discovery/docker/dockerfile.discovery

@@ -25,7 +25,7 @@ ENV CGO_ENABLED=0 \
     GOARCH=${TARGETARCH}
 
 COPY go.mod go.sum ./
-RUN go mod download
+RUN go mod download -x
 
 COPY . .
 

dubbod/discovery/docker/dockerfile.proxy

@@ -25,7 +25,7 @@ ENV CGO_ENABLED=0 \
     GOARCH=${TARGETARCH}
 
 COPY go.mod go.sum ./
-RUN go mod download
+RUN go mod download -x
 
 COPY . .
 

dubbod/discovery/pkg/bootstrap/monitoring.go

@@ -43,7 +43,7 @@ var (
 		return time.Since(serverStart).Seconds()
 	})
 
-	versionTag   = monitoring.CreateLabel("version")
+	versionTag    = monitoring.CreateLabel("version")
 	dubbodVersion = monitoring.NewGauge(
 		"dubbod_info",
 		"Dubbod version and build information.",

dubbod/discovery/pkg/bootstrap/server.go

@@ -94,7 +94,7 @@ type Server struct {
 	httpsAddr   string
 	httpMux     *http.ServeMux
 	httpsMux    *http.ServeMux // webhooks
-	
+
 	monitoringMux   *http.ServeMux
 	metricsExporter http.Handler
 
@@ -236,7 +236,7 @@ func NewServer(args *DubboArgs, initFuncs ...func(*Server)) (*Server, error) {
 	}
 
 	InitGenerators(s.XDSServer, configGen)
-	
+
 	// Initialize monitoring server
 	if err := s.initMonitor(args.ServerOptions.HTTPAddr); err != nil {
 		return nil, fmt.Errorf("error initializing monitoring: %v", err)

dubbod/discovery/pkg/xds/ads.go

@@ -137,11 +137,11 @@ func (s *DiscoveryServer) initConnection(node *core.Node, con *Connection, ident
 	s.addCon(con.ID(), con)
 	currentCount := s.adsClientCount()
 	log.Infof("new connection for node:%s (total connections: %d)", con.ID(), currentCount)
-	
+
 	// Record XDS client connection
 	version := "unknown"
 	recordXDSClients(version, 1)
-	
+
 	defer con.MarkInitialized()
 
 	if err := s.initializeProxy(con); err != nil {
@@ -164,13 +164,13 @@ func (s *DiscoveryServer) closeConnection(con *Connection) {
 	if con.ID() == "" {
 		return
 	}
-	
+
 	// Record XDS client disconnection
 	if con.proxy != nil {
 		version := "unknown"
 		recordXDSClients(version, -1)
 	}
-	
+
 	s.removeCon(con.ID())
 }
 

dubbod/discovery/pkg/xds/discovery.go

@@ -121,16 +121,16 @@ func (s *DiscoveryServer) Shutdown() {
 
 func (s *DiscoveryServer) initPushContext(req *model.PushRequest, oldPushContext *model.PushContext, version string) *model.PushContext {
 	startTime := time.Now()
-	
+
 	push := model.NewPushContext()
 	push.PushVersion = version
 	push.InitContext(s.Env, oldPushContext, req)
 	s.dropCacheForRequest(req)
 	s.Env.SetPushContext(push)
-	
+
 	// Record push context init time
 	pushContextInitTime.Record(time.Since(startTime).Seconds())
-	
+
 	return push
 }
 
@@ -178,10 +178,10 @@ func debounce(ch chan *model.PushRequest, stopCh <-chan struct{}, opts DebounceO
 	push := func(req *model.PushRequest, debouncedEvents int, startDebounce time.Time) {
 		pushFn(req)
 		updateSent.Add(int64(debouncedEvents))
-		
+
 		// Record debounce time metric
 		debounceTime.Record(time.Since(startDebounce).Seconds())
-		
+
 		freeCh <- struct{}{}
 	}
 
@@ -290,12 +290,12 @@ func doSendPushes(stopCh <-chan struct{}, semaphore chan struct{}, queue *PushQu
 			if shuttingdown {
 				return
 			}
-			
+
 			// Record proxy queue time
 			if push != nil && !push.Start.IsZero() {
 				proxiesQueueTime.Record(time.Since(push.Start).Seconds())
 			}
-			
+
 			doneFunc := func() {
 				queue.MarkDone(client)
 				<-semaphore
@@ -371,7 +371,7 @@ func (s *DiscoveryServer) ConfigUpdate(req *model.PushRequest) {
 		s.Cache.ClearAll()
 	}
 	s.InboundUpdates.Inc()
-	
+
 	// Record inbound update metrics
 	if req.ConfigsUpdated != nil && len(req.ConfigsUpdated) > 0 {
 		recordInboundConfigUpdate()
@@ -441,10 +441,10 @@ func (s *DiscoveryServer) EDSUpdate(shard model.ShardKey, serviceName string, na
 	// 3. Endpoint health status changes
 	if pushType == model.IncrementalPush || pushType == model.FullPush {
 		log.Debugf("service %s/%s triggering %v push [endpoints=%d]", namespace, serviceName, pushType, len(dubboEndpoints))
-		
+
 		// Record EDS update metric
 		recordInboundEDSUpdate()
-		
+
 		s.ConfigUpdate(&model.PushRequest{
 			// Full:           pushType == model.FullPush,
 			// ConfigsUpdated: sets.New(model.ConfigKey{Kind: kind.ServiceEntry, Name: serviceName, Namespace: namespace}),

manifests/charts/base/Chart.yaml

@@ -20,7 +20,7 @@ name: base
 home: https://github.com/apache/dubbo-kubernetes
 icon: https://avatars.githubusercontent.com/u/11751992?s=200&v=4
 description: Helm chart for deploying dubbo cluster resources and CRDs.
-version: 0.3.5
+version: 0.3.6
 appVersion: "latest"
 maintainers:
   - name: mfordjody

manifests/charts/dubbo-control/dubbo-discovery/Chart.yaml

@@ -24,7 +24,7 @@ keywords:
   - dubbo
   - dubbod
   - dubbo-discovery
-version: 0.3.5
+version: 0.3.6
 appVersion: "latest"
 maintainers:
   - name: mfordjody

manifests/charts/dubbo-control/dubbo-discovery/files/kube-gateway.yaml

@@ -46,7 +46,7 @@ spec:
       serviceAccountName: {{ .ServiceAccount }}
       containers:
       - name: dubbo-proxy
-        image: dubboregistry/dubbo-proxy:0.3.5
+        image: dubboregistry/dubbo-proxy:0.3.6
         imagePullPolicy: Always
         ports:
         - containerPort: 15020