Add v1alpha2 types 🎉

Signed-off-by: Vince Prignano <[email protected]>

.gitignore

@@ -42,3 +42,5 @@ config/ci/rbac/role_binding.yaml
 config/ci/rbac/role.yaml
 config/ci/manager/manager.yaml
 
+config/crds-v1alpha1
+

CONTRIBUTING.md

@@ -65,8 +65,8 @@ The machine controller should be able to act on a subset of machines that form a
 ### Resources
 
 *   [Cluster Management API KEP](https://github.com/kubernetes/enhancements/blob/master/keps/sig-cluster-lifecycle/0003-cluster-api.md)
-*   [Cluster type](https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/apis/cluster/v1alpha1/cluster_types.go#L40)
-*   [Machine type](https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/apis/cluster/v1alpha1/machine_types.go#L42)
+*   [Cluster type](https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/apis/deprecated/v1alpha1/cluster_types.go#L40)
+*   [Machine type](https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/apis/deprecated/v1alpha1/machine_types.go#L42)
 
 ### Boostrapping
 

Makefile

@@ -102,15 +102,15 @@ generate-clientset: ## Generate a typed clientset
 	go run ./vendor/k8s.io/code-generator/cmd/client-gen/main.go \
 		--clientset-name clientset \
 		--input-base sigs.k8s.io/cluster-api/pkg/apis \
-		--input cluster/v1alpha1 \
+		--input deprecated/v1alpha1,cluster/v1alpha2 \
 		--output-package sigs.k8s.io/cluster-api/pkg/client/clientset_generated \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
 	go run ./vendor/k8s.io/code-generator/cmd/lister-gen/main.go \
-		--input-dirs sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1 \
+		--input-dirs sigs.k8s.io/cluster-api/pkg/apis/deprecated/v1alpha1,sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2 \
 		--output-package sigs.k8s.io/cluster-api/pkg/client/listers_generated \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
 	go run ./vendor/k8s.io/code-generator/cmd/informer-gen/main.go \
-		--input-dirs sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1 \
+		--input-dirs sigs.k8s.io/cluster-api/pkg/apis/deprecated/v1alpha1,sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2 \
 		--versioned-clientset-package sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset \
 		--listers-package sigs.k8s.io/cluster-api/pkg/client/listers_generated \
 		--output-package sigs.k8s.io/cluster-api/pkg/client/informers_generated \
@@ -123,6 +123,7 @@ generate-manifests: ## Generate manifests e.g. CRD, RBAC etc.
 		crd:trivialVersions=true \
 		rbac:roleName=manager-role \
 		output:crd:dir=./config/crds
+	## Copy files in CI folders.
 	cp -f ./config/rbac/role*.yaml ./config/ci/rbac/
 	cp -f ./config/manager/manager*.yaml ./config/ci/manager/
 

cmd/clusterctl/clusterdeployer/BUILD.bazel

@@ -14,7 +14,7 @@ go_library(
         "//cmd/clusterctl/clusterdeployer/provider:go_default_library",
         "//cmd/clusterctl/phases:go_default_library",
         "//cmd/clusterctl/providercomponents:go_default_library",
-        "//pkg/apis/cluster/v1alpha1:go_default_library",
+        "//pkg/apis/cluster/v1alpha2:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
@@ -28,7 +28,7 @@ go_test(
     deps = [
         "//cmd/clusterctl/clusterdeployer/clusterclient:go_default_library",
         "//cmd/clusterctl/clusterdeployer/provider:go_default_library",
-        "//pkg/apis/cluster/v1alpha1:go_default_library",
+        "//pkg/apis/cluster/v1alpha2:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

cmd/clusterctl/clusterdeployer/clusterclient/BUILD.bazel

@@ -10,7 +10,7 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//cmd/clusterctl/clientcmd:go_default_library",
-        "//pkg/apis/cluster/v1alpha1:go_default_library",
+        "//pkg/apis/cluster/v1alpha2:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/util:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",

cmd/clusterctl/clusterdeployer/clusterdeployer.go

@@ -26,7 +26,7 @@ import (
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/provider"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/phases"
-	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
+	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2"
 )
 
 type ClusterDeployer struct {
@@ -237,11 +237,6 @@ func deleteClusterAPIObjectsInAllNamespaces(client clusterclient.Client) error {
 		err = errors.Wrap(err, "error deleting Machines")
 		errorList = append(errorList, err.Error())
 	}
-	klog.Infof("Deleting MachineClasses in all namespaces")
-	if err := client.DeleteMachineClasses(""); err != nil {
-		err = errors.Wrap(err, "error deleting MachineClasses")
-		errorList = append(errorList, err.Error())
-	}
 	klog.Infof("Deleting Clusters in all namespaces")
 	if err := client.DeleteClusters(""); err != nil {
 		err = errors.Wrap(err, "error deleting Clusters")

cmd/clusterctl/clusterdeployer/clusterdeployer_test.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/provider"
-	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
+	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2"
 )
 
 type testClusterProvisioner struct {
@@ -91,7 +91,7 @@ type stringCheckFunc func(string) error
 type testClusterClient struct {
 	ApplyErr                              error
 	DeleteErr                             error
-	WaitForClusterV1alpha1ReadyErr        error
+	WaitForClusterV1alpha2ReadyErr        error
 	GetClustersErr                        error
 	GetClusterErr                         error
 	GetMachineClassesErr                  error
@@ -117,7 +117,6 @@ type testClusterClient struct {
 	ApplyFunc stringCheckFunc
 
 	clusters           map[string][]*clusterv1.Cluster
-	machineClasses     map[string][]*clusterv1.MachineClass
 	machineDeployments map[string][]*clusterv1.MachineDeployment
 	machineSets        map[string][]*clusterv1.MachineSet
 	machines           map[string][]*clusterv1.Machine
@@ -143,8 +142,8 @@ func (c *testClusterClient) GetContextNamespace() string {
 	return c.contextNamespace
 }
 
-func (c *testClusterClient) WaitForClusterV1alpha1Ready() error {
-	return c.WaitForClusterV1alpha1ReadyErr
+func (c *testClusterClient) WaitForClusterV1alpha2Ready() error {
+	return c.WaitForClusterV1alpha2ReadyErr
 }
 
 func (c *testClusterClient) GetCluster(clusterName, namespace string) (*clusterv1.Cluster, error) {
@@ -273,18 +272,6 @@ func (c *testClusterClient) DeleteClusters(ns string) error {
 	return nil
 }
 
-func (c *testClusterClient) DeleteMachineClasses(ns string) error {
-	if c.DeleteMachineClassesErr != nil {
-		return c.DeleteMachineClassesErr
-	}
-	if ns == "" {
-		c.machineClasses = make(map[string][]*clusterv1.MachineClass)
-	} else {
-		delete(c.machineClasses, ns)
-	}
-	return nil
-}
-
 func (c *testClusterClient) DeleteMachineDeployments(ns string) error {
 	if c.DeleteMachineDeploymentsErr != nil {
 		return c.DeleteMachineDeploymentsErr
@@ -490,21 +477,6 @@ func (c *testClusterClient) WaitForResourceStatuses() error {
 	return nil
 }
 
-// TODO: implement GetMachineClasses for testClusterClient and add tests
-func (c *testClusterClient) GetMachineClasses(namespace string) ([]*clusterv1.MachineClass, error) {
-	return c.machineClasses[namespace], c.GetMachineClassesErr
-}
-
-// TODO: implement CreateMachineClass for testClusterClient and add tests
-func (c *testClusterClient) CreateMachineClass(*clusterv1.MachineClass) error {
-	return errors.Errorf("CreateMachineClass Not yet implemented.")
-}
-
-// TODO: implement DeleteMachineClass for testClusterClient and add tests
-func (c *testClusterClient) DeleteMachineClass(namespace, name string) error {
-	return errors.Errorf("DeleteMachineClass Not yet implemented.")
-}
-
 func contains(s []string, e string) bool {
 	exists := false
 	for _, existingNs := range s {
@@ -702,7 +674,7 @@ func TestClusterCreate(t *testing.T) {
 		{
 			name:                                "fail waiting for api ready on bootstrap cluster",
 			targetClient:                        &testClusterClient{ApplyFunc: func(yaml string) error { return nil }},
-			bootstrapClient:                     &testClusterClient{WaitForClusterV1alpha1ReadyErr: errors.New("Test failure")},
+			bootstrapClient:                     &testClusterClient{WaitForClusterV1alpha2ReadyErr: errors.New("Test failure")},
 			namespaceToExpectedInternalMachines: make(map[string]int),
 			namespaceToInputCluster:             map[string][]*clusterv1.Cluster{metav1.NamespaceDefault: getClustersForNamespace(metav1.NamespaceDefault, 1)},
 			cleanupExternal:                     true,
@@ -771,7 +743,7 @@ func TestClusterCreate(t *testing.T) {
 		},
 		{
 			name:                                "fail wait for api ready on target cluster",
-			targetClient:                        &testClusterClient{WaitForClusterV1alpha1ReadyErr: errors.New("Test failure")},
+			targetClient:                        &testClusterClient{WaitForClusterV1alpha2ReadyErr: errors.New("Test failure")},
 			bootstrapClient:                     &testClusterClient{},
 			namespaceToExpectedInternalMachines: make(map[string]int),
 			namespaceToInputCluster:             map[string][]*clusterv1.Cluster{metav1.NamespaceDefault: getClustersForNamespace(metav1.NamespaceDefault, 1)},
@@ -1376,9 +1348,6 @@ func TestClusterDelete(t *testing.T) {
 				for _, machineSets := range testCase.bootstrapClient.machineSets {
 					bootstrapMachineSets = bootstrapMachineSets + len(machineSets)
 				}
-				for _, machineClasses := range testCase.bootstrapClient.machineClasses {
-					bootstrapMachineClasses = bootstrapMachineClasses + len(machineClasses)
-				}
 				for _, clusters := range testCase.targetClient.clusters {
 					targetClusters = targetClusters + len(clusters)
 				}
@@ -1391,9 +1360,6 @@ func TestClusterDelete(t *testing.T) {
 				for _, machineSets := range testCase.targetClient.machineSets {
 					targetMachineSets = targetMachineSets + len(machineSets)
 				}
-				for _, machineClasses := range testCase.targetClient.machineClasses {
-					targetMachineClasses = targetMachineClasses + len(machineClasses)
-				}
 
 				if bootstrapClusters != 0 {
 					t.Fatalf("Unexpected Cluster count in bootstrap cluster. Got: %d, Want: 0", bootstrapClusters)
@@ -1434,10 +1400,8 @@ func generateTestControlPlaneMachines(cluster *clusterv1.Cluster, ns string, nam
 	machines := make([]*clusterv1.Machine, 0, len(names))
 	for _, name := range names {
 		machine := generateTestNodeMachine(cluster, ns, name)
-		machine.Spec = clusterv1.MachineSpec{
-			Versions: clusterv1.MachineVersionInfo{
-				ControlPlane: "1.10.1",
-			},
+		machine.ObjectMeta.Labels = map[string]string{
+			clusterv1.MachineControlPlaneLabelName: "true",
 		}
 		machines = append(machines, machine)
 	}

cmd/clusterctl/clusterdeployer/provider/BUILD.bazel

@@ -6,7 +6,7 @@ go_library(
     importpath = "sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/provider",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/apis/cluster/v1alpha1:go_default_library",
+        "//pkg/apis/cluster/v1alpha2:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes:go_default_library",
     ],
 )

cmd/clusterctl/clusterdeployer/provider/provider.go

@@ -18,7 +18,7 @@ package provider
 
 import (
 	"k8s.io/client-go/kubernetes"
-	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
+	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2"
 )
 
 // Deployer is a deprecated interface for Provider specific logic. Please do not extend or add. This interface should be removed

cmd/clusterctl/phases/BUILD.bazel

@@ -18,7 +18,7 @@ go_library(
         "//cmd/clusterctl/clusterdeployer/bootstrap:go_default_library",
         "//cmd/clusterctl/clusterdeployer/clusterclient:go_default_library",
         "//cmd/clusterctl/clusterdeployer/provider:go_default_library",
-        "//pkg/apis/cluster/v1alpha1:go_default_library",
+        "//pkg/apis/cluster/v1alpha2:go_default_library",
         "//pkg/util:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
         "//vendor/k8s.io/api/apps/v1:go_default_library",
@@ -32,7 +32,7 @@ go_test(
     srcs = ["pivot_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/apis/cluster/v1alpha1:go_default_library",
+        "//pkg/apis/cluster/v1alpha2:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
     ],
 )

cmd/clusterctl/phases/applycluster.go

@@ -20,7 +20,7 @@ import (
 	"github.com/pkg/errors"
 	"k8s.io/klog"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
-	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
+	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2"
 )
 
 func ApplyCluster(client clusterclient.Client, cluster *clusterv1.Cluster) error {

cmd/clusterctl/phases/applyclusterapicomponents.go

@@ -28,5 +28,5 @@ func ApplyClusterAPIComponents(client clusterclient.Client, providerComponents s
 		return errors.Wrap(err, "unable to apply cluster api controllers")
 	}
 
-	return client.WaitForClusterV1alpha1Ready()
+	return client.WaitForClusterV1alpha2Ready()
 }

cmd/clusterctl/phases/applymachines.go

@@ -20,7 +20,7 @@ import (
 	"github.com/pkg/errors"
 	"k8s.io/klog"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
-	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
+	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2"
 )
 
 func ApplyMachines(client clusterclient.Client, namespace string, machines []*clusterv1.Machine) error {