Commit Graph

2 Commits

Author SHA1 Message Date
runzexia
1a6f563da1 Merge branch 'dev' into devops-refactor
# Conflicts:
#	cmd/controller-manager/app/controllers.go
#	hack/generate_client.sh
#	pkg/client/clientset/versioned/clientset.go
#	pkg/client/clientset/versioned/fake/clientset_generated.go
#	pkg/client/clientset/versioned/fake/register.go
#	pkg/client/clientset/versioned/scheme/register.go
#	pkg/client/informers/externalversions/generic.go
2020-04-01 11:04:09 +08:00
hongming
54fc52c0e3 add user crd
Signed-off-by: hongming <talonwan@yunify.com>
2020-03-28 21:14:43 +08:00