Merge branch 'dev' into devops-refactor

# Conflicts:
#	Makefile
#	api/api-rules/violation_exceptions.list
#	api/openapi-spec/swagger.json
#	cmd/controller-manager/app/controllers.go
#	hack/generate_client.sh
#	pkg/apis/cluster/v1alpha1/openapi_generated.go
#	pkg/client/informers/externalversions/generic.go
#	pkg/kapis/tenant/v1alpha2/register.go
#	pkg/models/tenant/devops.go
#	pkg/models/tenant/workspaces.go
#	pkg/simple/client/devops/fake/fakedevops.go
#	tools/cmd/crd-doc-gen/main.go

cmd/controller-manager/app/controllers.go

@@ -137,6 +137,7 @@ func AddControllers(
 		"pipeline-controller":         devopsPipelineController,
 		"devopscredential-controller": devopsCredentialController,
 		"cluster-controller":         clusterController,
+		"user-controller":            userController,
 	}
 
 	for name, ctrl := range controllers {