Move v1alpha1 types to deprecated folder

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

Author: vincepri

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,cluster/v1alpha2 \
+		--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,sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2 \
+		--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,sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2 \
+		--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 \

docs/book/common_code/cluster_controller.md

@@ -24,7 +24,7 @@ it's name, namespace, labels, and annotations, etc. `ObjectMeta` contains data
 common to most objects.
 
 {% sample lang="go" %}
-[import:'Cluster'](../../../pkg/apis/cluster/v1alpha1/cluster_types.go)
+[import:'Cluster'](../../../pkg/apis/deprecated/v1alpha1/cluster_types.go)
 {% endmethod %}
 
 {% method %}
@@ -40,7 +40,7 @@ API definitions are meant to live outside of the Cluster API, which will allow
 them to evolve independently of it.
 
 {% sample lang="go" %}
-[import:'ClusterSpec'](../../../pkg/apis/cluster/v1alpha1/cluster_types.go)
+[import:'ClusterSpec'](../../../pkg/apis/deprecated/v1alpha1/cluster_types.go)
 {% endmethod %}
 
 {% method %}
@@ -64,7 +64,7 @@ https://github.com/kubernetes-sigs/cluster-api-provider-gcp/blob/f3145d8810a5c7f
 used in practice.
 
 {% sample lang="go" %}
-[import:'ClusterStatus'](../../../pkg/apis/cluster/v1alpha1/cluster_types.go)
+[import:'ClusterStatus'](../../../pkg/apis/deprecated/v1alpha1/cluster_types.go)
 {% endmethod %}
 
 {% method %}
@@ -93,7 +93,7 @@ If a `Cluster` resource is deleted, the controller will call the actuator's
   - If the `Delete()` method returns true, remove the finalizer, we're done.
 - If the `Cluster` has not been deleted, call the `Reconcile()` method.
 
-[cluster_source]: https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/apis/cluster/v1alpha1/cluster_types.go
+[cluster_source]: https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/apis/deprecated/v1alpha1/cluster_types.go
 
 #### cluster object reconciliation logic
 

docs/book/common_code/machine_controller.md

@@ -37,7 +37,7 @@ example, it's name, namespace, labels, and annotations, etc. `ObjectMeta`
 contains data common to most objects.
 
 {% sample lang="go" %}
-[import:'Machine'](../../../pkg/apis/cluster/v1alpha1/machine_types.go)
+[import:'Machine'](../../../pkg/apis/deprecated/v1alpha1/machine_types.go)
 {% endmethod %}
 
 {% method %}
