Updating tests

This commit is contained in:
nikhiljindal 2016-05-24 00:27:39 -07:00
parent 9b604242c6
commit dca310aa88
5 changed files with 44 additions and 26 deletions

View File

@ -40,6 +40,32 @@ const (
KubeconfigSecretDataKey = "kubeconfig" KubeconfigSecretDataKey = "kubeconfig"
) )
// This is to inject a different kubeconfigGetter in tests.
// We dont use the standard one which calls NewInCluster in tests to avoid having to setup service accounts and mount files with secret tokens.
var KubeconfigGetterForCluster = func(c *federation_v1alpha1.Cluster) clientcmd.KubeconfigGetter {
return func() (*clientcmdapi.Config, error) {
// Get the namespace this is running in from the env variable.
namespace := os.Getenv("POD_NAMESPACE")
if namespace == "" {
return nil, fmt.Errorf("unexpected: POD_NAMESPACE env var returned empty string")
}
// Get a client to talk to the k8s apiserver, to fetch secrets from it.
client, err := client.NewInCluster()
if err != nil {
return nil, fmt.Errorf("error in creating in-cluster client: %s", err)
}
secret, err := client.Secrets(namespace).Get(c.Spec.SecretRef.Name)
if err != nil {
return nil, fmt.Errorf("error in fetching secret: %s", err)
}
data, ok := secret.Data[KubeconfigSecretDataKey]
if !ok {
return nil, fmt.Errorf("secret does not have data with key: %s", KubeconfigSecretDataKey)
}
return clientcmd.Load(data)
}
}
type ClusterClient struct { type ClusterClient struct {
discoveryClient *discovery.DiscoveryClient discoveryClient *discovery.DiscoveryClient
} }
@ -64,28 +90,7 @@ func NewClusterClientSet(c *federation_v1alpha1.Cluster) (*ClusterClient, error)
} }
var clusterClientSet = ClusterClient{} var clusterClientSet = ClusterClient{}
if serverAddress != "" { if serverAddress != "" {
// Get a client to talk to the k8s apiserver, to fetch secrets from it. kubeconfigGetter := KubeconfigGetterForCluster(c)
client, err := client.NewInCluster()
if err != nil {
return nil, fmt.Errorf("error in creating in-cluster client: %s", err)
}
kubeconfigGetter := func() (*clientcmdapi.Config, error) {
// Get the namespace this is running in from the env variable.
namespace := os.Getenv("POD_NAMESPACE")
if namespace == "" {
return nil, fmt.Errorf("unexpected: POD_NAMESPACE env var returned empty string")
}
secret, err := client.Secrets(namespace).Get(c.Spec.SecretRef.Name)
if err != nil {
return nil, fmt.Errorf("error in fetching secret: %s", err)
}
data, ok := secret.Data[KubeconfigSecretDataKey]
if !ok {
return nil, fmt.Errorf("secret does not have data with key: %s", KubeconfigSecretDataKey)
}
return clientcmd.Load(data)
}
clusterConfig, err := clientcmd.BuildConfigFromKubeconfigGetter(serverAddress, kubeconfigGetter) clusterConfig, err := clientcmd.BuildConfigFromKubeconfigGetter(serverAddress, kubeconfigGetter)
if err != nil { if err != nil {
return nil, err return nil, err

View File

@ -30,6 +30,7 @@ import (
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
) )
@ -122,6 +123,14 @@ func TestUpdateClusterStatusOK(t *testing.T) {
} }
federationClientSet := federationclientset.NewForConfigOrDie(restclient.AddUserAgent(restClientCfg, "cluster-controller")) federationClientSet := federationclientset.NewForConfigOrDie(restclient.AddUserAgent(restClientCfg, "cluster-controller"))
// Override KubeconfigGetterForCluster to avoid having to setup service accounts and mount files with secret tokens.
originalGetter := KubeconfigGetterForCluster
KubeconfigGetterForCluster = func(c *federation_v1alpha1.Cluster) clientcmd.KubeconfigGetter {
return func() (*clientcmdapi.Config, error) {
return &clientcmdapi.Config{}, nil
}
}
manager := NewclusterController(federationClientSet, 5) manager := NewclusterController(federationClientSet, 5)
err = manager.UpdateClusterStatus() err = manager.UpdateClusterStatus()
if err != nil { if err != nil {
@ -135,4 +144,7 @@ func TestUpdateClusterStatusOK(t *testing.T) {
t.Errorf("Failed to Update Cluster Status") t.Errorf("Failed to Update Cluster Status")
} }
} }
// Reset KubeconfigGetterForCluster
KubeconfigGetterForCluster = originalGetter
} }

View File

@ -87,7 +87,9 @@ func TestUpdate(t *testing.T) {
// updateFunc // updateFunc
func(obj runtime.Object) runtime.Object { func(obj runtime.Object) runtime.Object {
object := obj.(*federation.Cluster) object := obj.(*federation.Cluster)
object.Spec.Credential = "bar" object.Spec.SecretRef = &api.LocalObjectReference{
Name: "bar",
}
return object return object
}, },
) )

View File

@ -54,14 +54,12 @@ func validNewCluster() *federation.Cluster {
} }
func invalidNewCluster() *federation.Cluster { func invalidNewCluster() *federation.Cluster {
// Create a cluster with empty ServerAddressByClientCIDRs (which is a required field).
return &federation.Cluster{ return &federation.Cluster{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: "foo2", Name: "foo2",
ResourceVersion: "5", ResourceVersion: "5",
}, },
Spec: federation.ClusterSpec{
Credential: "bar",
},
Status: federation.ClusterStatus{ Status: federation.ClusterStatus{
Conditions: []federation.ClusterCondition{ Conditions: []federation.ClusterCondition{
{Type: federation.ClusterReady, Status: api.ConditionFalse}, {Type: federation.ClusterReady, Status: api.ConditionFalse},

View File

@ -403,6 +403,7 @@ func BuildConfigFromFlags(masterUrl, kubeconfigPath string) (*restclient.Config,
// BuildConfigFromKubeconfigGetter is a helper function that builds configs from a master // BuildConfigFromKubeconfigGetter is a helper function that builds configs from a master
// url and a kubeconfigGetter. // url and a kubeconfigGetter.
func BuildConfigFromKubeconfigGetter(masterUrl string, kubeconfigGetter KubeconfigGetter) (*restclient.Config, error) { func BuildConfigFromKubeconfigGetter(masterUrl string, kubeconfigGetter KubeconfigGetter) (*restclient.Config, error) {
// TODO: We do not need a DeferredLoader here. Refactor code and see if we can use DirectClientConfig here.
cc := NewNonInteractiveDeferredLoadingClientConfig( cc := NewNonInteractiveDeferredLoadingClientConfig(
&ClientConfigGetter{kubeconfigGetter: kubeconfigGetter}, &ClientConfigGetter{kubeconfigGetter: kubeconfigGetter},
&ConfigOverrides{ClusterInfo: clientcmdapi.Cluster{Server: masterUrl}}) &ConfigOverrides{ClusterInfo: clientcmdapi.Cluster{Server: masterUrl}})