Elgato_dark/Olares
1
0
Fork 0
mirror of https://github.com/beclab/Olares synced 2026-04-21 13:37:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(cli): skip collecting envoy config if not ready (#2869)

Browse source
This commit is contained in:
dkeven 2026-04-13 22:54:41 +08:00 committed by GitHub
parent ac2e460774
commit 0b9da26dc8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
cli/cmd/ctl/os/logs.go
View file

@ -3,6 +3,7 @@ package os
import (
"archive/tar"
"compress/gzip"
"context"
"fmt"
"io"
"log"
@ -14,9 +15,12 @@ import (
"strings"
"time"
appsv1 "k8s.io/api/apps/v1"
kruntime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
ctrl "sigs.k8s.io/controller-runtime"
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
"github.com/beclab/Olares/cli/pkg/common"
"github.com/beclab/Olares/cli/pkg/core/util"
@ -348,11 +352,6 @@ func collectKubernetesLogs(tw *tar.Writer, options *LogCollectOptions) error {
return nil
}
fmt.Println("collecting envoy config...")
if err := collectEnvoyConfig(tw); err != nil && !options.IgnoreKubeErrors {
return fmt.Errorf("failed to collect envoy config: %v", err)
}
if _, err := util.GetCommand("kubectl"); err != nil {
fmt.Printf("warning: kubectl not found, skipping collecting cluster info from kube-apiserver\n")
return nil
@ -406,6 +405,11 @@ func collectKubernetesLogs(tw *tar.Writer, options *LogCollectOptions) error {
}
}
fmt.Println("collecting envoy config...")
if err := collectEnvoyConfig(tw); err != nil && !options.IgnoreKubeErrors {
return fmt.Errorf("failed to collect envoy config: %v", err)
}
return nil
}
@ -491,6 +495,34 @@ func collectNetworkConfigs(tw *tar.Writer, options *LogCollectOptions) error {
return nil
}
func collectEnvoyConfig(tw *tar.Writer) error {
config, err := ctrl.GetConfig()
if err != nil {
fmt.Printf(" skipping envoy config: failed to get kubeconfig: %v\n", err)
return nil
}
scheme := kruntime.NewScheme()
if err := appsv1.AddToScheme(scheme); err != nil {
return fmt.Errorf("failed to add apps/v1 scheme: %v", err)
}
c, err := ctrlclient.New(config, ctrlclient.Options{Scheme: scheme})
if err != nil {
return fmt.Errorf("failed to create kubernetes client: %v", err)
}
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
var deploy appsv1.Deployment
key := ctrlclient.ObjectKey{Namespace: "os-network", Name: "l4-bfl-proxy"}
if err := c.Get(ctx, key, &deploy); err != nil {
fmt.Printf(" skipping envoy config: l4-bfl-proxy deployment not found: %v\n", err)
return nil
}
if deploy.Status.AvailableReplicas == 0 {
fmt.Println(" skipping envoy config: l4-bfl-proxy deployment is not ready (no available replicas)")
return nil
}
url := "http://127.0.0.1:19000/config_dump"
client := &http.Client{
Timeout: 5 * time.Second,