fix(wait): ensure cluster is connectable in loop (#4616)

Signed-off-by: Austin Abro <austinabro321@gmail.com>
Signed-off-by: Austin Abro <37223396+AustinAbro321@users.noreply.github.com>
Co-authored-by: Brandt Keller <43887158+brandtkeller@users.noreply.github.com>

Author: AustinAbro321

src/pkg/packager/layout/package_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/zarf-dev/zarf/src/api/v1alpha1"
-	"github.com/zarf-dev/zarf/src/config"
 	"github.com/zarf-dev/zarf/src/pkg/feature"
 	"github.com/zarf-dev/zarf/src/pkg/utils"
 	"github.com/zarf-dev/zarf/src/test/testutil"
@@ -76,7 +75,6 @@ func TestPackageLayout(t *testing.T) {
 
 func TestPackageFileName(t *testing.T) {
 	t.Parallel()
-	config.CLIArch = "amd64"
 	tests := []struct {
 		name        string
 		pkg         v1alpha1.ZarfPackage

src/pkg/wait/wait.go

@@ -50,6 +50,7 @@ func ForResource(ctx context.Context, kind, identifier, condition, namespace str
 	// Wait for the cluster to become available by polling for a successful REST config.
 	var restConfig *rest.Config
 	var clientCfg clientcmd.ClientConfig
+	var discoveryClient *discovery.DiscoveryClient
 	err := wait.PollUntilContextTimeout(ctx, waitInterval, timeout, true, func(_ context.Context) (bool, error) {
 		var err error
 		loader := clientcmd.NewDefaultClientConfigLoadingRules()
@@ -59,24 +60,28 @@ func ForResource(ctx context.Context, kind, identifier, condition, namespace str
 			l.Debug("failed to get REST config, retrying", "error", err)
 			return false, nil
 		}
+		discoveryClient, err = discovery.NewDiscoveryClientForConfig(restConfig)
+		if err != nil {
+			l.Debug("failed to get discovery client, retrying", "error", err)
+			return false, nil
+		}
+		_, err = discoveryClient.ServerVersion()
+		if err != nil {
+			l.Debug("cluster not reachable, retrying", "error", err)
+			return false, nil
+		}
 		return true, nil
 	})
 	if err != nil {
 		return fmt.Errorf("timed out waiting for REST config: %w", err)
 	}
 
-	discoveryClient, err := discovery.NewDiscoveryClientForConfig(restConfig)
-	if err != nil {
-		return fmt.Errorf("failed to create discovery client: %w", err)
-	}
-
 	// Wait for the resource kind to be resolvable (e.g. CRDs may not be registered yet).
 	var mapping *meta.RESTMapping
 	err = wait.PollUntilContextTimeout(ctx, waitInterval, time.Until(deadline), true, func(_ context.Context) (bool, error) {
 		groupResources, err := restmapper.GetAPIGroupResources(discoveryClient)
 		if err != nil {
-			l.Debug("failed to get API group resources, retrying", "error", err)
-			return false, nil
+			return true, fmt.Errorf("failed to get API group resources: %w", err)
 		}
 		restMapper := restmapper.NewShortcutExpander(restmapper.NewDiscoveryRESTMapper(groupResources), discoveryClient, nil)
 		mapping, err = resolveResourceKind(restMapper, kind)