Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion hack/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ set -o errexit
set -o nounset
set -o pipefail

set -o xtrace

version::get_version_vars() {
# shellcheck disable=SC1083
GIT_COMMIT="$(git rev-parse HEAD^{commit})"
Expand Down Expand Up @@ -96,4 +98,4 @@ version::ldflags() {
echo "${ldflags[*]-}"
}

version::ldflags
version::ldflags
9 changes: 8 additions & 1 deletion test/e2e/azure_clusterproxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,14 @@ func (acp *AzureClusterProxy) collectNodes(ctx context.Context, namespace string
workload := acp.GetWorkloadCluster(ctx, namespace, name)
nodes := &corev1.NodeList{}

Expect(workload.GetClient().List(ctx, nodes)).To(Succeed())
// Failing to collect node logs should not cause the test to fail. The workload cluster
// API server may be unreachable during teardown (for example due to a transient Azure
// load balancer / DNS issue), and we should not turn an otherwise-successful spec into
// a failure during [AfterEach] log collection.
if err := workload.GetClient().List(ctx, nodes); err != nil {
Logf("Failed to list nodes for workload cluster %s/%s: %v", namespace, name, err)
return
}

var err error
var nodeDescribe string
Expand Down
Loading