fed: Refactor e2e retrieval of cluster config

test/e2e_federation/apiserver.go

@@ -57,7 +57,7 @@ var _ = framework.KubeDescribe("Federation apiserver [Feature:Federation]", func
 
 			framework.Logf("Checking that %d clusters are Ready", len(contexts))
 			for _, context := range contexts {
-				fedframework.ClusterIsReadyOrFail(f, &context)
+				fedframework.ClusterIsReadyOrFail(f, context.Name)
 			}
 			framework.Logf("%d clusters are Ready", len(contexts))
 

test/e2e_federation/framework/BUILD

@@ -35,7 +35,6 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
         "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
-        "//vendor/k8s.io/client-go/tools/clientcmd/api:go_default_library",
     ],
 )
 

test/e2e_federation/framework/cluster.go

@@ -20,13 +20,12 @@ import (
 	"fmt"
 	"time"
 
+	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
-	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1"
-	fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
 	"k8s.io/kubernetes/pkg/api/v1"
 	kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -35,15 +34,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const (
+const federatedClustersWaitTimeout = 1 * time.Minute
-	KubeAPIQPS   float32 = 20.0
-	KubeAPIBurst         = 30
-
-	userAgentName = "federation-e2e"
-
-	federatedNamespaceTimeout    = 5 * time.Minute
-	federatedClustersWaitTimeout = 1 * time.Minute
-)
 
 // ClusterSlice is a slice of clusters
 type ClusterSlice []*Cluster
@@ -54,7 +45,8 @@ type Cluster struct {
 	*kubeclientset.Clientset
 }
 
-func getRegisteredClusters(f *Framework) ClusterSlice {
+// registeredClustersFromConfig configures clientsets for registered clusters from the e2e kubeconfig
+func registeredClustersFromConfig(f *Framework) ClusterSlice {
 	contexts := f.GetUnderlyingFederatedContexts()
 
 	By("Obtaining a list of all the clusters")
@@ -62,7 +54,8 @@ func getRegisteredClusters(f *Framework) ClusterSlice {
 
 	framework.Logf("Checking that %d clusters are Ready", len(contexts))
 	for _, context := range contexts {
-		ClusterIsReadyOrFail(f, &context)
+		ClusterIsReadyOrFail(f, context.Name)
+
 	}
 	framework.Logf("%d clusters are Ready", len(contexts))
 
@@ -70,12 +63,14 @@ func getRegisteredClusters(f *Framework) ClusterSlice {
 	for i, c := range clusterList.Items {
 		framework.Logf("Creating a clientset for the cluster %s", c.Name)
 		Expect(framework.TestContext.KubeConfig).ToNot(Equal(""), "KubeConfig must be specified to load clusters' client config")
+		config := restConfigFromContext(c, i)
 		clusters = append(clusters, &Cluster{
 			Name:      c.Name,
-			Clientset: createClientsetForCluster(c, i, userAgentName),
+			Clientset: clientsetFromConfig(f, config, c.Spec.ServerAddressByClientCIDRs[0].ServerAddress),
 		})
+
 	}
-	waitForNamespaceInFederatedClusters(clusters, f.FederationNamespace.Name, federatedNamespaceTimeout)
+	waitForNamespaceInFederatedClusters(clusters, f.FederationNamespace.Name)
 	return clusters
 }
 
@@ -100,32 +95,34 @@ func waitForAllRegisteredClusters(f *Framework, clusterCount int) *federationapi
 	return clusterList
 }
 
-func createClientsetForCluster(c federationapi.Cluster, i int, userAgentName string) *kubeclientset.Clientset {
+func restConfigFromContext(c federationapi.Cluster, i int) *restclient.Config {
 	kubecfg, err := clientcmd.LoadFromFile(framework.TestContext.KubeConfig)
 	framework.ExpectNoError(err, "error loading KubeConfig: %v", err)
 
-	cfgOverride := &clientcmd.ConfigOverrides{
+	ccfg := clientcmd.NewNonInteractiveClientConfig(*kubecfg, c.Name, &clientcmd.ConfigOverrides{}, clientcmd.NewDefaultClientConfigLoadingRules())
-		ClusterInfo: clientcmdapi.Cluster{
-			Server: c.Spec.ServerAddressByClientCIDRs[0].ServerAddress,
-		},
-	}
-	ccfg := clientcmd.NewNonInteractiveClientConfig(*kubecfg, c.Name, cfgOverride, clientcmd.NewDefaultClientConfigLoadingRules())
 	cfg, err := ccfg.ClientConfig()
 	framework.ExpectNoError(err, "Error creating client config in cluster #%d (%q)", i, c.Name)
+	return cfg
+}
 
-	cfg.QPS = KubeAPIQPS
+func clientsetFromConfig(f *Framework, cfg *restclient.Config, host string) *kubeclientset.Clientset {
-	cfg.Burst = KubeAPIBurst
+	cfg.Host = host
-	return kubeclientset.NewForConfigOrDie(restclient.AddUserAgent(cfg, userAgentName))
+	cfg.QPS = f.Framework.Options.ClientQPS
+	cfg.Burst = f.Framework.Options.ClientBurst
+	return kubeclientset.NewForConfigOrDie(restclient.AddUserAgent(cfg, "federation-e2e"))
 }
 
 // waitForNamespaceInFederatedClusters waits for the federated namespace to be created in federated clusters
-func waitForNamespaceInFederatedClusters(clusters ClusterSlice, nsName string, timeout time.Duration) {
+func waitForNamespaceInFederatedClusters(clusters ClusterSlice, nsName string) {
 	for _, c := range clusters {
 		name := c.Name
-		err := wait.PollImmediate(framework.Poll, timeout, func() (bool, error) {
+		By(fmt.Sprintf("Waiting for namespace %q to be created in cluster %q", nsName, name))
+		err := wait.PollImmediate(framework.Poll, FederatedDefaultTestTimeout, func() (bool, error) {
 			_, err := c.Clientset.Core().Namespaces().Get(nsName, metav1.GetOptions{})
-			if err != nil {
+			if errors.IsNotFound(err) {
-				By(fmt.Sprintf("Waiting for namespace %q to be created in cluster %q, err: %v", nsName, name, err))
+				return false, nil
+			} else if err != nil {
+				framework.Logf("An error occurred waiting for namespace %q to be created in cluster %q: %v", nsName, name, err)
 				return false, nil
 			}
 			By(fmt.Sprintf("Namespace %q exists in cluster %q", nsName, name))
@@ -135,22 +132,11 @@ func waitForNamespaceInFederatedClusters(clusters ClusterSlice, nsName string, t
 	}
 }
 
-// ClusterIsReadyOrFail checks whether the federated cluster of the provided context is ready
+// ClusterIsReadyOrFail checks whether the named cluster is ready
-func ClusterIsReadyOrFail(f *Framework, context *E2EContext) {
+func ClusterIsReadyOrFail(f *Framework, clusterName string) {
-	c, err := f.FederationClientset.Federation().Clusters().Get(context.Name, metav1.GetOptions{})
+	By(fmt.Sprintf("Checking readiness of cluster %q", clusterName))
-	framework.ExpectNoError(err, fmt.Sprintf("get cluster: %+v", err))
+	err := wait.PollImmediate(framework.Poll, FederatedDefaultTestTimeout, func() (bool, error) {
-	if c.ObjectMeta.Name != context.Name {
+		c, err := f.FederationClientset.Federation().Clusters().Get(clusterName, metav1.GetOptions{})
-		framework.Failf("cluster name does not match input context: actual=%+v, expected=%+v", c, context)
-	}
-	err = isReady(context.Name, f.FederationClientset)
-	framework.ExpectNoError(err, fmt.Sprintf("unexpected error in verifying if cluster %s is ready: %+v", context.Name, err))
-	framework.Logf("Cluster %s is Ready", context.Name)
-}
-
-// Verify that the cluster is marked ready.
-func isReady(clusterName string, clientset *fedclientset.Clientset) error {
-	return wait.PollImmediate(time.Second, 5*time.Minute, func() (bool, error) {
-		c, err := clientset.Federation().Clusters().Get(clusterName, metav1.GetOptions{})
 		if err != nil {
 			return false, err
 		}
@@ -161,4 +147,6 @@ func isReady(clusterName string, clientset *fedclientset.Clientset) error {
 		}
 		return false, nil
 	})
+	framework.ExpectNoError(err, fmt.Sprintf("Unexpected error in verifying if cluster %q is ready: %+v", clusterName, err))
+	framework.Logf("Cluster %s is Ready", clusterName)
 }

test/e2e_federation/framework/framework.go

@@ -228,11 +228,11 @@ func (f *Framework) GetUnderlyingFederatedContexts() []E2EContext {
 }
 
 func (f *Framework) GetRegisteredClusters() ClusterSlice {
-	return getRegisteredClusters(f)
+	return registeredClustersFromConfig(f)
 }
 
 func (f *Framework) GetClusterClients() []kubeclientset.Interface {
-	clusters := getRegisteredClusters(f)
+	clusters := f.GetRegisteredClusters()
 	var clusterClients []kubeclientset.Interface
 	for _, c := range clusters {
 		clusterClients = append(clusterClients, c.Clientset)