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 9629ebf5 add license (#811)
9629ebf5 is described below
commit 9629ebf5982f9c741c5928e78f22d503c09331db
Author: Jian Zhong <[email protected]>
AuthorDate: Fri Nov 7 14:56:31 2025 +0800
add license (#811)
add license v2
chore: go fmt
fix typo
fix typo
change named
---
pkg/adsc/adsc.go | 6 ++----
sail/cmd/sail-agent/app/wait.go | 2 --
sail/pkg/bootstrap/certcontroller.go | 4 ++--
sail/pkg/bootstrap/servicecontroller.go | 1 -
sail/pkg/features/sail.go | 2 +-
sail/pkg/features/tuning.go | 6 +++---
sail/pkg/serviceregistry/kube/controller/multicluster.go | 4 ++--
sail/pkg/xds/discovery.go | 2 +-
test/grpc-proxyless/go.mod | 15 +++++++++++++++
9 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/pkg/adsc/adsc.go b/pkg/adsc/adsc.go
index bdc65caf..44206a41 100644
--- a/pkg/adsc/adsc.go
+++ b/pkg/adsc/adsc.go
@@ -95,8 +95,6 @@ type Config struct {
BackoffPolicy backoff.BackOff
}
-// ADSC implements a basic client for ADS, for use in stress tests and tools
-// or libraries that need to connect to Istio pilot or other ADS servers.
type ADSC struct {
// Stream is the GRPC connection stream, allowing direct GRPC send
operations.
// Set after Dial is called.
@@ -762,7 +760,7 @@ func (a *ADSC) handleLDS(ll []*listener.Listener) {
lt[l.Name] = l
config, _ :=
protomarshal.MessageToStructSlow(filter.GetTypedConfig())
c := config.Fields["cluster"].GetStringValue()
- klog.V(2).Infof("TCP: %s -> %s", l.Name, c)
+ klog.V(2).InfoS("TCP: %s -> %s", l.Name, c)
case wellknown.HTTPConnectionManager:
lh[l.Name] = l
@@ -774,7 +772,7 @@ func (a *ADSC) handleLDS(ll []*listener.Listener) {
routes = append(routes, fmt.Sprintf("%d", port))
}
default:
- klog.Infof(protomarshal.ToJSONWithIndent(l, " "))
+ klog.Info(protomarshal.ToJSONWithIndent(l, " "))
}
}
diff --git a/sail/cmd/sail-agent/app/wait.go b/sail/cmd/sail-agent/app/wait.go
index c8d46b9f..91d2e441 100644
--- a/sail/cmd/sail-agent/app/wait.go
+++ b/sail/cmd/sail-agent/app/wait.go
@@ -88,5 +88,3 @@ func init() {
waitCmd.PersistentFlags().IntVar(&periodMillis, "periodMillis", 500,
"number of milliseconds to wait between attempts")
waitCmd.PersistentFlags().StringVar(&url, "url",
"http://localhost:15020/healthz/ready";, "URL to use in requests")
}
-
-
diff --git a/sail/pkg/bootstrap/certcontroller.go
b/sail/pkg/bootstrap/certcontroller.go
index 0e61cf31..b6805a3c 100644
--- a/sail/pkg/bootstrap/certcontroller.go
+++ b/sail/pkg/bootstrap/certcontroller.go
@@ -132,9 +132,9 @@ func (s *Server) RotateDNSCertForK8sCA(stop <-chan struct{},
func (s *Server) initDNSCertsK8SRA() error {
var certChain, keyPEM, caBundle []byte
var err error
- pilotCertProviderName := features.SailCertProvider
+ sailCertProviderName := features.SailCertProvider
- signerName := strings.TrimPrefix(pilotCertProviderName,
constants.CertProviderKubernetesSignerPrefix)
+ signerName := strings.TrimPrefix(sailCertProviderName,
constants.CertProviderKubernetesSignerPrefix)
klog.Infof("Generating K8S-signed cert for %v using signer %v",
s.dnsNames, signerName)
certChain, keyPEM, _, err = chiron.GenKeyCertK8sCA(s.kubeClient.Kube(),
strings.Join(s.dnsNames, ","), "", signerName, true,
SelfSignedCACertTTL.Get())
diff --git a/sail/pkg/bootstrap/servicecontroller.go
b/sail/pkg/bootstrap/servicecontroller.go
index 075e2920..b4963153 100644
--- a/sail/pkg/bootstrap/servicecontroller.go
+++ b/sail/pkg/bootstrap/servicecontroller.go
@@ -63,7 +63,6 @@ func (s *Server) initServiceControllers(args *SailArgs) error
{
return nil
}
-// initKubeRegistry creates all the k8s service controllers under this pilot
func (s *Server) initKubeRegistry(args *SailArgs) (err error) {
args.RegistryOptions.KubeOptions.ClusterID = s.clusterID
args.RegistryOptions.KubeOptions.Revision = args.Revision
diff --git a/sail/pkg/features/sail.go b/sail/pkg/features/sail.go
index e4e684d8..0dfa4d44 100644
--- a/sail/pkg/features/sail.go
+++ b/sail/pkg/features/sail.go
@@ -49,7 +49,7 @@ var (
"and will not distribute CRL data to namespaces for
proxies to consume.",
).Get()
SailCertProvider = env.Register("SAIL_CERT_PROVIDER",
constants.CertProviderDubbod,
- "The provider of Pilot DNS certificate. K8S RA will be used for
k8s.io/NAME. 'dubbod' value will sign"+
+ "The provider of Sail DNS certificate. K8S RA will be used for
k8s.io/NAME. 'dubbod' value will sign"+
" using Dubbo build in CA. Other values will not not
generate TLS certs, but still "+
" distribute ./etc/certs/root-cert.pem. Only used if
custom certificates are not mounted.").Get()
DubbodServiceCustomHost = env.Register("DUBBOD_CUSTOM_HOST", "",
diff --git a/sail/pkg/features/tuning.go b/sail/pkg/features/tuning.go
index 6d9198f5..a08b9b55 100644
--- a/sail/pkg/features/tuning.go
+++ b/sail/pkg/features/tuning.go
@@ -30,7 +30,7 @@ var (
"Sets the maximum number of concurrent grpc streams.",
).Get()
- // MaxRecvMsgSize The max receive buffer size of gRPC received channel
of Pilot in bytes.
+ // MaxRecvMsgSize The max receive buffer size of gRPC received channel
of Sail in bytes.
MaxRecvMsgSize = env.Register(
"DUBBO_GPRC_MAXRECVMSGSIZE",
4*1024*1024,
@@ -61,7 +61,7 @@ var (
100*time.Millisecond,
"The delay added to config/registry events for debouncing. This
will delay the push by "+
"at least this interval. If no change is detected
within this period, the push will happen, "+
- " otherwise we'll keep delaying until things settle, up
to a max of PILOT_DEBOUNCE_MAX.",
+ " otherwise we'll keep delaying until things settle, up
to a max of SAIL_DEBOUNCE_MAX.",
).Get()
DebounceMax = env.Register(
@@ -74,7 +74,7 @@ var (
EnableEDSDebounce = env.Register(
"SAIL_ENABLE_EDS_DEBOUNCE",
true,
- "If enabled, Sail will include EDS pushes in the push
debouncing, configured by PILOT_DEBOUNCE_AFTER and PILOT_DEBOUNCE_MAX."+
+ "If enabled, Sail will include EDS pushes in the push
debouncing, configured by SAIL_DEBOUNCE_AFTER and SAIL_DEBOUNCE_MAX."+
" EDS pushes may be delayed, but there will be fewer
pushes. By default this is enabled",
).Get()
diff --git a/sail/pkg/serviceregistry/kube/controller/multicluster.go
b/sail/pkg/serviceregistry/kube/controller/multicluster.go
index 8027c4d5..5bbf3b61 100644
--- a/sail/pkg/serviceregistry/kube/controller/multicluster.go
+++ b/sail/pkg/serviceregistry/kube/controller/multicluster.go
@@ -40,7 +40,7 @@ func (k *kubeController) Close() {
}
type Multicluster struct {
- // serverID of this pilot instance used for leader election
+ // serverID of this sail instance used for leader election
serverID string
// options to use when creating kube controllers
@@ -148,7 +148,7 @@ func (m *Multicluster) initializeCluster(cluster
*multicluster.Cluster, kubeCont
nc :=
NewNamespaceController(client, m.caBundleWatcher)
// Start informers again. This
fixes the case where informers for namespace do not start,
// as we create them only after
acquiring the leader lock
- // Note: stop here should be
the overall pilot stop, NOT the leader election stop. We are
+ // Note: stop here should be
the overall sail stop, NOT the leader election stop. We are
// basically lazy loading the
informer, if we stop it when we lose the lock we will never
// recreate it again.
client.RunAndWait(clusterStopCh)
diff --git a/sail/pkg/xds/discovery.go b/sail/pkg/xds/discovery.go
index a77cf866..f2048ab9 100644
--- a/sail/pkg/xds/discovery.go
+++ b/sail/pkg/xds/discovery.go
@@ -206,7 +206,7 @@ func (s *DiscoveryServer) ProxyUpdate(clusterID cluster.ID,
ip string) {
}
}
- // It is possible that the envoy has not connected to this pilot, maybe
connected to another pilot
+ // It is possible that the envoy has not connected to this sail, maybe
connected to another sail
if connection == nil {
return
}
diff --git a/test/grpc-proxyless/go.mod b/test/grpc-proxyless/go.mod
index bef17d48..c1b91d8f 100644
--- a/test/grpc-proxyless/go.mod
+++ b/test/grpc-proxyless/go.mod
@@ -1,3 +1,18 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
module github.com/apache/dubbo-kubernetes/test/grpc-proxyless
go 1.24.0
