Merge pull request #7 from roberthbailey/unit-tests

Update clusterctl validation to use the dynamic client

pkg/clientcmd/configutil.go → cmd/clusterctl/clientcmd/configutil.go

@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
 )
 
-// This is a convienience method to prevent the need of importing both this version of clientcmd and the client-go version
+// This is a convenience method to prevent the need of importing both this version of clientcmd and the client-go version
 func NewConfigOverrides() clientcmd.ConfigOverrides {
 	return clientcmd.ConfigOverrides{}
 }
@@ -43,15 +43,6 @@ func NewCoreClientSetForDefaultSearchPath(kubeconfigPath string, overrides clien
 	return kubernetes.NewForConfig(config)
 }
 
-// NewCoreClientSetForKubeconfig creates a core kubernetes clientset for the given kubeconfig string.
-func NewCoreClientSetForKubeconfig(kubeconfig string) (*kubernetes.Clientset, error) {
-	config, err := newRestConfigForKubeconfig(kubeconfig)
-	if err != nil {
-		return nil, err
-	}
-	return kubernetes.NewForConfig(config)
-}
-
 // NewClusterApiClientForDefaultSearchPath creates a Cluster API clientset. If the kubeconfigPath is specified then the configuration is loaded from that path.
 // Otherwise the default kubeconfig search path is used.
 // The overrides parameter is used to select a specific context of the config, for example, select the context with a given cluster name or namespace.
@@ -63,15 +54,6 @@ func NewClusterApiClientForDefaultSearchPath(kubeconfigPath string, overrides cl
 	return clientset.NewForConfig(config)
 }
 
-// NewClusterApiClientForKubeconfig creates a Cluster API clientset for the given kubeconfig string.
-func NewClusterApiClientForKubeconfig(kubeconfig string) (*clientset.Clientset, error) {
-	config, err := newRestConfigForKubeconfig(kubeconfig)
-	if err != nil {
-		return nil, err
-	}
-	return clientset.NewForConfig(config)
-}
-
 // NewClientsForDefaultSearchpath creates both a core kubernetes clientset and a cluster-api clientset. If the kubeconfigPath
 // is specified then the configuration is loaded from that path. Otherwise the default kubeconfig search path is used.
 // The overrides parameter is used to select a specific context of the config, for example, select the context with a given cluster name or namespace.

cmd/clusterctl/clusterdeployer/clientfactory.go

