Upgrade controller runtime 0.8.3 and K8s 1.20

Makefile

@@ -1,5 +1,5 @@
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true"
+CRD_OPTIONS ?= "crd"
 
 # The Image URL to use in docker build and push
 # IMG_REPO ?= registry.aliyuncs.com/fluid
@@ -188,7 +188,7 @@ ifeq (, $(shell which controller-gen))
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	export GO111MODULE=on ;\
 	go mod init tmp ;\
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen

api/v1alpha1/alluxioruntime_types.go

@@ -254,6 +254,8 @@ type AlluxioRuntimeSpec struct {
 // +kubebuilder:printcolumn:name="Fuse Phase",type="string",JSONPath=`.status.fusePhase`,priority=0
 // +kubebuilder:printcolumn:name="API Gateway",type="string",JSONPath=`.status.apiGateway.endpoint`,priority=10
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=`.metadata.creationTimestamp`,priority=0
+// +kubebuilder:resource:scope=Namespaced
+// +kubebuilder:resource:categories={fluid},shortName=alluxio
 // +genclient
 
 // AlluxioRuntime is the Schema for the alluxioruntimes API
@@ -266,6 +268,7 @@ type AlluxioRuntime struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:scope=Namespaced
 
 // AlluxioRuntimeList contains a list of AlluxioRuntime
 type AlluxioRuntimeList struct {

api/v1alpha1/databackup_types.go

@@ -61,6 +61,8 @@ type DataBackupStatus struct {
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=`.metadata.creationTimestamp`
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Namespaced
+// +kubebuilder:resource:categories={fluid},shortName=backup
 // +genclient
 
 // DataBackup is the Schema for the backup API
@@ -73,6 +75,7 @@ type DataBackup struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:scope=Namespaced
 
 // DataBackupList contains a list of DataBackup
 type DataBackupList struct {

api/v1alpha1/dataload_types.go

@@ -73,6 +73,8 @@ type DataLoadStatus struct {
 // +kubebuilder:printcolumn:name="Duration",type="string",JSONPath=`.status.duration`
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Namespaced
+// +kubebuilder:resource:categories={fluid},shortName=load
 // +genclient
 
 // DataLoad is the Schema for the dataloads API
@@ -85,6 +87,7 @@ type DataLoad struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:scope=Namespaced
 
 // DataLoadList contains a list of DataLoad
 type DataLoadList struct {

api/v1alpha1/dataset_types.go

@@ -261,6 +261,8 @@ type DatasetCondition struct {
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=`.metadata.creationTimestamp`
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Namespaced
+// +kubebuilder:resource:categories={fluid},shortName=dataset
 // +genclient
 
 // Dataset is the Schema for the datasets API
@@ -273,6 +275,7 @@ type Dataset struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:scope=Namespaced
 
 // DatasetList contains a list of Dataset
 type DatasetList struct {

api/v1alpha1/goosefsruntime_types.go

@@ -177,6 +177,8 @@ type GooseFSRuntimeSpec struct {
 // +kubebuilder:printcolumn:name="Fuse Phase",type="string",JSONPath=`.status.fusePhase`,priority=0
 // +kubebuilder:printcolumn:name="API Gateway",type="string",JSONPath=`.status.apiGateway.endpoint`,priority=10
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=`.metadata.creationTimestamp`,priority=0
+// +kubebuilder:resource:scope=Namespaced
+// +kubebuilder:resource:categories={fluid},shortName=goose
 // +genclient
 
 // GooseFSRuntime is the Schema for the goosefsruntimes API
@@ -189,6 +191,7 @@ type GooseFSRuntime struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:scope=Namespaced
 
 // GooseFSRuntimeList contains a list of GooseFSRuntime
 type GooseFSRuntimeList struct {

api/v1alpha1/jindoruntime_types.go

@@ -168,6 +168,8 @@ type JindoRuntimeSpec struct {
 // +kubebuilder:printcolumn:name="Desired Fuses",type="integer",JSONPath=`.status.desiredFuseNumberScheduled`,priority=10
 // +kubebuilder:printcolumn:name="Fuse Phase",type="string",JSONPath=`.status.fusePhase`,priority=0
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=`.metadata.creationTimestamp`,priority=0
+// +kubebuilder:resource:scope=Namespaced
+// +kubebuilder:resource:categories={fluid},shortName=jindo
 // +genclient
 
 // JindoRuntime is the Schema for the jindoruntimes API
@@ -180,6 +182,7 @@ type JindoRuntime struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:scope=Namespaced
 
 // JindoRuntimeList contains a list of JindoRuntime
 type JindoRuntimeList struct {

api/v1alpha1/juicefsruntime_types.go

@@ -127,6 +127,8 @@ type JuiceFSFuseSpec struct {
 // +kubebuilder:printcolumn:name="Ready Fuses",type="integer",JSONPath=`.status.fuseNumberReady`,priority=10
 // +kubebuilder:printcolumn:name="Desired Fuses",type="integer",JSONPath=`.status.desiredFuseNumberScheduled`,priority=10
 // +kubebuilder:printcolumn:name="Fuse Phase",type="string",JSONPath=`.status.fusePhase`,priority=0
+// +kubebuilder:resource:scope=Namespaced
+// +kubebuilder:resource:categories={fluid},shortName=juicefs
 // +genclient
 
 // JuiceFSRuntime is the Schema for the juicefsruntimes API
@@ -139,6 +141,7 @@ type JuiceFSRuntime struct {
 }
 
 //+kubebuilder:object:root=true
+// +kubebuilder:resource:scope=Namespaced
 
 // JuiceFSRuntimeList contains a list of JuiceFSRuntime
 type JuiceFSRuntimeList struct {

charts/fluid/fluid/Chart.yaml

@@ -18,7 +18,7 @@ version: 0.7.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 0.7.0-2d63263
+appVersion: 0.7.0-69f686b
 home: https://github.com/fluid-cloudnative/fluid
 keywords:
   - category:data