From eab4b959e60e54efe2b49ad0ca2f9567fbb1b71c Mon Sep 17 00:00:00 2001 From: Ethan Mosbaugh Date: Fri, 23 Aug 2024 14:33:13 -0700 Subject: [PATCH] fix(ci): cluster bundle is broken in airgap mode (#1032) --- e2e/scripts/collect-support-bundle-cluster.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/e2e/scripts/collect-support-bundle-cluster.sh b/e2e/scripts/collect-support-bundle-cluster.sh index 47a2785b4..27c0f2774 100755 --- a/e2e/scripts/collect-support-bundle-cluster.sh +++ b/e2e/scripts/collect-support-bundle-cluster.sh @@ -2,10 +2,14 @@ set -euox pipefail main() { - 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 - echo "Failed to collect cluster support bundle" - return 1 + 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 + echo "Failed to collect cluster support bundle" + return 1 + fi fi }