add app mode testing server #22

ii2day · 2023-06-14T10:49:36Z

No description provided.

codecov · 2023-06-14T10:54:22Z

Codecov Report

Merging #22 (910c07f) into main (d606747) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main      #22   +/-   ##
=======================================
  Coverage   40.77%   40.77%           
=======================================
  Files           8        8           
  Lines         488      488           
=======================================
  Hits          199      199           
  Misses        285      285           
  Partials        4        4

Flag	Coverage Δ
unittests	`40.77% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

panpan0000 · 2023-06-15T02:04:56Z

can you elaborate the difference between this and k8s readinessProbe in the README.
also doc the test summary of the distributed stress client.

ii2day · 2023-06-15T02:21:32Z

can you elaborate the difference between this and k8s readinessProbe in the README.

also doc the test summary of the distributed stress client.

1.This mode is used for kdoctor e2e testing, and readinessProbe still uses http
2.The report shows the request status of each client

weizhoublue · 2023-06-16T11:10:33Z

conflict

ii2day · 2023-06-19T02:24:37Z

conflict

done

weizhoublue · 2023-06-19T09:32:41Z

charts/templates/service.yaml

@@ -29,7 +29,11 @@ spec:
    {{- end }}
    {{- if .Values.feature.enableIPv4 }}
    - name: http
-      port: {{ .Values.kdoctorAgent.httpServer.port }}
+      port: {{ .Values.kdoctorAgent.httpServer.healthPort }}


health 不需要用 service 暴露出来

weizhoublue · 2023-06-19T09:34:49Z

cmd/agent/cmd/appHttpServer.go

+		RequestMethod: r.HTTPRequest.Method,
+		ServerName:    hostname,
+		RequestCount:  atomic.LoadInt64(&requestCounts),
+		ParamDetail:   ParamInformation,


supported all method ？

CONNECT 这个方法不支持剩下的都支持

我说在响应中 list 所有支持的 method

weizhoublue · 2023-06-19T09:37:18Z

cmd/agent/cmd/appHttpServer.go

+}
+
+func (s *echoGetHandler) Handle(r echo.GetParams) middleware.Responder {
+	s.logger.Sugar().Debugf("%s method  %s request from %s", r.HTTPRequest.Proto, r.HTTPRequest.Method, r.HTTPRequest.RemoteAddr)


also print r.Delay

weizhoublue · 2023-06-19T09:38:26Z

cmd/agent/cmd/appHttpServer.go

+			srvApp.TLSCertificateKey = flags.Filename(types.AgentConfig.TlsServerKeyPath)
+		}
+	} else {
+		srvApp.Port = int(types.AgentConfig.AgentAppPort)


if http {
logger.Sugar().Infof("setup agent app http server at port %v", types.AgentConfig.AgentAppPort)
}

weizhoublue · 2023-06-19T09:38:32Z

cmd/agent/cmd/appHttpServer.go

+	srvApp := server.NewServer(api)
+	srvApp.EnabledListeners = []string{types.AgentConfig.AgentAppProtocol}
+	if types.AgentConfig.AgentAppProtocol == "https" {
+		srvApp.TLSPort = int(types.AgentConfig.AgentAppPort)


logger.Sugar().Infof("setup agent app https server at port %v", types.AgentConfig.AgentAppPort)

weizhoublue · 2023-06-19T09:41:04Z

cmd/agent/cmd/config.go

@@ -71,6 +71,10 @@ func init() {
 	globalFlag := rootCmd.PersistentFlags()
 	globalFlag.StringVarP(&types.AgentConfig.ConfigMapPath, "config-path", "C", "", "configmap file path")
 	globalFlag.BoolVarP(&types.AgentConfig.AppMode, "app-mode", "A", false, "app mode")
+	globalFlag.StringVarP(&types.AgentConfig.AgentAppProtocol, "app-protocol", "P", "http", "app mode protocol")


AgentAppProtocol -> enableHttpTls : true / false

weizhoublue · 2023-06-19T09:41:44Z

cmd/agent/cmd/daemon.go

 	if types.AgentConfig.AppMode {
 		// app mode, just used to debug
 		rootLogger.Info("run in app mode")
 		// sleep forever
 		select {}
 	} else {
 		rootLogger.Info("run in agent mode")
-
+		initGrpcServer()


initGrpcServer also could be test in app mode

weizhoublue · 2023-06-19T09:43:23Z

cmd/agent/cmd/appHttpServer.go

+func SetupAppHttpServer() {
+	logger := rootLogger.Named("app http")
+
+	if types.AgentConfig.AgentAppPort == 0 {


AgentAppPort -> AppHttpPort

weizhoublue · 2023-06-19T09:45:05Z

cmd/agent/cmd/appHttpServer.go

+
+	srvApp := server.NewServer(api)
+	srvApp.EnabledListeners = []string{types.AgentConfig.AgentAppProtocol}
+	if types.AgentConfig.AgentAppProtocol == "https" {


when tls is enabled, http 1.1 and http2.0 is supported at the same time ?

同时支持

ii2day · 2023-06-25T10:22:14Z

#32

weizhoublue · 2023-06-27T06:11:37Z

charts/values.yaml

@@ -167,7 +167,7 @@ kdoctorAgent:
    ingressClass: ""

    ## @param kdoctorAgent.ingress.route the route of agent ingress. Default to "/kdoctoragent", if it changes, ingress please re-write url forwarded to "/kdoctoragent"
-    route: "/kdoctoragent"


weizhoublue · 2023-06-27T06:12:35Z

charts/values.yaml

@@ -323,8 +327,31 @@ kdoctorAgent:
    ## @param kdoctorAgent.debug.gopsPort the gops port of template agent
    gopsPort: 5712

-## @section kdoctorController parameters
-##


weizhoublue · 2023-06-27T06:13:39Z

test/yaml/testbody.yaml

+  test2: test2
+kind: ConfigMap
+metadata:
+  name: kdoctor-test-body


weizhoublue · 2023-06-27T06:14:51Z

test/Makefile

-	sed 's?<<EXAMPLE_APP_IMAGE>>?ghcr.io/kdoctor-io/kdoctor-agent:'$(PROJECT_IMAGE_VERSION)'?' yaml/testpod.yaml | kubectl --kubeconfig=$(KIND_KUBECONFIG) apply -f -
-	@ if ! kubectl rollout status  daemonset/test --kubeconfig $(KIND_KUBECONFIG) -w --timeout=120s ; then \
+	sed 's?<<EXAMPLE_APP_IMAGE>>?ghcr.io/kdoctor-io/kdoctor-agent:'$(IMAGE_TAG)'?' yaml/testpod.yaml | kubectl --kubeconfig=$(KIND_KUBECONFIG) apply -f -
+	@ if ! kubectl rollout status  daemonset/kdoctor-test -n kube-system --kubeconfig $(KIND_KUBECONFIG) -w --timeout=120s ; then \


就一个 app，导致 CI 不能串行，否则所有的压测数据都不准了

weizhoublue · 2023-06-27T06:16:12Z

cmd/agent/cmd/appHttpServer.go

+// Copyright 2023 Authors of kdoctor-io
+// SPDX-License-Identifier: Apache-2.0
+
+package cmd


这个实现越来越大了，可放到 pkg 中？

weizhoublue · 2023-06-27T11:12:39Z

charts/values.yaml

@@ -26,6 +26,21 @@ global:
  ## @param global.configName the configmap name
  configName: "kdoctor"

+  ## TLS configuration for kdoctor
+  tls:


tls 不是一个子层级，是一个顶级的层级

weizhoublue · 2023-06-27T11:13:13Z

charts/values.yaml

+
+      ## @param kdoctorAgent.tls.client.certExpiration server cert expiration
+      # in day, default 200 years
+      certExpiration: '73000'


不需要了，我们没有刷新的机制，暴露给用户是累赘

weizhoublue · 2023-06-27T11:15:00Z

pkg/utils/cert.go

+	var caKey *rsa.PrivateKey
+	var caDERBytes []byte
+	// ----------- generate self-signed ca
+	if caCertPath == "" && caKeyPath == "" {


weizhoublue · 2023-06-27T11:20:30Z

cmd/agent/cmd/cert.go

+	}
+
+	alternateDNS = append(alternateDNS, types.AgentConfig.PodName)
+	logger.Sugar().Debugf("alternate ip  %v", alternateIP)


alternate ip for tls cert:
alternate dns for tls cert

weizhoublue · 2023-06-28T04:51:02Z

cmd/agent/cmd/config.go

@@ -71,6 +71,9 @@ func init() {
 	globalFlag := rootCmd.PersistentFlags()
 	globalFlag.StringVarP(&types.AgentConfig.ConfigMapPath, "config-path", "C", "", "configmap file path")
 	globalFlag.BoolVarP(&types.AgentConfig.AppMode, "app-mode", "A", false, "app mode")
+	globalFlag.BoolVarP(&types.AgentConfig.Insecure, "insecure", "K", true, "skip verify tls")


tls-insecure

Signed-off-by: ii2day <ji.li@daocloud.io>

ii2day requested a review from weizhoublue as a code owner June 14, 2023 10:49

ii2day added the pr/not-ready not ready for merging label Jun 14, 2023

ii2day force-pushed the agent-api branch 3 times, most recently from 0cb2591 to 78cc141 Compare June 16, 2023 04:19

ii2day changed the title ~~add app mode https~~ add app mode testing server Jun 16, 2023

ii2day force-pushed the agent-api branch 2 times, most recently from cf17f54 to 002725e Compare June 16, 2023 06:07

ii2day added release/feature-new and removed pr/not-ready not ready for merging labels Jun 16, 2023

ii2day force-pushed the agent-api branch from 002725e to 7ddfc16 Compare June 19, 2023 02:21

ii2day force-pushed the agent-api branch 5 times, most recently from d5710ff to 9bf3a72 Compare June 19, 2023 08:28

weizhoublue reviewed Jun 19, 2023

View reviewed changes

ii2day force-pushed the agent-api branch 8 times, most recently from 1df2ff0 to dbee155 Compare June 25, 2023 08:54

ii2day force-pushed the agent-api branch from dbee155 to 5a748e1 Compare June 26, 2023 07:43

weizhoublue reviewed Jun 27, 2023

View reviewed changes

ii2day force-pushed the agent-api branch 4 times, most recently from f0ee404 to cf5f327 Compare June 27, 2023 09:48

weizhoublue reviewed Jun 27, 2023

View reviewed changes

ii2day force-pushed the agent-api branch from cf5f327 to 1dfb122 Compare June 27, 2023 11:31

weizhoublue reviewed Jun 28, 2023

View reviewed changes

add app mode testing server

910c07f

Signed-off-by: ii2day <ji.li@daocloud.io>

ii2day force-pushed the agent-api branch from 1dfb122 to 910c07f Compare June 28, 2023 04:54

weizhoublue merged commit 87f4ede into main Jun 28, 2023

ii2day mentioned this pull request Jun 28, 2023

data race in nethttp operation #32

Closed

ii2day deleted the agent-api branch July 5, 2023 02:29

add app mode testing server #22

add app mode testing server #22

Conversation

ii2day commented Jun 14, 2023

codecov bot commented Jun 14, 2023 • edited Loading

Codecov Report

panpan0000 commented Jun 15, 2023

ii2day commented Jun 15, 2023

weizhoublue commented Jun 16, 2023

ii2day commented Jun 19, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

weizhoublue Jun 19, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

weizhoublue Jun 19, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ii2day commented Jun 25, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Jun 14, 2023 •

edited

Loading

weizhoublue Jun 19, 2023 •

edited

Loading

weizhoublue Jun 19, 2023 •

edited

Loading