PGO CLI Version Self-Reporting

This commmit adds the PGO CLI version to the information collected
by the support export command.

Issue: [sc-18016]

Author: tjmoore4

internal/cmd/export.go

@@ -270,10 +270,14 @@ kubectl pgo support export daisy --monitoring-namespace another-namespace --outp
 		}()
 
 		// TODO (jmckulk): collect context info
-		// TODO (jmckulk): collect client version, after pgo version command is implemented
+
+		// PGO CLI version
+		err = gatherPGOCLIVersion(ctx, clusterName, tw, cmd)
 
 		// Gather cluster wide resources
-		err = gatherKubeServerVersion(ctx, discoveryClient, clusterName, tw, cmd)
+		if err == nil {
+			err = gatherKubeServerVersion(ctx, discoveryClient, clusterName, tw, cmd)
+		}
 
 		if err == nil {
 			err = gatherNodes(ctx, clientset, clusterName, tw, cmd)
@@ -357,6 +361,20 @@ func exportSizeReport(size float64) string {
 	return finalMsg
 }
 
+// gatherPGOCLIVersion collects the PGO CLI version
+func gatherPGOCLIVersion(_ context.Context,
+	clusterName string,
+	tw *tar.Writer,
+	cmd *cobra.Command,
+) error {
+
+	path := clusterName + "/pgo-cli-version"
+	if err := writeTar(tw, []byte(clientVersion), path, cmd); err != nil {
+		return err
+	}
+	return nil
+}
+
 // gatherKubeServerVersion collects the server version from the Kubernetes cluster
 func gatherKubeServerVersion(_ context.Context,
 	client *discovery.DiscoveryClient,

internal/cmd/pgo.go

@@ -29,7 +29,7 @@ import (
 )
 
 // store the current PGO CLI version
-const clientVersion = "v0.2.0"
+const clientVersion = "v0.3.0"
 
 // NewPGOCommand returns the root command of the PGO plugin. This command
 // prints the same information as its --help flag: the available subcommands

testing/kuttl/e2e/support-export/01--support_export.yaml

@@ -7,11 +7,17 @@ commands:
 - script: |
     #!/bin/bash
 
-    DIR="./kuttl-support-cluster/nodes/"
-    LIST="${DIR}list"
-
     CLEANUP="rm -r ./kuttl-support-cluster ./crunchy_k8s_support_export_*.tar.gz"
 
+    # check that the PGO CLI version is recorded
+    VER=$(cat ./kuttl-support-cluster/pgo-cli-version)
+    [[ "$VER" =~ v[0-9]+.[0-9]+.[0-9]+$ ]] || {
+      echo "Expected PGO CLI version, got:"
+      echo "${VER}"
+      eval "$CLEANUP"
+      exit 1
+    }
+
     # check for expected gzip compression level
     FILE_INFO=$(file ./crunchy_k8s_support_export_*.tar.gz)
     [[ "${FILE_INFO}" == *'gzip compressed data, max compression'* ]] || {
@@ -21,6 +27,10 @@ commands:
       exit 1
     }
 
+    # Node directory and list file path
+    DIR="./kuttl-support-cluster/nodes/"
+    LIST="${DIR}list"
+
     # check for expected table header in the list file
     KV=$(awk 'NR==1 {print $9}' $LIST)
     [[ "${KV}" == '|KERNEL-VERSION' ]] || {