Autosupport YAML enhancements

Author: jwebster7

cli/cmd/install.go

@@ -97,6 +97,7 @@ var (
 	silent                   bool
 	useIPv6                  bool
 	silenceAutosupport       bool
+	excludeAutosupport       bool
 	nodePrep                 []string
 	skipK8sVersionCheck      bool
 	windows                  bool
@@ -197,6 +198,8 @@ func init() {
 	installCmd.Flags().BoolVar(&useIPv6, "use-ipv6", false, "Use IPv6 for Trident's communication.")
 	installCmd.Flags().BoolVar(&silenceAutosupport, "silence-autosupport", tridentconfig.BuildType != "stable",
 		"Don't send autosupport bundles to NetApp automatically.")
+	installCmd.Flags().BoolVar(&excludeAutosupport, "exclude-autosupport", false,
+		"Don't install or run the autosupport container.")
 	installCmd.Flags().StringSliceVar(&nodePrep, "node-prep", []string{}, "Comma separated list of protocols to prepare nodes for.  Currently only iSCSI is supported.")
 	installCmd.Flags().BoolVar(&enableForceDetach, "enable-force-detach", false,
 		"Enable the force detach feature.")
@@ -264,6 +267,9 @@ func init() {
 	if err := installCmd.Flags().MarkHidden("autosupport-hostname"); err != nil {
 		_, _ = fmt.Fprintln(os.Stderr, err)
 	}
+	if err := installCmd.Flags().MarkHidden("exclude-autosupport"); err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+	}
 	if err := installCmd.Flags().MarkHidden("fs-group-policy"); err != nil {
 		_, _ = fmt.Fprintln(os.Stderr, err)
 	}
@@ -673,6 +679,7 @@ func prepareYAMLFiles() error {
 		ControllingCRDetails:    nil,
 		UseIPv6:                 useIPv6,
 		SilenceAutosupport:      silenceAutosupport,
+		ExcludeAutosupport:      excludeAutosupport,
 		Version:                 client.ServerVersion(),
 		HTTPRequestTimeout:      httpRequestTimeout.String(),
 		ServiceAccountName:      getControllerRBACResourceName(),
@@ -996,6 +1003,13 @@ func installTrident() (returnError error) {
 		}).Info("ACP is now obsolete; All workflows are now enabled by default.")
 	}
 
+	// excludeAutosupport completely removes the autosupport container from the deployment.
+	if excludeAutosupport {
+		Log().WithFields(LogFields{
+			"excludeAutosupport": excludeAutosupport,
+		}).Warn("Autosupport bundles cannot be generated.")
+	}
+
 	// Create the deployment
 	if useYAML && fileExists(deploymentPath) {
 		returnError = validateTridentDeployment()
@@ -1027,6 +1041,7 @@ func installTrident() (returnError error) {
 			ControllingCRDetails:    nil,
 			UseIPv6:                 useIPv6,
 			SilenceAutosupport:      silenceAutosupport,
+			ExcludeAutosupport:      excludeAutosupport,
 			Version:                 client.ServerVersion(),
 			HTTPRequestTimeout:      httpRequestTimeout.String(),
 			ServiceAccountName:      getControllerRBACResourceName(),

cli/cmd/root.go

@@ -1,4 +1,4 @@
-// Copyright 2024 NetApp, Inc. All Rights Reserved.
+// Copyright 2025 NetApp, Inc. All Rights Reserved.
 
 package cmd
 
@@ -125,7 +125,7 @@ func discoverOperatingMode(_ *cobra.Command) error {
 
 		switch OperatingMode {
 		case ModeDirect:
-			fmt.Printf("Operating mode = %s, Server = %s, Autosuport server = %s\n",
+			fmt.Printf("Operating mode = %s, Server = %s, Autosupport server = %s\n",
 				OperatingMode, Server, AutosupportCollector)
 		case ModeTunnel:
 			fmt.Printf("Operating mode = %s, Trident pod = %s, Namespace = %s, CLI = %s\n",

cli/cmd/send.go

@@ -1,4 +1,4 @@
-// Copyright 2020 NetApp, Inc. All Rights Reserved.
+// Copyright 2025 NetApp, Inc. All Rights Reserved.
 
 package cmd
 

cli/cmd/send_autosupport.go

@@ -1,15 +1,19 @@
-// Copyright 2020 NetApp, Inc. All Rights Reserved.
+// Copyright 2025 NetApp, Inc. All Rights Reserved.
 
 package cmd
 
 import (
+	"bytes"
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"time"
 
 	"github.com/spf13/cobra"
+	k8s "k8s.io/api/core/v1"
 
 	"github.com/netapp/trident/cli/api"
+	"github.com/netapp/trident/config"
 )
 
 const (
@@ -45,6 +49,15 @@ var sendAutosupportCmd = &cobra.Command{
 		}
 
 		if OperatingMode == ModeTunnel {
+			// Do not attempt to send a support bundle if the ASUP container does not exist.
+			isAutosupportPresent, err := isAutosupportContainerPresent(TridentPodNamespace, TridentCSILabel)
+			if err != nil {
+				return err
+			} else if !isAutosupportPresent {
+				cmd.Println("Unable to send autosupport bundle; no autosupport container found.")
+				return nil
+			}
+
 			command := []string{"send", "autosupport"}
 			args = append(args, "--accept-agreement")
 
@@ -83,3 +96,39 @@ func triggerAutosupport(since string) error {
 
 	return nil
 }
+
+func isAutosupportContainerPresent(namespace, appLabel string) (bool, error) {
+	// Get 'trident' pod info
+	cmd := execKubernetesCLIRaw(
+		"get", "pod",
+		"-n", namespace,
+		"-l", appLabel,
+		"-o=json",
+		"--field-selector=status.phase=Running")
+	var outbuff bytes.Buffer
+	cmd.Stdout = &outbuff
+	err := cmd.Run()
+	if err != nil {
+		return false, err
+	}
+
+	var tridentPodList k8s.PodList
+	if err = json.Unmarshal(outbuff.Bytes(), &tridentPodList); err != nil {
+		return false, fmt.Errorf("could not unmarshal Trident pod list; %v", err)
+	}
+
+	if len(tridentPodList.Items) != 1 {
+		return false, fmt.Errorf("could not find a Trident pod in the %s namespace. "+
+			"You may need to use the -n option to specify the correct namespace", namespace)
+	}
+	tridentPod := tridentPodList.Items[0]
+
+	// Check for the autosupport container.
+	for _, c := range tridentPod.Spec.Containers {
+		if c.Name == config.DefaultAutosupportName {
+			return true, nil
+		}
+	}
+
+	return false, nil
+}

cli/k8s_client/types.go

@@ -1,4 +1,4 @@
-// Copyright 2024 NetApp, Inc. All Rights Reserved.
+// Copyright 2025 NetApp, Inc. All Rights Reserved.
 
 package k8sclient
 
@@ -158,6 +158,7 @@ type DeploymentYAMLArguments struct {
 	Debug                      bool                  `json:"debug"`
 	UseIPv6                    bool                  `json:"useIPv6"`
 	SilenceAutosupport         bool                  `json:"silenceAutosupport"`
+	ExcludeAutosupport         bool                  `json:"excludeAutosupport"`
 	Version                    *versionutils.Version `json:"version"`
 	DisableAuditLog            bool                  `json:"disableAuditLog"`
 	HTTPRequestTimeout         string                `json:"httpRequestTimeout"`