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 9833f704 fix ci error (#818)
9833f704 is described below
commit 9833f7045dd4926b1057e95091ea1432ffa09b8b
Author: Jian Zhong <[email protected]>
AuthorDate: Sun Nov 9 17:03:37 2025 +0800
fix ci error (#818)
---
dubboctl/pkg/hub/pusher/transport.go | 4 +---
dubbod/planet/pkg/bootstrap/configcontroller.go | 6 +++---
.../planet/pkg/serviceregistry/kube/controller/endpoint_builder.go | 6 +++---
pkg/dubbo-agent/agent.go | 4 ++--
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/dubboctl/pkg/hub/pusher/transport.go
b/dubboctl/pkg/hub/pusher/transport.go
index 376eb2e8..1471f610 100644
--- a/dubboctl/pkg/hub/pusher/transport.go
+++ b/dubboctl/pkg/hub/pusher/transport.go
@@ -54,7 +54,6 @@ func NewRoundTripper(opts ...Option) RoundTripCloser {
combinedDialer := newDialerWithFallback(primaryDialer, secondaryDialer)
-
httpTransport.DialContext = combinedDialer.DialContext
httpTransport.DialTLSContext = newDialTLSContext(combinedDialer,
httpTransport.TLSClientConfig, o.selectCA)
@@ -79,8 +78,7 @@ func newDialTLSContext(dialer ContextDialer, config
*tls.Config, selectCA func(c
if config != nil {
cfg = config.Clone()
} else {
- cfg = &tls.Config{
- }
+ cfg = &tls.Config{}
}
serverName, _, err := net.SplitHostPort(addr)
diff --git a/dubbod/planet/pkg/bootstrap/configcontroller.go
b/dubbod/planet/pkg/bootstrap/configcontroller.go
index f51ec784..9a7d601f 100644
--- a/dubbod/planet/pkg/bootstrap/configcontroller.go
+++ b/dubbod/planet/pkg/bootstrap/configcontroller.go
@@ -223,7 +223,7 @@ func (s *Server) getTransportCredentials(args *PlanetArgs,
tlsSettings *v1alpha3
}
if tlsSettings.GetInsecureSkipVerify().GetValue() ||
len(tlsSettings.GetCaCertificates()) == 0 {
return credentials.NewTLS(&tls.Config{
- ServerName: tlsSettings.GetSni(),
+ ServerName: tlsSettings.GetSni(),
}), nil
}
certPool := x509.NewCertPool()
@@ -231,8 +231,8 @@ func (s *Server) getTransportCredentials(args *PlanetArgs,
tlsSettings *v1alpha3
return nil, fmt.Errorf("failed to add ca certificate
from configSource.tlsSettings to pool")
}
return credentials.NewTLS(&tls.Config{
- ServerName: tlsSettings.GetSni(),
- RootCAs: certPool,
+ ServerName: tlsSettings.GetSni(),
+ RootCAs: certPool,
VerifyPeerCertificate: func(rawCerts [][]byte,
verifiedChains [][]*x509.Certificate) error {
return s.verifyCert(rawCerts, tlsSettings)
},
diff --git
a/dubbod/planet/pkg/serviceregistry/kube/controller/endpoint_builder.go
b/dubbod/planet/pkg/serviceregistry/kube/controller/endpoint_builder.go
index cedddf45..8ce8d0fd 100644
--- a/dubbod/planet/pkg/serviceregistry/kube/controller/endpoint_builder.go
+++ b/dubbod/planet/pkg/serviceregistry/kube/controller/endpoint_builder.go
@@ -88,9 +88,9 @@ func (b *EndpointBuilder) buildDubboEndpoint(
}
return &model.DubboEndpoint{
- Labels: b.labels,
- ServiceAccount: b.serviceAccount,
- Addresses: []string{endpointAddress},
+ Labels: b.labels,
+ ServiceAccount: b.serviceAccount,
+ Addresses: []string{endpointAddress},
EndpointPort: uint32(endpointPort),
ServicePortName: svcPortName,
Network: networkID,
diff --git a/pkg/dubbo-agent/agent.go b/pkg/dubbo-agent/agent.go
index 6c6d53c2..18a4422c 100644
--- a/pkg/dubbo-agent/agent.go
+++ b/pkg/dubbo-agent/agent.go
@@ -202,8 +202,8 @@ func (a *Agent) Run(ctx context.Context) (func(), error) {
_, _ = w.Write([]byte("ok"))
})
a.statusSrv = &http.Server{
- Addr: fmt.Sprintf(":%d", a.proxyConfig.StatusPort),
- Handler: mux,
+ Addr: fmt.Sprintf(":%d", a.proxyConfig.StatusPort),
+ Handler: mux,
}
a.wg.Add(1)
go func() {
