hongming 5ac915ad2e Merge remote-tracking branch 'upstream/dev' into dev ...

# Conflicts:
#	pkg/apis/iam/v1alpha2/user_types.go

2020-04-10 15:49:31 +08:00

..

options

implement identity provider and built-in oauth server

2020-03-26 15:19:20 +08:00

controllers.go

add cluster controller (#1993)

2020-04-08 00:40:28 +08:00

helper.go

add controllers

2019-03-25 01:38:32 +08:00

server.go

update

2020-04-10 15:41:23 +08:00