Merge pull request #738 from christopherhein/bug/controller-runtime

[VC]: Update Controller Runtime to 2.9
kubernetes-retired · Jun 27, 2020 · 4734c97 · 4734c97
2 parents fb078af + dbb8cf0
commit 4734c97
Show file tree

Hide file tree

Showing 10 changed files with 9,103 additions and 90 deletions.
diff --git a/incubator/virtualcluster/Makefile b/incubator/virtualcluster/Makefile
@@ -13,6 +13,9 @@ COVERAGE_PACKAGES=$(shell go list ./... | \
 				  grep -v github.com/multi-tenancy/incubator/virtualcluster/pkg/apis | \
 				  grep -v github.com/multi-tenancy/incubator/virtualcluster/cmd)
 
+# CRD_OPTIONS ?= "crd:trivialVersions=true"
+CRD_OPTIONS ?= "crd:trivialVersions=true,maxDescLen=0"
+
 # Build code.
 #
 # Args:
@@ -74,7 +77,7 @@ deploy: manifests
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
-	$(CONTROLLER_GEN) all
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role paths="./..." output:crd:artifacts:config=config/crds
 	hack/make-rules/replace-null.sh
 
 # Run go fmt against code
@@ -86,11 +89,11 @@ vet:
 	go vet ./pkg/... ./cmd/...
 
 # Generate code
-generate:
+generate: controller-gen
 ifndef GOPATH
 	$(error GOPATH not defined, please define GOPATH. Run "go help gopath" to learn more about GOPATH)
 endif
-	go generate ./pkg/... ./cmd/...
+	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 # Build release image.
 #
@@ -114,8 +117,15 @@ docker-push:
 # download controller-gen if necessary
 controller-gen:
 ifeq (, $(shell which controller-gen))
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.1.1
-CONTROLLER_GEN=$(GOPATH)/bin/controller-gen
+	@{ \
+	set -e ;\
+	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
+	cd $$CONTROLLER_GEN_TMP_DIR ;\
+	go mod init tmp ;\
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
+	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
+	}
+CONTROLLER_GEN=$(GOBIN)/controller-gen
 else
 CONTROLLER_GEN=$(shell which controller-gen)
 endif

diff --git a/incubator/virtualcluster/config/crds/tenancy.x-k8s.io_clusterversions.yaml b/incubator/virtualcluster/config/crds/tenancy.x-k8s.io_clusterversions.yaml
diff --git a/...crds/tenancy_v1alpha1_virtualcluster.yaml → ...rds/tenancy.x-k8s.io_virtualclusters.yaml b/...crds/tenancy_v1alpha1_virtualcluster.yaml → ...rds/tenancy.x-k8s.io_virtualclusters.yaml
@@ -1,17 +1,21 @@
+
+---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
-  labels:
-    controller-tools.k8s.io: "1.0"
   name: virtualclusters.tenancy.x-k8s.io
 spec:
   group: tenancy.x-k8s.io
   names:
     kind: VirtualCluster
+    listKind: VirtualClusterList
     plural: virtualclusters
     shortNames:
     - vc
+    singular: virtualcluster
   scope: Namespaced
   validation:
     openAPIV3Schema:
@@ -70,11 +74,13 @@ spec:
               type: string
           required:
           - phase
-          - message
-          - reason
           type: object
       type: object
   version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
 status:
   acceptedNames:
     kind: ""

diff --git a/incubator/virtualcluster/config/crds/tenancy_v1alpha1_clusterversion.yaml b/incubator/virtualcluster/config/crds/tenancy_v1alpha1_clusterversion.yaml
diff --git a/incubator/virtualcluster/doc/demo.md b/incubator/virtualcluster/doc/demo.md
@@ -36,8 +36,8 @@ The binary can be found in `_output/bin/vcctl`.
 ## Install CRDs and all components
 Running following cmds will install all CRDs and create all virtualcluster components.
 ```bash
-kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/multi-tenancy/master/incubator/virtualcluster/config/crds/tenancy_v1alpha1_clusterversion.yaml
-kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/multi-tenancy/master/incubator/virtualcluster/config/crds/tenancy_v1alpha1_virtualcluster.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/multi-tenancy/master/incubator/virtualcluster/config/crds/tenancy.x-k8s.io_clusterversions.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/multi-tenancy/master/incubator/virtualcluster/config/crds/tenancy.x-k8s.io_virtualclusters.yaml
 kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/multi-tenancy/master/incubator/virtualcluster/config/setup/all_in_one.yaml
 ```
 

diff --git a/incubator/virtualcluster/pkg/apis/apis.go b/incubator/virtualcluster/pkg/apis/apis.go
@@ -14,9 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Generate deepcopy for apis
-//go:generate go run k8s.io/code-generator/cmd/deepcopy-gen -O zz_generated.deepcopy -i ./... -h ../../hack/boilerplate.go.txt
-
 // Package apis contains Kubernetes API groups.
 package apis
 

diff --git a/incubator/virtualcluster/pkg/apis/tenancy/v1alpha1/clusterversion_types.go b/incubator/virtualcluster/pkg/apis/tenancy/v1alpha1/clusterversion_types.go
@@ -40,19 +40,23 @@ type StatefulSetSvcBundle struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// StatefulSet that manages the specified component
+	// +kubebuilder:validation:XEmbeddedResource
 	StatefulSet *appsv1.StatefulSet `json:"statefulset,omitempty"`
 
 	// Service that exposes the StatefulSet
+	// +kubebuilder:validation:XEmbeddedResource
 	Service *corev1.Service `json:"service,omitempty"`
 }
 
 // ClusterVersionStatus defines the observed state of ClusterVersion
 type ClusterVersionStatus struct {
 }
 
+// +kubebuilder:object:root=true
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +genclient:nonNamespaced
+// +kubebuilder:resource:scope=Cluster,shortName=cv
 
 // ClusterVersion is the Schema for the clusterversions API
 // +k8s:openapi-gen=true
@@ -64,6 +68,7 @@ type ClusterVersion struct {
 	Status ClusterVersionStatus `json:"status,omitempty"`
 }
 
+// +kubebuilder:object:root=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +genclient:nonNamespaced
 

diff --git a/incubator/virtualcluster/pkg/apis/tenancy/v1alpha1/doc.go b/incubator/virtualcluster/pkg/apis/tenancy/v1alpha1/doc.go
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 // Package v1alpha1 contains API Schema definitions for the tenancy v1alpha1 API group
+// +kubebuilder:object:generate=true
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=sigs.k8s.io/multi-tenancy/incubator/virtualcluster/pkg/apis/tenancy

diff --git a/incubator/virtualcluster/pkg/apis/tenancy/v1alpha1/virtualcluster_types.go b/incubator/virtualcluster/pkg/apis/tenancy/v1alpha1/virtualcluster_types.go
@@ -110,6 +110,9 @@ type ClusterCondition struct {
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:shortName=vc
+// +k8s:openapi-gen=true
 
 // VirtualCluster is the Schema for the virtualclusters API
 // +k8s:openapi-gen=true
@@ -121,6 +124,7 @@ type VirtualCluster struct {
 	Status VirtualClusterStatus `json:"status,omitempty"`
 }
 
+// +kubebuilder:object:root=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // VirtualClusterList contains a list of VirtualCluster

diff --git a/incubator/virtualcluster/pkg/apis/tenancy/v1alpha1/zz_generated.deepcopy.go b/incubator/virtualcluster/pkg/apis/tenancy/v1alpha1/zz_generated.deepcopy.go