When within-k8s=false report to skylb.

binchencoder · binchencoder · commit 9510521af511 · 2022-03-27T15:50:41.000+08:00
diff --git a/cmd/skytest/README.md b/cmd/skytest/README.md
@@ -29,7 +29,7 @@ skylb/bazel-bin/cmd/skylb/linux_amd64_stripped/skylb --etcd-endpoints="http://lo
 1. 注册到skylbserver
 
 ```
-skylb-apiv2/bazel-bin/cmd/skytest/skytest-server_/skytest-server -within-k8s=true -port=18000 -skylb-endpoints="127.0.0.1:1900" -alsologtostderr -v=2 -log_dir=.
+skylb-apiv2/bazel-bin/cmd/skytest/skytest-server_/skytest-server -port=18000 -skylb-endpoints="127.0.0.1:1900" -alsologtostderr -v=2 -log_dir=.
 ```
 
 2. 不注册到skylbserver
diff --git a/server/server.go b/server/server.go
@@ -213,11 +213,11 @@ func startHTTPServer(lis net.Listener, mux *http.ServeMux) {
 }
 
 func start0(hostAddr string, servicePort int, spec *pb.ServiceSpec, interceptors ...grpc.UnaryServerInterceptor) (net.Listener, *grpc.Server) {
-	if *withinK8s {
-		glog.Infoln("Inside k8s, starting load reporter.")
+	if !*withinK8s {
+		glog.Infoln("Outside k8s, starting load reporter.")
 		go StartSkylbReportLoad(spec, servicePort)
 	} else {
-		glog.Warningln("WARNING: Outside k8s, load-reporting disabled.")
+		glog.Warningln("WARNING: Inside k8s, load-reporting disabled.")
 	}
 
 	lis, err := net.Listen("tcp", hostAddr)

Original file line number	Diff line number	Diff line change
`@@ -213,11 +213,11 @@ func startHTTPServer(lis net.Listener, mux *http.ServeMux) {`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`func start0(hostAddr string, servicePort int, spec pb.ServiceSpec, interceptors ...grpc.UnaryServerInterceptor) (net.Listener, grpc.Server) {`
`216`		`- if *withinK8s {`
`217`		`- glog.Infoln("Inside k8s, starting load reporter.")`
	`216`	`+ if !*withinK8s {`
	`217`	`+ glog.Infoln("Outside k8s, starting load reporter.")`
`218`	`218`	`go StartSkylbReportLoad(spec, servicePort)`
`219`	`219`	`} else {`
`220`		`- glog.Warningln("WARNING: Outside k8s, load-reporting disabled.")`
	`220`	`+ glog.Warningln("WARNING: Inside k8s, load-reporting disabled.")`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`lis, err := net.Listen("tcp", hostAddr)`