Merge pull request #1249 from vincepri/kbv2

🎉 Migrate repo to Kubebuilder v2

Author: k8s-ci-robot

BUILD.bazel

@@ -1,3 +1,4 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@bazel_gazelle//:def.bzl", "gazelle")
 load("//build:run_in_workspace_with_goroot.bzl", "workspace_binary")
 
@@ -20,3 +21,25 @@ workspace_binary(
     args = ["run --fast=false"],
     cmd = "@com_github_golangci_golangci-lint//cmd/golangci-lint",
 )
+
+go_library(
+    name = "go_default_library",
+    srcs = ["main.go"],
+    importpath = "sigs.k8s.io/cluster-api",
+    visibility = ["//visibility:private"],
+    deps = [
+        "//api/v1alpha2:go_default_library",
+        "//controllers:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
+        "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/klog/klogr:go_default_library",
+        "//vendor/sigs.k8s.io/controller-runtime:go_default_library",
+    ],
+)
+
+go_binary(
+    name = "cluster-api-manager",
+    embed = [":go_default_library"],
+    visibility = ["//visibility:public"],
+)

Dockerfile

@@ -13,22 +13,25 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.12.6 as builder
+FROM golang:1.12.7 as builder
 
 ARG ARCH
 
 # Copy in the go src
 WORKDIR ${GOPATH}/src/sigs.k8s.io/cluster-api
-COPY pkg/    pkg/
-COPY cmd/    cmd/
+COPY pkg/ pkg/
+COPY cmd/ cmd/
+COPY api/ api/
+COPY controllers/ controllers/
 COPY vendor/ vendor/
 COPY go.mod go.mod
 COPY go.sum go.sum
+COPY main.go main.go
 
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} GO111MODULE=on GOFLAGS="-mod=vendor" \
     go build -a -ldflags '-extldflags "-static"' \
-    -o manager sigs.k8s.io/cluster-api/cmd/manager
+    -o manager .
 
 # Copy the controller-manager into a thin image
 FROM gcr.io/distroless/static:latest

Makefile

@@ -101,16 +101,17 @@ generate: ## Generate code
 .PHONY: generate-deepcopy
 generate-deepcopy: ## Runs controller-gen to generate deepcopy files
 	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go \
-	object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
-	paths=./pkg/...
+		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
+		paths=./api/...
 
 .PHONY: generate-manifests
 generate-manifests: ## Generate manifests e.g. CRD, RBAC etc.
 	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go \
-		paths=./pkg/... \
+		paths=./api/... \
+		paths=./pkg/controller/... \
 		crd:trivialVersions=true \
 		rbac:roleName=manager-role \
-		output:crd:dir=./config/crds
+		output:crd:dir=./config/crd/bases
 	## Copy files in CI folders.
 	cp -f ./config/rbac/role*.yaml ./config/ci/rbac/
 	cp -f ./config/manager/manager*.yaml ./config/ci/manager/

PROJECT

@@ -1,3 +1,16 @@
-version: "1"
+version: "2"
 domain: x-k8s.io
 repo: sigs.k8s.io/cluster-api
+resources:
+- group: cluster
+  version: v1alpha2
+  kind: Cluster
+- group: cluster
+  version: v1alpha2
+  kind: Machine
+- group: cluster
+  version: v1alpha2
+  kind: MachineSet
+- group: cluster
+  version: v1alpha2
+  kind: MachineDeployment

pkg/apis/cluster/v1alpha2/BUILD.bazel renamed to api/v1alpha2/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
@@ -7,15 +7,14 @@ go_library(
         "cluster_types.go",
         "common_types.go",
         "defaults.go",
-        "doc.go",
+        "groupversion_info.go",
         "machine_phase_types.go",
         "machine_types.go",
         "machinedeployment_types.go",
         "machineset_types.go",
-        "register.go",
         "zz_generated.deepcopy.go",
     ],
-    importpath = "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2",
+    importpath = "sigs.k8s.io/cluster-api/api/v1alpha2",
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/errors:go_default_library",
@@ -30,26 +29,3 @@ go_library(
         "//vendor/sigs.k8s.io/controller-runtime/pkg/scheme:go_default_library",
     ],
 )
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "cluster_types_test.go",
-        "machine_types_test.go",
-        "machinedeployment_types_test.go",
-        "machineset_types_test.go",
-        "v1alpha2_suite_test.go",
-    ],
-    embed = [":go_default_library"],
-    deps = [
-        "//vendor/github.com/onsi/gomega:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
-        "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
-        "//vendor/k8s.io/client-go/rest:go_default_library",
-        "//vendor/sigs.k8s.io/controller-runtime/pkg/client:go_default_library",
-        "//vendor/sigs.k8s.io/controller-runtime/pkg/envtest:go_default_library",
-    ],
-)

pkg/apis/cluster/v1alpha2/cluster_phase_types.go renamed to api/v1alpha2/cluster_phase_types.go

@@ -27,25 +27,6 @@ const (
 	ClusterAnnotationControlPlaneReady = "cluster.x-k8s.io/control-plane-ready"
 )
 
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-/// [Cluster]
-// Cluster is the Schema for the clusters API
-// +k8s:openapi-gen=true
-// +kubebuilder:resource:path=clusters,shortName=cl
-// +kubebuilder:storageversion
-// +kubebuilder:subresource:status
-type Cluster struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   ClusterSpec   `json:"spec,omitempty"`
-	Status ClusterStatus `json:"status,omitempty"`
-}
-
-/// [Cluster]
-
 /// [ClusterSpec]
 // ClusterSpec defines the desired state of Cluster
 type ClusterSpec struct {
@@ -148,7 +129,21 @@ type APIEndpoint struct {
 
 /// [APIEndpoint]
 
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:path=clusters,shortName=cl,scope=Namespaced
+// +kubebuilder:storageversion
+// +kubebuilder:subresource:status
+
+// Cluster is the Schema for the clusters API
+type Cluster struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ClusterSpec   `json:"spec,omitempty"`
+	Status ClusterStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
 
 // ClusterList contains a list of Cluster
 type ClusterList struct {

pkg/apis/cluster/v1alpha2/cluster_types.go renamed to api/v1alpha2/cluster_types.go

@@ -14,13 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// NOTE: Boilerplate only.  Ignore this file.
-
 // Package v1alpha2 contains API Schema definitions for the cluster v1alpha2 API group
-// +k8s:openapi-gen=true
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=sigs.k8s.io/cluster-api/pkg/apis/cluster
-// +k8s:defaulter-gen=TypeMeta
+// +kubebuilder:object:generate=true
 // +groupName=cluster.x-k8s.io
 package v1alpha2
 
@@ -30,17 +25,12 @@ import (
 )
 
 var (
-	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: "cluster.x-k8s.io", Version: "v1alpha2"}
+	// GroupVersion is group version used to register these objects
+	GroupVersion = schema.GroupVersion{Group: "cluster.x-k8s.io", Version: "v1alpha2"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
+	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
 
-	// AddToScheme is required by pkg/client/...
+	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 )
-
-// Resource is required by pkg/client/listers/...
-func Resource(resource string) schema.GroupResource {
-	return SchemeGroupVersion.WithResource(resource).GroupResource()
-}