Wait for client to be ready after restore

Author: mgencur

tests/e2e/hcp_backup_restore_suite_test.go

@@ -72,6 +72,7 @@ func runHCPBackupAndRestore(
 			hcKubeconfig, err := h.GetHostedClusterKubeconfig(h.HostedCluster)
 			gomega.Expect(err).ToNot(gomega.HaveOccurred())
 			crClientForHC, err := client.New(hcKubeconfig, client.Options{Scheme: lib.Scheme})
+			gomega.Eventually(h.ValidateClient(crClientForHC), 5*time.Minute, 2*time.Second).Should(gomega.BeTrue())
 			gomega.Expect(err).ToNot(gomega.HaveOccurred())
 			err = brCase.PreBackupVerifyGuest(crClientForHC, "" /*unused*/)
 			gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to run pre-backup verification for guest cluster: %v", err)
@@ -110,6 +111,7 @@ func runHCPBackupAndRestore(
 			gomega.Expect(err).ToNot(gomega.HaveOccurred())
 			crClientForHC, err := client.New(hcKubeconfig, client.Options{Scheme: lib.Scheme})
 			gomega.Expect(err).ToNot(gomega.HaveOccurred())
+			gomega.Eventually(h.ValidateClient(crClientForHC), 5*time.Minute, 2*time.Second).Should(gomega.BeTrue())
 			err = brCase.PostRestoreVerifyGuest(crClientForHC, "" /*unused*/)
 			gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to run post-restore verification for guest cluster: %v", err)
 		}

tests/e2e/lib/hcp/hcp.go

@@ -7,6 +7,7 @@ import (
 	"log"
 	"time"
 
+	configv1 "github.com/openshift/api/config/v1"
 	hypershiftv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -713,3 +714,14 @@ func (h *HCHandler) GetHostedClusterKubeconfig(hc *hypershiftv1.HostedCluster) (
 	kubeconfigData := kubeconfigSecret.Data["kubeconfig"]
 	return buildConfigFromBytes(kubeconfigData)
 }
+
+func (h *HCHandler) ValidateClient(c client.Client) wait.ConditionFunc {
+	return func() (bool, error) {
+		clusterVersion := &configv1.ClusterVersion{}
+		if err := c.Get(h.Ctx, client.ObjectKey{Name: "version"}, clusterVersion); err != nil {
+			log.Printf("Error getting cluster version: %v", err)
+			return false, nil
+		}
+		return true, nil
+	}
+}