Commit Graph

1257 Commits

Author SHA1 Message Date
runzexia
d8259160b8 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
2020-04-15 11:33:05 +08:00
runzexia
9a6ba04a37 clean old devops code
todo impl use informer

Signed-off-by: runzexia <runzexia@yunify.com>
2020-04-15 11:03:08 +08:00
hongming
bb9e12be3d fix iam admission webhook (#2008)
Signed-off-by: hongming <talonwan@yunify.com>
2020-04-14 00:15:18 +08:00
KubeSphere CI Bot
864b244cc3 Merge pull request #2005 from wansir/token-cache-config
token cache config
2020-04-13 19:50:21 +08:00
hongming
3ce4a0d77c token cache config
Signed-off-by: hongming <talonwan@yunify.com>
2020-04-13 19:14:41 +08:00
KubeSphere CI Bot
ff2523e515 Merge pull request #1984 from huanggze/dev-monitoring
monitor: add tests
2020-04-13 14:14:20 +08:00
zryfish
372a52e70e monitor: add tests
Signed-off-by: huanggze <loganhuang@yunify.com>
2020-04-13 09:37:37 +08:00
KubeSphere CI Bot
17013d3519 Merge pull request #1989 from wansir/dev
add iam crd
2020-04-12 21:21:21 +08:00
hongming
8d18fc3657 update
Signed-off-by: hongming <talonwan@yunify.com>
2020-04-12 18:56:33 +08:00
zryfish
c3c6ed8898 fix proxy bug (#2002) 2020-04-11 21:05:40 +08:00
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
hongming
a3d3c8e427 update
Signed-off-by: hongming <talonwan@yunify.com>
2020-04-10 15:41:23 +08:00
zryfish
6b4fd9b8fa Update build.yml 2020-04-10 15:21:10 +08:00
zryfish
dd5b96254c fix cluster bug (#1997) 2020-04-10 14:47:41 +08:00
zryfish
69c6d91fdb fix cluster controller (#1996) 2020-04-10 12:37:05 +08:00
hongming
0e814bb5e4 add iam crd
Signed-off-by: hongming <talonwan@yunify.com>
2020-04-10 04:05:23 +08:00
zryfish
e174dcb3d6 add cluster controller (#1993) 2020-04-08 00:40:28 +08:00
zryfish
cfaeb10dc6 add cluster api group (#1992) 2020-04-07 19:33:45 +08:00
runzexia
56482f1feb fmt
Signed-off-by: runzexia <runzexia@yunify.com>
2020-04-02 10:29:47 +08:00
runzexia
7a6b27d77b Merge branch 'dev' into devops-refactor 2020-04-02 10:25:36 +08:00
runzexia
2aa343465e update
Signed-off-by: runzexia <runzexia@yunify.com>
2020-04-02 10:21:34 +08:00
zryfish
3c73471f79 fix path authorizer give no opinion on resource requests (#1981) 2020-04-01 17:41:50 +08:00
runzexia
449b5e042e trigger GitHub actions 2020-04-01 17:28:25 +08:00
runzexia
559c1fcf76 clean old devops code
todo impl use informer

Signed-off-by: runzexia <runzexia@yunify.com>
2020-04-01 15:54:57 +08:00
zryfish
c8dc3a4044 fix requestinfo bug (#1980) 2020-04-01 15:50:57 +08:00
zryfish
95f6d75c19 fix proxy host bug (#1977) 2020-04-01 15:23:29 +08:00
runzexia
c80a17f4b4 sonar handler init 2020-04-01 15:21:15 +08:00
runzexia
9ec99d1a63 clean import 2020-04-01 15:11:19 +08:00
runzexia
09576fdc15 updatee 2020-04-01 15:06:30 +08:00
runzexia
564d39caf0 clean codee 2020-04-01 12:04:05 +08:00
runzexia
30be09e012 refmt 2020-04-01 11:10:07 +08:00
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
KubeSphere CI Bot
1bf8beb1e6 Merge pull request #1971 from wansir/dev
implement identity provider and built-in oauth server
2020-03-31 07:32:17 +08:00
hongming
34dfc2048a add default oauth client
Signed-off-by: hongming <talonwan@yunify.com>
2020-03-30 19:40:57 +08:00
hongming
4746c72806 Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	hack/generate_client.sh
2020-03-30 15:48:10 +08:00
hongming
0d2279f5e4 fix somme error in controller-manager
Signed-off-by: hongming <talonwan@yunify.com>
2020-03-30 15:40:03 +08:00
runzexia
d55fcdcfe4 remove check role
Signed-off-by: runzexia <runzexia@yunify.com>
2020-03-30 15:02:12 +08:00
runzexia
8892c63adb Merge branch 'dev' into devops-refactor 2020-03-30 10:26:13 +08:00
zryfish
7121e3609c move agent crd to kubesphere (#1974) 2020-03-29 16:49:11 +08:00
hongming
54fc52c0e3 add user crd
Signed-off-by: hongming <talonwan@yunify.com>
2020-03-28 21:14:43 +08:00
hongming
96a1d3825e update
Signed-off-by: hongming <talonwan@yunify.com>
2020-03-28 14:09:39 +08:00
runzexia
443eb3f74c enable controller
Signed-off-by: runzexia <runzexia@yunify.com>
2020-03-27 15:20:53 +08:00
runzexia
f827116a1d add credential usage hander
Signed-off-by: runzexia <runzexia@yunify.com>
2020-03-27 15:03:17 +08:00
runzexia
98fed531ac refmt
Signed-off-by: runzexia <runzexia@yunify.com>
2020-03-27 11:25:56 +08:00
runzexia
2fce04efd3 fix ut test
Signed-off-by: runzexia <runzexia@yunify.com>
2020-03-27 11:19:37 +08:00
runzexia
f411bec10b add ut test 2020-03-27 10:52:39 +08:00
zryfish
96ddf4cfa0 add workflow to dev branch (#1972) 2020-03-27 10:35:10 +08:00
hongming
9b9d4021ec implement identity provider and built-in oauth server
Signed-off-by: hongming <talonwan@yunify.com>
2020-03-26 15:19:20 +08:00
runzexia
af3b87ddca add devops credential controller
Signed-off-by: runzexia <runzexia@yunify.com>
2020-03-26 14:53:33 +08:00
runzexia
e8b9d9cdf3 add pipeline openapi docs
Signed-off-by: runzexia <runzexia@yunify.com>
2020-03-25 11:01:51 +08:00