Add a better check for ztunnel pod guess (istio#44292)

* add a better check for ztunnel guess * rebise based on comments
WillardHu · Apr 14, 2023 · 4721395 · 4721395
1 parent bc2ce84
commit 4721395
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 19 deletions.
diff --git a/istioctl/cmd/proxyconfig.go b/istioctl/cmd/proxyconfig.go
@@ -164,6 +164,11 @@ var (
 	reset             = false
 )
 
+var isZtunnelPod = func(podName, podNamespace string) bool {
+	client, _ := kubeClient(kubeconfig, configContext)
+	return ambientutil.IsZtunnelPod(client, podName, podNamespace)
+}
+
 func ztunnelLogLevel(level string) string {
 	switch level {
 	case "warning":
@@ -497,7 +502,7 @@ func allConfigCmd() *cobra.Command {
 						return err
 					}
 
-					if ambientutil.IsZtunnelPod(podName) {
+					if isZtunnelPod(podName, podNamespace) {
 						dump, err = extractZtunnelConfigDump(podName, podNamespace)
 					} else {
 						dump, err = extractConfigDump(podName, podNamespace, false)
@@ -526,7 +531,7 @@ func allConfigCmd() *cobra.Command {
 						return err
 					}
 
-					if ambientutil.IsZtunnelPod(podName) {
+					if isZtunnelPod(podName, podNamespace) {
 						w, err := setupZtunnelConfigDumpWriter(podName, podNamespace, c.OutOrStdout())
 						if err != nil {
 							return err
@@ -636,7 +641,7 @@ func workloadConfigCmd() *cobra.Command {
 				if podName, podNamespace, err = getComponentPodName(args[0]); err != nil {
 					return err
 				}
-				if !ambientutil.IsZtunnelPod(podName) {
+				if !isZtunnelPod(podName, podNamespace) {
 					return fmt.Errorf("workloads command is only supported by ztunnel proxies: %v", podName)
 				}
 				configWriter, err = setupZtunnelConfigDumpWriter(podName, podNamespace, c.OutOrStdout())
@@ -878,7 +883,7 @@ func logCmd() *cobra.Command {
 				if err != nil {
 					return err
 				}
-				if ambientutil.IsZtunnelPod(pod) {
+				if isZtunnelPod(pod, podNamespace) {
 					loggerNames[name] = Ztunnel
 				} else {
 					loggerNames[name] = Envoy
@@ -932,7 +937,7 @@ func logCmd() *cobra.Command {
 			var resp string
 			var errs *multierror.Error
 			for _, podName := range podNames {
-				if ambientutil.IsZtunnelPod(podName) {
+				if isZtunnelPod(podName, podNamespace) {
 					q := "level=" + ztunnelLogLevel(loggerLevelString)
 					if reset {
 						q += "&reset"
@@ -1311,7 +1316,7 @@ func secretConfigCmd() *cobra.Command {
 				if podName, podNamespace, err = getPodName(args[0]); err != nil {
 					return err
 				}
-				if ambientutil.IsZtunnelPod(podName) {
+				if isZtunnelPod(podName, podNamespace) {
 					newWriter, err = setupZtunnelConfigDumpWriter(podName, podNamespace, c.OutOrStdout())
 				} else {
 					newWriter, err = setupPodConfigdumpWriter(podName, podNamespace, false, c.OutOrStdout())

diff --git a/istioctl/cmd/proxyconfig_test.go b/istioctl/cmd/proxyconfig_test.go
@@ -42,6 +42,9 @@ func TestProxyConfig(t *testing.T) {
 		"httpbin-794b576b6c-qx6pf":    []byte("{}"),
 		"ztunnel-9v7nw":               []byte("current log level is debug"),
 	}
+	isZtunnelPod = func(podName, _ string) bool {
+		return strings.HasPrefix(podName, "ztunnel")
+	}
 	cases := []execTestCase{
 		{
 			args:           strings.Split("proxy-config", " "),

diff --git a/istioctl/pkg/util/ambient/util.go b/istioctl/pkg/util/ambient/util.go
@@ -14,8 +14,26 @@
 
 package ambient
 
-import "strings"
+import (
+	"context"
+	"strings"
 
-func IsZtunnelPod(podName string) bool {
-	return strings.HasPrefix(podName, "ztunnel")
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"istio.io/istio/pkg/kube"
+)
+
+func IsZtunnelPod(client kube.Client, podName, podNamespace string) bool {
+	isZtunnel := strings.HasPrefix(podName, "ztunnel")
+	if client == nil {
+		return isZtunnel
+	}
+	pod, err := client.Kube().CoreV1().Pods(podNamespace).Get(context.Background(), podName, metav1.GetOptions{})
+	if err != nil {
+		return isZtunnel
+	}
+	if v, ok := pod.Labels["app"]; ok {
+		return v == "ztunnel"
+	}
+	return isZtunnel
 }
diff --git a/tools/bug-report/pkg/bugreport/bugreport.go b/tools/bug-report/pkg/bugreport/bugreport.go
@@ -277,6 +277,11 @@ func gatherInfo(runner *kubectlcmd.Runner, config *config.BugReportConfig, resou
 	cmdTimer := time.NewTimer(time.Duration(config.CommandTimeout))
 	beginTime := time.Now()
 
+	client, err := kube.NewCLIClient(kube.BuildClientCmd(config.KubeConfigPath, config.Context), "")
+	if err != nil {
+		appendGlobalErr(err)
+	}
+
 	clusterDir := archive.ClusterInfoPath(tempDir)
 
 	params := &content.Params{
@@ -306,16 +311,17 @@ func gatherInfo(runner *kubectlcmd.Runner, config *config.BugReportConfig, resou
 		cp := params.SetNamespace(namespace).SetPod(pod).SetContainer(container)
 		proxyDir := archive.ProxyOutputPath(tempDir, namespace, pod)
 		switch {
-		case common.IsProxyContainer(params.ClusterVersion, container) && !ambient.IsZtunnelPod(pod):
-			getFromCluster(content.GetCoredumps, cp, filepath.Join(proxyDir, "cores"), &mandatoryWg)
-			getFromCluster(content.GetNetstat, cp, proxyDir, &mandatoryWg)
-			getFromCluster(content.GetProxyInfo, cp, archive.ProxyOutputPath(tempDir, namespace, pod), &optionalWg)
-			getProxyLogs(runner, config, resources, p, namespace, pod, container, &optionalWg)
-
-		case ambient.IsZtunnelPod(pod):
-			getFromCluster(content.GetNetstat, cp, proxyDir, &mandatoryWg)
-			getFromCluster(content.GetZtunnelInfo, cp, archive.ProxyOutputPath(tempDir, namespace, pod), &optionalWg)
-			getProxyLogs(runner, config, resources, p, namespace, pod, container, &optionalWg)
+		case common.IsProxyContainer(params.ClusterVersion, container):
+			if !ambient.IsZtunnelPod(client, pod, namespace) {
+				getFromCluster(content.GetCoredumps, cp, filepath.Join(proxyDir, "cores"), &mandatoryWg)
+				getFromCluster(content.GetNetstat, cp, proxyDir, &mandatoryWg)
+				getFromCluster(content.GetProxyInfo, cp, archive.ProxyOutputPath(tempDir, namespace, pod), &optionalWg)
+				getProxyLogs(runner, config, resources, p, namespace, pod, container, &optionalWg)
+			} else {
+				getFromCluster(content.GetNetstat, cp, proxyDir, &mandatoryWg)
+				getFromCluster(content.GetZtunnelInfo, cp, archive.ProxyOutputPath(tempDir, namespace, pod), &optionalWg)
+				getProxyLogs(runner, config, resources, p, namespace, pod, container, &optionalWg)
+			}
 		case resources.IsDiscoveryContainer(params.ClusterVersion, namespace, pod, container):
 			getFromCluster(content.GetIstiodInfo, cp, archive.IstiodPath(tempDir, namespace, pod), &mandatoryWg)
 			getIstiodLogs(runner, config, resources, namespace, pod, &mandatoryWg)