Merge pull request #74 from enxebre/drop-machine.io-cluster

Drop machine.io cluster

pkg/e2e/framework/clusterapi.go

@@ -73,7 +73,7 @@ func (f *Framework) DeployClusterAPIStack(clusterAPINamespace, actuatorPrivateKe
 	f.By("Waiting until cluster objects can be listed")
 	err = wait.Poll(PollInterval, PoolClusterAPIDeploymentTimeout, func() (bool, error) {
 		// Any namespace will do just to that one can list cluster objects
-		_, err := f.CAPIClient.MachineV1beta1().Clusters("default").List(metav1.ListOptions{})
+		_, err := f.CAPIClient.ClusterV1alpha1().Clusters("default").List(metav1.ListOptions{})
 		if err != nil {
 			glog.V(2).Infof("unable to list clusters: %v", err)
 			return false, nil

pkg/e2e/framework/clusters.go

@@ -5,15 +5,15 @@ import (
 
 	"github.com/golang/glog"
 
-	machinev1beta1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
+	clusterv1alpha1 "github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 )
 
-func (f *Framework) CreateClusterAndWait(cluster *machinev1beta1.Cluster) {
+func (f *Framework) CreateClusterAndWait(cluster *clusterv1alpha1.Cluster) {
 	f.By(fmt.Sprintf("Creating %q cluster", cluster.Name))
 	err := wait.Poll(PollInterval, PoolTimeout, func() (bool, error) {
-		_, err := f.CAPIClient.MachineV1beta1().Clusters(cluster.Namespace).Create(cluster)
+		_, err := f.CAPIClient.ClusterV1alpha1().Clusters(cluster.Namespace).Create(cluster)
 		if err != nil {
 			glog.V(2).Infof("error creating cluster: %v", err)
 			return false, nil
@@ -23,7 +23,7 @@ func (f *Framework) CreateClusterAndWait(cluster *machinev1beta1.Cluster) {
 	f.ErrNotExpected(err)
 
 	err = wait.Poll(PollInterval, PoolTimeout, func() (bool, error) {
-		_, err := f.CAPIClient.MachineV1beta1().Clusters(cluster.Namespace).Get(cluster.Name, metav1.GetOptions{})
+		_, err := f.CAPIClient.ClusterV1alpha1().Clusters(cluster.Namespace).Get(cluster.Name, metav1.GetOptions{})
 		if err != nil {
 			return false, nil
 		}

pkg/manifests/manifests.go

@@ -24,14 +24,14 @@ func ClusterCRDManifest() *v1beta1.CustomResourceDefinition {
 			APIVersion: "apiextensions.k8s.io/v1beta1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "clusters.machine.openshift.io",
+			Name: "clusters.cluster.k8s.io",
 			Labels: map[string]string{
 				"controller-tools.k8s.io": "1.0",
 			},
 		},
 		Spec: v1beta1.CustomResourceDefinitionSpec{
-			Group:   "machine.openshift.io",
-			Version: "v1beta1",
+			Group:   "cluster.k8s.io",
+			Version: "v1alpha1",
 			Names: v1beta1.CustomResourceDefinitionNames{
 				Plural: "clusters",
 				Kind:   "Cluster",