[release-1.22] clarify zc output by adding type info to headers (#50656)

* clarify zc output by adding type info to headers Signed-off-by: Ian Rudie <ian.rudie@solo.io> * update testdata Signed-off-by: Ian Rudie <ian.rudie@solo.io> --------- Signed-off-by: Ian Rudie <ian.rudie@solo.io> Co-authored-by: Ian Rudie <ian.rudie@solo.io>
istio · Apr 23, 2024 · 4e759b6 · 4e759b6
1 parent 416adb3
commit 4e759b6
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/istioctl/pkg/writer/ztunnel/configdump/certificates.go b/istioctl/pkg/writer/ztunnel/configdump/certificates.go
@@ -53,7 +53,7 @@ func (c *ConfigWriter) PrintSecretSummary() error {
 	}
 	secretDump := c.ztunnelDump.Certificates
 	w := new(tabwriter.Writer).Init(c.Stdout, 0, 8, 5, ' ', 0)
-	fmt.Fprintln(w, "NAME\tTYPE\tSTATUS\tVALID CERT\tSERIAL NUMBER\tNOT AFTER\tNOT BEFORE")
+	fmt.Fprintln(w, "CERTIFICATE NAME\tTYPE\tSTATUS\tVALID CERT\tSERIAL NUMBER\tNOT AFTER\tNOT BEFORE")
 
 	for _, secret := range secretDump {
 		if strings.Contains(secret.State, "Unavailable") {

diff --git a/istioctl/pkg/writer/ztunnel/configdump/configdump.go b/istioctl/pkg/writer/ztunnel/configdump/configdump.go
@@ -51,7 +51,7 @@ func (c *ConfigWriter) PrintBootstrapDump(outputFormat string) error {
 
 func (c *ConfigWriter) PrintFullSummary() error {
 	_, _ = c.Stdout.Write([]byte("\n"))
-	if err := c.PrintWorkloadSummary(WorkloadFilter{}); err != nil {
+	if err := c.PrintWorkloadSummary(WorkloadFilter{Verbose: true}); err != nil {
 		return err
 	}
 	_, _ = c.Stdout.Write([]byte("\n"))

diff --git a/istioctl/pkg/writer/ztunnel/configdump/policies.go b/istioctl/pkg/writer/ztunnel/configdump/policies.go
@@ -54,7 +54,7 @@ func (c *ConfigWriter) PrintPolicySummary(filter PolicyFilter) error {
 		}
 		return cmp.Compare(a.Name, b.Name)
 	})
-	fmt.Fprintln(w, "NAMESPACE\tNAME\tACTION\tSCOPE")
+	fmt.Fprintln(w, "NAMESPACE\tPOLICY NAME\tACTION\tSCOPE")
 
 	for _, pol := range pols {
 		fmt.Fprintf(w, "%v\t%v\t%v\t%v\n",

diff --git a/istioctl/pkg/writer/ztunnel/configdump/services.go b/istioctl/pkg/writer/ztunnel/configdump/services.go
@@ -57,7 +57,7 @@ func (c *ConfigWriter) PrintServiceSummary(filter ServiceFilter) error {
 		}
 		return cmp.Compare(a.Hostname, b.Hostname)
 	})
-	fmt.Fprintln(w, "NAMESPACE\tNAME\tIP\tWAYPOINT")
+	fmt.Fprintln(w, "NAMESPACE\tSERVICE NAME\tSERVICE VIP\tWAYPOINT")
 
 	for _, svc := range svcs {
 		var ip string

diff --git a/istioctl/pkg/writer/ztunnel/configdump/testdata/secretsummary.txt b/istioctl/pkg/writer/ztunnel/configdump/testdata/secretsummary.txt
@@ -1,4 +1,4 @@
-NAME                                                     TYPE           STATUS           VALID CERT     SERIAL NUMBER                        NOT AFTER                NOT BEFORE
+CERTIFICATE NAME                                         TYPE           STATUS           VALID CERT     SERIAL NUMBER                        NOT AFTER                NOT BEFORE
 spiffe://cluster.local/ns/istio-system/sa/istiod         CA             Available        true           e5dfb59150b2ba7f108d93dcec5aa613     2033-03-22T13:04:57Z     2023-03-21T13:02:57Z
 spiffe://cluster.local/ns/istio-system/sa/istiod         Cert Chain     Available        false          8a516645c40ce76c2c0d27ab4e2461c1     2022-03-18T13:04:49Z     2022-03-21T13:04:49Z
 spiffe://cluster.local/ns/istio-system/sa/ztunnel        NA             Initializing     false          NA                                   NA                       NA

diff --git a/istioctl/pkg/writer/ztunnel/configdump/testdata/workloadsummary.txt b/istioctl/pkg/writer/ztunnel/configdump/testdata/workloadsummary.txt
@@ -1,4 +1,4 @@
-NAMESPACE          NAME                                                 IP          NODE                  WAYPOINT                            PROTOCOL
+NAMESPACE          POD NAME                                             IP          NODE                  WAYPOINT                            PROTOCOL
 bookinfo           bookinfo-productpage-istio-waypoint-5cdd6745d5-rc2gg 10.244.2.59 ambient-worker2       None                                TCP
 bookinfo           details-v1-698d88b-dqrbr                             10.244.2.51 ambient-worker2       namespace-istio-waypoint            HBONE
 bookinfo           namespace-istio-waypoint-d94944bf6-z89g2             10.244.2.52 ambient-worker2       None                                TCP

diff --git a/istioctl/pkg/writer/ztunnel/configdump/testdata/workloadsummary_default.txt b/istioctl/pkg/writer/ztunnel/configdump/testdata/workloadsummary_default.txt
@@ -1,4 +1,4 @@
-NAMESPACE NAME                           IP          NODE            WAYPOINT PROTOCOL
+NAMESPACE POD NAME                       IP          NODE            WAYPOINT PROTOCOL
 default   details-v1-698d88b-krdw7       10.244.2.55 ambient-worker2 None     HBONE
 default   httpbin-7447985f87-t8hv7       10.244.1.40 ambient-worker  None     TCP
 default   productpage-v1-675fc69cf-kkrm2 10.244.2.56 ambient-worker2 None     HBONE

diff --git a/istioctl/pkg/writer/ztunnel/configdump/workload.go b/istioctl/pkg/writer/ztunnel/configdump/workload.go
@@ -86,9 +86,9 @@ func (c *ConfigWriter) PrintWorkloadSummary(filter WorkloadFilter) error {
 	})
 
 	if filter.Verbose {
-		fmt.Fprintln(w, "NAMESPACE\tNAME\tIP\tNODE\tWAYPOINT\tPROTOCOL")
+		fmt.Fprintln(w, "NAMESPACE\tPOD NAME\tIP\tNODE\tWAYPOINT\tPROTOCOL")
 	} else {
-		fmt.Fprintln(w, "NAMESPACE\tNAME\tIP\tNODE")
+		fmt.Fprintln(w, "NAMESPACE\tPOD NAME\tIP\tNODE")
 	}
 
 	for _, wl := range verifiedWorkloads {