review

Author: ldez

pkg/config/dynamic/http_config.go

@@ -230,6 +230,7 @@ type ServerHealthCheck struct {
 func (h *ServerHealthCheck) SetDefaults() {
 	fr := true
 	h.FollowRedirects = &fr
+	h.Mode = "http"
 }
 
 // +k8s:deepcopy-gen=true

pkg/healthcheck/healthcheck.go

@@ -302,27 +302,28 @@ func checkHealthHTTP(serverURL *url.URL, backend *BackendConfig) error {
 func checkHealthGRPC(serverURL *url.URL, backend *BackendConfig) error {
 	u, err := serverURL.Parse(backend.Path)
 	if err != nil {
-		return fmt.Errorf("failed to parse serverURL: %w", err)
+		return fmt.Errorf("failed to parse server URL: %w", err)
 	}
 
-	grpcSrvAddr := u.Hostname() + ":" + u.Port()
+	serverAddr := u.Hostname() + ":" + u.Port()
 
 	var opts []grpc.DialOption
 	for _, insecureScheme := range []string{"http", "h2c", ""} {
 		if backend.Options.Scheme == insecureScheme {
 			opts = append(opts, grpc.WithInsecure())
+			break
 		}
 	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), backend.Options.Timeout)
 	defer cancel()
 
-	conn, err := grpc.DialContext(ctx, grpcSrvAddr, opts...)
+	conn, err := grpc.DialContext(ctx, serverAddr, opts...)
 	if err != nil {
 		if errors.Is(err, context.DeadlineExceeded) {
-			return fmt.Errorf("fail to connect to %s within %s: %w", grpcSrvAddr, backend.Options.Timeout, err)
+			return fmt.Errorf("fail to connect to %s within %s: %w", serverAddr, backend.Options.Timeout, err)
 		}
-		return fmt.Errorf("fail to connect to %s: %w", grpcSrvAddr, err)
+		return fmt.Errorf("fail to connect to %s: %w", serverAddr, err)
 	}
 	defer func() { _ = conn.Close() }()
 

pkg/server/service/service.go

@@ -361,12 +361,10 @@ func buildHealthCheckOptions(ctx context.Context, lb healthcheck.Balancer, backe
 	}
 
 	mode := "http"
-	if hc.Mode != "" {
-		if hc.Mode != "grpc" && hc.Mode != "http" {
-			logger.Errorf("Illegal health check mode for backend '%s'", backend)
-		} else {
-			mode = hc.Mode
-		}
+	if hc.Mode != "" && hc.Mode != "grpc" && hc.Mode != "http" {
+		logger.Errorf("Illegal health check mode for backend '%s'", backend)
+	} else {
+		mode = hc.Mode
 	}
 
 	return &healthcheck.Options{