This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new 4b268514 Update pre-0.3.6 version (#873)
4b268514 is described below
commit 4b268514fe309ae243828b0955e024ca69d221a2
Author: Joe Zhong <[email protected]>
AuthorDate: Fri Mar 6 15:09:37 2026 +0800
Update pre-0.3.6 version (#873)
---
README.md | 3 +++
dubbod/discovery/docker/dockerfile.discovery | 2 +-
dubbod/discovery/docker/dockerfile.proxy | 2 +-
dubbod/discovery/pkg/bootstrap/monitoring.go | 2 +-
dubbod/discovery/pkg/bootstrap/server.go | 4 ++--
dubbod/discovery/pkg/xds/ads.go | 8 ++++----
dubbod/discovery/pkg/xds/discovery.go | 20 ++++++++++----------
manifests/charts/base/Chart.yaml | 2 +-
.../charts/dubbo-control/dubbo-discovery/Chart.yaml | 2 +-
.../dubbo-discovery/files/kube-gateway.yaml | 2 +-
.../dubbo-discovery/templates/deployment.yaml | 2 +-
pkg/kube/inject/inject.go | 2 +-
pkg/xds/monitoring.go | 2 +-
pkg/xds/server.go | 4 ++--
14 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/README.md b/README.md
index c4a5a747..865f1393 100644
--- a/README.md
+++ b/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.
diff --git a/dubbod/discovery/docker/dockerfile.discovery
b/dubbod/discovery/docker/dockerfile.discovery
index 7ad55c8b..a71adb36 100644
--- a/dubbod/discovery/docker/dockerfile.discovery
+++ b/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 . .
diff --git a/dubbod/discovery/docker/dockerfile.proxy
b/dubbod/discovery/docker/dockerfile.proxy
index d934724b..0484a747 100644
--- a/dubbod/discovery/docker/dockerfile.proxy
+++ b/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 . .
diff --git a/dubbod/discovery/pkg/bootstrap/monitoring.go
b/dubbod/discovery/pkg/bootstrap/monitoring.go
index 3330dbbf..7f0075f4 100644
--- a/dubbod/discovery/pkg/bootstrap/monitoring.go
+++ b/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.",
diff --git a/dubbod/discovery/pkg/bootstrap/server.go
b/dubbod/discovery/pkg/bootstrap/server.go
index 60d155f8..4b326f07 100644
--- a/dubbod/discovery/pkg/bootstrap/server.go
+++ b/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)
diff --git a/dubbod/discovery/pkg/xds/ads.go b/dubbod/discovery/pkg/xds/ads.go
index 5d1e3027..48665a4a 100644
--- a/dubbod/discovery/pkg/xds/ads.go
+++ b/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())
}
diff --git a/dubbod/discovery/pkg/xds/discovery.go
b/dubbod/discovery/pkg/xds/discovery.go
index 2c12f68a..3ea4afc5 100644
--- a/dubbod/discovery/pkg/xds/discovery.go
+++ b/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}),
diff --git a/manifests/charts/base/Chart.yaml b/manifests/charts/base/Chart.yaml
index 6b252eed..8391214d 100644
--- a/manifests/charts/base/Chart.yaml
+++ b/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
diff --git a/manifests/charts/dubbo-control/dubbo-discovery/Chart.yaml
b/manifests/charts/dubbo-control/dubbo-discovery/Chart.yaml
index acc70de5..7386824b 100644
--- a/manifests/charts/dubbo-control/dubbo-discovery/Chart.yaml
+++ b/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
diff --git
a/manifests/charts/dubbo-control/dubbo-discovery/files/kube-gateway.yaml
b/manifests/charts/dubbo-control/dubbo-discovery/files/kube-gateway.yaml
index 00a2b9f9..bd274beb 100644
--- a/manifests/charts/dubbo-control/dubbo-discovery/files/kube-gateway.yaml
+++ b/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
diff --git
a/manifests/charts/dubbo-control/dubbo-discovery/templates/deployment.yaml
b/manifests/charts/dubbo-control/dubbo-discovery/templates/deployment.yaml
index 8320cc71..c5298be9 100644
--- a/manifests/charts/dubbo-control/dubbo-discovery/templates/deployment.yaml
+++ b/manifests/charts/dubbo-control/dubbo-discovery/templates/deployment.yaml
@@ -19,7 +19,7 @@ spec:
serviceAccountName: dubbod
containers:
- name: discovery
- image: "dubboregistry/dubbo-discovery:0.3.5"
+ image: "dubboregistry/dubbo-discovery:0.3.6"
imagePullPolicy: Always
args:
- "discovery"
diff --git a/pkg/kube/inject/inject.go b/pkg/kube/inject/inject.go
index b72b0790..11f58384 100644
--- a/pkg/kube/inject/inject.go
+++ b/pkg/kube/inject/inject.go
@@ -114,7 +114,7 @@ func RunTemplate(params InjectionParameters) (mergedPod
*corev1.Pod, templatePod
MeshGlobalConfig: meshGlobalConfig,
Values: params.valuesConfig.asMap,
Revision: params.revision,
- ProxyImage: getProxyImage(params.valuesConfig.asMap,
"dubboregistry/dubbo-proxy:0.3.5"),
+ ProxyImage: getProxyImage(params.valuesConfig.asMap,
"dubboregistry/dubbo-proxy:0.3.6"),
CompliancePolicy: common_features.CompliancePolicy,
}
diff --git a/pkg/xds/monitoring.go b/pkg/xds/monitoring.go
index 8374ff84..5b7c56fa 100644
--- a/pkg/xds/monitoring.go
+++ b/pkg/xds/monitoring.go
@@ -28,7 +28,7 @@ import (
)
var (
- Log = log.RegisterScope("ads", "ads debugging")
+ Log = log.RegisterScope("ads", "ads debugging")
xdsLog = Log
errTag = monitoring.CreateLabel("err")
diff --git a/pkg/xds/server.go b/pkg/xds/server.go
index 14ec47ae..f0fc8e24 100644
--- a/pkg/xds/server.go
+++ b/pkg/xds/server.go
@@ -212,11 +212,11 @@ func Send(ctx ConnectionContext, res
*discovery.DiscoveryResponse) error {
startTime := time.Now()
err := conn.stream.Send(res)
sendDuration := time.Since(startTime)
-
+
if err == nil {
// Record send time metric
RecordSendTime(sendDuration)
-
+
if res.Nonce != "" {
ctx.Watcher().UpdateWatchedResource(res.TypeUrl,
func(wr *WatchedResource) *WatchedResource {
if wr == nil {
