fix(ci): collect fallback cluster support bundle in airgap (#1462)

* fix(ci): collect fallback cluster support bundle in airgap

* f

* f

* Trigger Build

Author: emosbaugh

e2e/cluster/docker/cluster.go

@@ -42,7 +42,8 @@ func NewCluster(in *ClusterInput) *Cluster {
 func NewNode(in *ClusterInput, name string) *Container {
 	c := NewContainer(in.T, name).
 		WithImage(fmt.Sprintf("replicated/ec-distro:%s", in.Distro)).
-		WithScripts()
+		WithScripts().
+		WithTroubleshootDir()
 	if in.K0sDir != "" {
 		in.T.Logf("using k0s dir %s", in.K0sDir)
 		c = c.WithVolume(in.K0sDir)

e2e/cluster/docker/container.go

@@ -111,6 +111,15 @@ func (c *Container) GetScriptPath(script string) string {
 	return fmt.Sprintf("/usr/local/bin/%s", script)
 }
 
+func (c *Container) WithTroubleshootDir() *Container {
+	troubleshootPath, err := filepath.Abs("../operator/charts/embedded-cluster-operator/troubleshoot")
+	if err != nil {
+		c.t.Fatalf("failed to get absolute path to troubleshoot dir: %v", err)
+	}
+	c = c.WithVolume(fmt.Sprintf("%s:%s", troubleshootPath, "/automation/troubleshoot"))
+	return c
+}
+
 func (c *Container) WithVolume(volume string) *Container {
 	c.Volumes = append(c.Volumes, volume)
 	return c

e2e/cluster/lxd/cluster.go

@@ -482,6 +482,10 @@ func CopyDirsToNode(in *ClusterInput, node string) {
 			SourcePath: "playwright",
 			DestPath:   "/automation/playwright",
 		},
+		{
+			SourcePath: "../operator/charts/embedded-cluster-operator/troubleshoot",
+			DestPath:   "/automation/troubleshoot",
+		},
 	}
 	for _, dir := range dirs {
 		CopyDirToNode(in, node, dir)

e2e/scripts/collect-support-bundle-cluster.sh

@@ -6,10 +6,7 @@ DIR=/usr/local/bin
 
 main() {
     if ! kubectl support-bundle --output cluster.tar.gz --interactive=false --load-cluster-specs ; then
-        # NOTE: this will fail in airgap but we've already failed above
-        # TODO: improve this by downloading the spec through the proxy and running with a file path
-        local url="https://raw.githubusercontent.com/replicatedhq/embedded-cluster-operator/main/charts/embedded-cluster-operator/troubleshoot/cluster-support-bundle.yaml"
-        if ! kubectl support-bundle --output cluster.tar.gz --interactive=false --load-cluster-specs "$url" ; then
+        if ! kubectl support-bundle --output cluster.tar.gz --interactive=false --load-cluster-specs "/automation/troubleshoot/cluster-support-bundle.yaml" ; then
             echo "Failed to collect cluster support bundle"
             return 1
         fi