@@ -62,7 +62,7 @@ command does this [here](https://github.com/kubernetes-sigs/cluster-api/blob/a30
 ```
 
 {% sample lang="go" %}
-[import:'MachineSpec'](../../../pkg/apis/cluster/v1alpha1/machine_types.go)
+[import:'MachineSpec'](../../../pkg/apis/deprecated/v1alpha1/machine_types.go)
 {% endmethod %}
 
 {% method %}
@@ -82,7 +82,7 @@ these providers a `Machine` and it's corresponding `Node` may never be within
 the same cluster. **TODO**: There are open issues to address this.
 
 {% sample lang="go" %}
-[import:'MachineStatus'](../../../pkg/apis/cluster/v1alpha1/machine_types.go)
+[import:'MachineStatus'](../../../pkg/apis/deprecated/v1alpha1/machine_types.go)
 {% endmethod %}
 
 {% method %}
@@ -156,4 +156,4 @@ There are two consequences of this:
 [^1] One reason a `Machine` may not be deleted is if it corresponds to the
 node running the Machine controller.
 
-[machine_types_source]: https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/apis/cluster/v1alpha1/machine_types.go
+[machine_types_source]: https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/apis/deprecated/v1alpha1/machine_types.go

docs/book/common_code/machinedeployment_controller.md

@@ -4,36 +4,36 @@
 ## MachineDeployment
 
 {% sample lang="go" %}
-[import:'MachineDeployment'](../../../pkg/apis/cluster/v1alpha1/machinedeployment_types.go)
+[import:'MachineDeployment'](../../../pkg/apis/deprecated/v1alpha1/machinedeployment_types.go)
 {% endmethod %}
 
 {% method %}
 ## MachineDeploymentSpec
 
 {% sample lang="go" %}
-[import:'MachineDeploymentSpec'](../../../pkg/apis/cluster/v1alpha1/machinedeployment_types.go)
+[import:'MachineDeploymentSpec'](../../../pkg/apis/deprecated/v1alpha1/machinedeployment_types.go)
 {% endmethod %}
 
 {% method %}
 ## MachineDeploymentStrategy
 
 {% sample lang="go" %}
-[import:'MachineDeploymentStrategy'](../../../pkg/apis/cluster/v1alpha1/machinedeployment_types.go)
+[import:'MachineDeploymentStrategy'](../../../pkg/apis/deprecated/v1alpha1/machinedeployment_types.go)
 {% endmethod %}
 
 {% method %}
 ## MachineRollingUpdateDeployment
 
 {% sample lang="go" %}
-[import:'MachineRollingUpdateDeployment'](../../../pkg/apis/cluster/v1alpha1/machinedeployment_types.go)
+[import:'MachineRollingUpdateDeployment'](../../../pkg/apis/deprecated/v1alpha1/machinedeployment_types.go)
 {% endmethod %}
 
 {% method %}
 
 ## MachineDeploymentStatus
 
 {% sample lang="go" %}
-[import:'MachineDeploymentStatus'](../../../pkg/apis/cluster/v1alpha1/machinedeployment_types.go)
+[import:'MachineDeploymentStatus'](../../../pkg/apis/deprecated/v1alpha1/machinedeployment_types.go)
 {% endmethod %}
 
 ## MachineDeployment Controller Semantics

docs/book/common_code/machineset_controller.md

@@ -2,35 +2,35 @@
 
 `MachineSet`s are currently different from `Cluster` and `Machine` resources in
 that they do not define an actuator interface. They are generic controllers
-which implement their intent by modifying provider-specific `Cluster` and 
+which implement their intent by modifying provider-specific `Cluster` and
 `Machine` resources.
 
 {% method %}
 ## MachineSet
 
 {% sample lang="go" %}
-[import:'MachineSet'](../../../pkg/apis/cluster/v1alpha1/machineset_types.go)
+[import:'MachineSet'](../../../pkg/apis/deprecated/v1alpha1/machineset_types.go)
 {% endmethod %}
 
 {% method %}
 ## MachineSetSpec
 
 {% sample lang="go" %}
-[import:'MachineSetSpec'](../../../pkg/apis/cluster/v1alpha1/machineset_types.go)
+[import:'MachineSetSpec'](../../../pkg/apis/deprecated/v1alpha1/machineset_types.go)
 {% endmethod %}
 
 {% method %}
 ## MachineSetTemplateSpec
 
 {% sample lang="go" %}
-[import:'MachineSetTemplateSpec'](../../../pkg/apis/cluster/v1alpha1/machineset_types.go)
+[import:'MachineSetTemplateSpec'](../../../pkg/apis/deprecated/v1alpha1/machineset_types.go)
 {% endmethod %}
 
 {% method %}
 ## MachineSetStatus
 
 {% sample lang="go" %}
-[import:'MachineSetStatus'](../../../pkg/apis/cluster/v1alpha1/machineset_types.go)
+[import:'MachineSetStatus'](../../../pkg/apis/deprecated/v1alpha1/machineset_types.go)
 {% endmethod %}
 
 ## MachineSet Controller Semantics

docs/proposals/20181121-machine-api.md

@@ -129,4 +129,4 @@ revisit the specifics when new patterns start to emerge in core.
 
 ## Types
 
-Please see the full types [here](https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/apis/cluster/v1alpha1/machine_types.go).
+Please see the full types [here](https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/apis/deprecated/v1alpha1/machine_types.go).

pkg/apis/BUILD.bazel

@@ -10,8 +10,8 @@ go_library(
     importpath = "sigs.k8s.io/cluster-api/pkg/apis",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/apis/cluster/v1alpha1:go_default_library",
         "//pkg/apis/cluster/v1alpha2:go_default_library",
+        "//pkg/apis/deprecated/v1alpha1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
     ],
 )

pkg/apis/addtoscheme_cluster_v1alpha1.go

@@ -17,7 +17,7 @@ limitations under the License.
 package apis
 
 import (
-	"sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
+	"sigs.k8s.io/cluster-api/pkg/apis/deprecated/v1alpha1"
 )
 
 func init() {

pkg/apis/deprecated/BUILD.bazel

@@ -0,0 +1,8 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["group.go"],
+    importpath = "sigs.k8s.io/cluster-api/pkg/apis/deprecated",
+    visibility = ["//visibility:public"],
+)

pkg/apis/deprecated/group.go

@@ -0,0 +1,18 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package cluster contains cluster API versions
+package deprecated

pkg/apis/cluster/v1alpha1/BUILD.bazel renamed to pkg/apis/deprecated/v1alpha1/BUILD.bazel

@@ -14,7 +14,7 @@ go_library(
         "register.go",
         "zz_generated.deepcopy.go",
     ],
-    importpath = "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1",
+    importpath = "sigs.k8s.io/cluster-api/pkg/apis/deprecated/v1alpha1",
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/apis/cluster/common:go_default_library",

pkg/apis/cluster/v1alpha1/cluster_types.go renamed to pkg/apis/deprecated/v1alpha1/cluster_types.go

@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:conversion-gen=sigs.k8s.io/cluster-api/pkg/apis/cluster
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=cluster.k8s.io
+// +groupGoName=ClusterDeprecated
 package v1alpha1

pkg/apis/cluster/v1alpha1/cluster_types_test.go renamed to pkg/apis/deprecated/v1alpha1/cluster_types_test.go

@@ -22,6 +22,7 @@ limitations under the License.
 // +k8s:conversion-gen=sigs.k8s.io/cluster-api/pkg/apis/cluster
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=cluster.k8s.io
+// +groupGoName=ClusterDeprecated
 package v1alpha1
 
 import (

pkg/apis/cluster/v1alpha1/common_types.go renamed to pkg/apis/deprecated/v1alpha1/common_types.go

@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["testutil.go"],
-    importpath = "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1/testutil",
+    importpath = "sigs.k8s.io/cluster-api/pkg/apis/deprecated/v1alpha1/testutil",
     visibility = ["//visibility:public"],
-    deps = ["//pkg/apis/cluster/v1alpha1:go_default_library"],
+    deps = ["//pkg/apis/deprecated/v1alpha1:go_default_library"],
 )

pkg/apis/cluster/v1alpha1/defaults.go renamed to pkg/apis/deprecated/v1alpha1/defaults.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 package testutil
 
-import "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
+import "sigs.k8s.io/cluster-api/pkg/apis/deprecated/v1alpha1"
 
 // GetVanillaCluster return a bare minimum functional cluster resource object
 func GetVanillaCluster() v1alpha1.Cluster {

pkg/apis/cluster/v1alpha1/doc.go renamed to pkg/apis/deprecated/v1alpha1/doc.go

@@ -9,8 +9,8 @@ go_library(
     importpath = "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/cluster/v1alpha2:go_default_library",
+        "//pkg/client/clientset_generated/clientset/typed/deprecated/v1alpha1:go_default_library",
         "//vendor/k8s.io/client-go/discovery:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
         "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library",

pkg/apis/cluster/v1alpha1/machine_types.go renamed to pkg/apis/deprecated/v1alpha1/machine_types.go

@@ -10,13 +10,13 @@ go_library(
     importpath = "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/fake",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/apis/cluster/v1alpha1:go_default_library",
         "//pkg/apis/cluster/v1alpha2:go_default_library",
+        "//pkg/apis/deprecated/v1alpha1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1:go_default_library",
-        "//pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1/fake:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/cluster/v1alpha2:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/cluster/v1alpha2/fake:go_default_library",
+        "//pkg/client/clientset_generated/clientset/typed/deprecated/v1alpha1:go_default_library",
+        "//pkg/client/clientset_generated/clientset/typed/deprecated/v1alpha1/fake:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",