@@ -18,7 +18,7 @@ package clusterdeployer
 
 import (
 	"k8s.io/client-go/kubernetes"
-	"sigs.k8s.io/cluster-api/pkg/clientcmd"
+	"sigs.k8s.io/cluster-api/cmd/clusterctl/clientcmd"
 )
 
 type clientFactory struct {

cmd/clusterctl/clusterdeployer/clusterclient.go

@@ -27,9 +27,9 @@ import (
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	tcmd "k8s.io/client-go/tools/clientcmd"
+	"sigs.k8s.io/cluster-api/cmd/clusterctl/clientcmd"
 	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 	"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
-	"sigs.k8s.io/cluster-api/pkg/clientcmd"
 	"sigs.k8s.io/cluster-api/pkg/util"
 
 	"github.com/golang/glog"

cmd/clusterctl/cmd/delete_cluster.go

@@ -21,10 +21,10 @@ import (
 
 	"k8s.io/api/core/v1"
 	tcmd "k8s.io/client-go/tools/clientcmd"
+	"sigs.k8s.io/cluster-api/cmd/clusterctl/clientcmd"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap/minikube"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/providercomponents"
-	"sigs.k8s.io/cluster-api/pkg/clientcmd"
 
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"

cmd/clusterctl/cmd/validate_cluster.go

@@ -19,15 +19,18 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"sigs.k8s.io/cluster-api/pkg/apis"
+	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/spf13/cobra"
+
 	tcmd "k8s.io/client-go/tools/clientcmd"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/validation"
-	"sigs.k8s.io/cluster-api/pkg/clientcmd"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
 type ValidateClusterOptions struct {
-	Kubeconfig          string
 	KubeconfigOverrides tcmd.ConfigOverrides
 }
 
@@ -47,25 +50,30 @@ var validateClusterCmd = &cobra.Command{
 }
 
 func init() {
-	validateClusterCmd.Flags().StringVarP(
-		&vco.Kubeconfig, "kubeconfig", "", "",
-		"The file path of the kubeconfig file for the cluster to validate.. If not specified, $KUBECONFIG environment variable or ${HOME}/.kube/config is used.")
 	// BindContextFlags will bind the flags cluster, namespace, and user
 	tcmd.BindContextFlags(&vco.KubeconfigOverrides.Context, validateClusterCmd.Flags(), tcmd.RecommendedContextOverrideFlags(""))
 	validateCmd.AddCommand(validateClusterCmd)
 }
 
 func RunValidateCluster() error {
-	clusterApiClient, err := clientcmd.NewClusterApiClientForDefaultSearchPath(vco.Kubeconfig, vco.KubeconfigOverrides)
+	cfg, err := config.GetConfig()
 	if err != nil {
-		return fmt.Errorf("failed to create cluster API client: %v", err)
+		return fmt.Errorf("failed to create client configuration: %v", err)
 	}
-	k8sClient, err := clientcmd.NewCoreClientSetForDefaultSearchPath(vco.Kubeconfig, vco.KubeconfigOverrides)
+	mgr, err := manager.New(cfg, manager.Options{})
 	if err != nil {
-		return fmt.Errorf("failed to create kubernetes client: %v", err)
+		return fmt.Errorf("failed to create manager: %v", err)
+	}
+	// Setup Scheme for all resources
+	if err := apis.AddToScheme(mgr.GetScheme()); err != nil {
+		return fmt.Errorf("failed to add APIs to manager: %v", err)
 	}
 
-	if err = validation.ValidateClusterAPIObjects(os.Stdout, clusterApiClient, k8sClient, vco.KubeconfigOverrides.Context.Cluster, vco.KubeconfigOverrides.Context.Namespace); err != nil {
+	c, err := client.New(mgr.GetConfig(), client.Options{Scheme: mgr.GetScheme(), Mapper: mgr.GetRESTMapper()})
+	if err != nil {
+		return fmt.Errorf("failed to create client: %v", err)
+	}
+	if err = validation.ValidateClusterAPIObjects(os.Stdout, c, vco.KubeconfigOverrides.Context.Cluster, vco.KubeconfigOverrides.Context.Namespace); err != nil {
 		return err
 	}
 

cmd/clusterctl/validation/testdata/fail-to-validate-cluster-object.golden

@@ -1,3 +1,3 @@
-Validating Cluster API objects in namespace "validate-cluster-api-object-output"
+Validating Cluster API objects in namespace "validate-cluster-objects-errors"
 Checking cluster object "test-cluster"... FAIL
 	[CreateError]: Failed to create cluster

cmd/clusterctl/validation/testdata/fail-to-validate-machine-objects-with-errors.golden

@@ -1,4 +1,4 @@
-Validating Cluster API objects in namespace "validate-cluster-api-object-output"
+Validating Cluster API objects in namespace "validate-machine-objects-errors"
 Checking cluster object "test-cluster"... PASS
 Checking machine object "test-machine1"... FAIL
 	[CreateError]: Failed to create machine

cmd/clusterctl/validation/testdata/fail-to-validate-machine-objects-with-noderef-errors.golden

@@ -1,4 +1,4 @@
-Validating Cluster API objects in namespace "validate-cluster-api-object-output"
+Validating Cluster API objects in namespace "validate-machine-objects-node-ref-errors"
 Checking cluster object "test-cluster"... PASS
 Checking machine object "test-machine1"... FAIL
 	The corresponding node "test-node-not-ready" is not ready.

cmd/clusterctl/validation/testdata/validate-cluster-api-object-output-pass.golden

@@ -1,4 +1,4 @@
-Validating Cluster API objects in namespace "validate-cluster-api-object-output"
+Validating Cluster API objects in namespace "validate-cluster-objects"
 Checking cluster object "test-cluster"... PASS
 Checking machine object "test-machine1"... PASS
 Checking machine object "test-machine2"... PASS