new apigroup

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

Author: vincepri

Makefile

@@ -102,11 +102,11 @@ 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/v1alpha2 \
+		--input cluster/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/v1alpha2 \
+		--input-dirs sigs.k8s.io/cluster-api/pkg/apis/cluster/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 \
@@ -120,18 +120,9 @@ generate-clientset: ## Generate a typed clientset
 generate-manifests: ## Generate manifests e.g. CRD, RBAC etc.
 	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go \
 		paths=./pkg/... \
-		crd \
+		crd:trivialVersions=true \
 		rbac:roleName=manager-role \
 		output:crd:dir=./config/crds
-	## Hack for MachineClass. This type has been deprecated in v1alpha2.
-	## Generating the types with the above command results in an error during tests,
-	## specifically `per-version schemas may not all be set to identical values (top-level validation should be used instead)`.
-	## This might be a bug in controller-tools that generates a multi-version CRD where only a single version is available.
-	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go \
-		paths=./pkg/apis/cluster/v1alpha1 \
-		crd:trivialVersions=true \
-		output:crd:dir=./config/crds-v1alpha1
-	cp -f ./config/crds-v1alpha1/cluster.k8s.io_machineclasses.yaml ./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/

config/crds/cluster.k8s.io_clusters.yaml

@@ -23,7 +23,7 @@ import (
 	"sigs.k8s.io/cluster-api/pkg/apis/cluster/common"
 )
 
-const ClusterFinalizer = "cluster.cluster.k8s.io"
+const ClusterFinalizer = "cluster.cluster.sigs.k8s.io"
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

config/crds/cluster.k8s.io_machinedeployments.yaml

@@ -19,5 +19,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=sigs.k8s.io/cluster-api/pkg/apis/cluster
 // +k8s:defaulter-gen=TypeMeta
-// +groupName=cluster.k8s.io
+// +groupName=cluster.sigs.k8s.io
 package v1alpha2

config/crds/cluster.k8s.io_machines.yaml

@@ -25,13 +25,13 @@ import (
 
 const (
 	// MachineFinalizer is set on PrepareForCreate callback.
-	MachineFinalizer = "machine.cluster.k8s.io"
+	MachineFinalizer = "machine.cluster.sigs.k8s.io"
 
 	// MachineClusterLabelName is the label set on machines linked to a cluster.
-	MachineClusterLabelName = "cluster.k8s.io/cluster-name"
+	MachineClusterLabelName = "cluster.sigs.k8s.io/cluster-name"
 
 	// MachineControlPlaneLabelName is the label set on machines part of a control plane.
-	MachineControlPlaneLabelName = "cluster.k8s.io/control-plane"
+	MachineControlPlaneLabelName = "cluster.sigs.k8s.io/control-plane"
 )
 
 // +genclient

config/crds/cluster.k8s.io_machinesets.yaml

@@ -84,19 +84,19 @@ type MachineSetDeletePolicy string
 
 const (
 	// RandomMachineSetDeletePolicy prioritizes both Machines that have the annotation
-	// "cluster.k8s.io/delete-machine=yes" and Machines that are unhealthy
+	// "cluster.sigs.k8s.io/delete-machine=yes" and Machines that are unhealthy
 	// (Status.ErrorReason or Status.ErrorMessage are set to a non-empty value).
 	// Finally, it picks Machines at random to delete.
 	RandomMachineSetDeletePolicy MachineSetDeletePolicy = "Random"
 
 	// NewestMachineSetDeletePolicy prioritizes both Machines that have the annotation
-	// "cluster.k8s.io/delete-machine=yes" and Machines that are unhealthy
+	// "cluster.sigs.k8s.io/delete-machine=yes" and Machines that are unhealthy
 	// (Status.ErrorReason or Status.ErrorMessage are set to a non-empty value).
 	// It then prioritizes the newest Machines for deletion based on the Machine's CreationTimestamp.
 	NewestMachineSetDeletePolicy MachineSetDeletePolicy = "Newest"
 
 	// OldestMachineSetDeletePolicy prioritizes both Machines that have the annotation
-	// "cluster.k8s.io/delete-machine=yes" and Machines that are unhealthy
+	// "cluster.sigs.k8s.io/delete-machine=yes" and Machines that are unhealthy
 	// (Status.ErrorReason or Status.ErrorMessage are set to a non-empty value).
 	// It then prioritizes the oldest Machines for deletion based on the Machine's CreationTimestamp.
 	OldestMachineSetDeletePolicy MachineSetDeletePolicy = "Oldest"

config/crds/cluster.sigs.k8s.io_clusters.yaml

@@ -21,7 +21,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=sigs.k8s.io/cluster-api/pkg/apis/cluster
 // +k8s:defaulter-gen=TypeMeta
-// +groupName=cluster.k8s.io
+// +groupName=cluster.sigs.k8s.io
 package v1alpha2
 
 import (
@@ -31,7 +31,7 @@ import (
 
 var (
 	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: "cluster.k8s.io", Version: "v1alpha2"}
+	SchemeGroupVersion = schema.GroupVersion{Group: "cluster.sigs.k8s.io", Version: "v1alpha2"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}

config/crds/cluster.sigs.k8s.io_machinedeployments.yaml

@@ -9,6 +9,7 @@ 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",
         "//vendor/k8s.io/client-go/discovery:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",

config/crds/cluster.sigs.k8s.io_machines.yaml

@@ -10,8 +10,11 @@ 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/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",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

config/crds/cluster.sigs.k8s.io_machinesets.yaml

@@ -9,6 +9,7 @@ go_library(
     importpath = "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/scheme",
     visibility = ["//visibility:public"],
     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",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",

pkg/apis/cluster/v1alpha2/cluster_types.go

@@ -0,0 +1,26 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "cluster.go",
+        "cluster_client.go",
+        "doc.go",
+        "generated_expansion.go",
+        "machine.go",
+        "machineclass.go",
+        "machinedeployment.go",
+        "machineset.go",
+    ],
+    importpath = "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//pkg/apis/cluster/v1alpha1:go_default_library",
+        "//pkg/client/clientset_generated/clientset/scheme:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
+        "//vendor/k8s.io/client-go/rest:go_default_library",
+    ],
+)