Commit Graph

248 Commits

Author SHA1 Message Date
hongming
4746c72806 Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	hack/generate_client.sh
2020-03-30 15:48:10 +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
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
hongming
aa05c2baf4 update
Signed-off-by: hongming <talonwan@yunify.com>
2020-03-22 23:17:43 +08:00
hongming
cae7843832 update
Signed-off-by: hongming <talonwan@yunify.com>
2020-03-22 15:57:29 +08:00
hongming
b9bdcd824c update
Signed-off-by: hongming <talonwan@yunify.com>
2020-03-22 04:29:06 +08:00
hongming
aadb5e91e8 update
Signed-off-by: hongming <talonwan@yunify.com>
2020-03-21 20:31:01 +08:00
hongming
1f26e62105 update
Signed-off-by: hongming <talonwan@yunify.com>
2020-03-21 18:52:28 +08:00
hongming
9769357005 update
Signed-off-by: hongming <talonwan@yunify.com>
2020-03-20 02:16:11 +08:00
hongming
23f6be88c6 implement authorizer filter
Signed-off-by: hongming <talonwan@yunify.com>
2020-03-19 11:17:21 +08:00
zryfish
0a07e5f652 refactor authentication (#1951)
* refactor authentication

* refactor authentication
2020-03-15 23:26:32 +08:00
zryfish
eb8a3c0dc6 refactor authentication (#1950) 2020-03-15 17:55:55 +08:00
zryfish
abf0d66b22 Add more tests (#1949)
* add more test code

* add more test code
2020-03-15 10:22:39 +08:00
zryfish
f8e7d06b07 move apigateway into apiserver (#1948) 2020-03-13 21:57:48 +08:00
zryfish
641615b299 This is a huge commit, it does following things: (#1942)
1. Remove ks-iam standalone binary, move it to ks-apiserver
2. Generate all devops apis inside kubesphere repository, no need to
import s2ioperator.
3. Reorganize ldap code, make it more flexible to use.
2020-03-10 13:50:17 +08:00
Guangzhe Huang
148a804726 refactor monitoring (#1751)
Signed-off-by: huanggze <loganhuang@yunify.com>
2020-03-07 12:34:52 +08:00
Guangzhe Huang
6c6bfb2677 [WIP] logging refactor (#1794)
* refactor logging

Signed-off-by: huanggze <loganhuang@yunify.com>

* refactor logging

Signed-off-by: huanggze <loganhuang@yunify.com>
2020-03-02 10:53:43 +08:00
hongming
0664eeb559 code refactor (#1922)
Signed-off-by: hongming <talonwan@yunify.com>
2020-02-25 18:16:51 +08:00
hongming
abf9fee845 code refactor (#1786)
* implement LDAP mock client

Signed-off-by: hongming <talonwan@yunify.com>

* update

Signed-off-by: hongming <talonwan@yunify.com>

* update

Signed-off-by: hongming <talonwan@yunify.com>

* resolve conflict

Signed-off-by: hongming <talonwan@yunify.com>
2020-02-24 15:39:36 +08:00
runzexia
96aee0e60b Devops refactor (#1894)
* add devops client interface

Signed-off-by: runzexia <runzexia@yunify.com>

* direct return jenkins

Signed-off-by: runzexia <runzexia@yunify.com>

* add some interface

Signed-off-by: runzexia <runzexia@yunify.com>

* update

Signed-off-by: runzexia <runzexia@yunify.com>

* update interface

Signed-off-by: runzexia <runzexia@yunify.com>

* update

Signed-off-by: runzexia <runzexia@yunify.com>

* credential op structs

Signed-off-by: runzexia <runzexia@yunify.com>

* status

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* update interface

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* credential handler

Signed-off-by: runzexia <runzexia@yunify.com>

* update devopsoperator func

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* get build sonar

Signed-off-by: runzexia <runzexia@yunify.com>

* sonar handler

* mv code to cilent

Signed-off-by: runzexia <runzexia@yunify.com>

* update

Signed-off-by: runzexia <runzexia@yunify.com>

* project member handler

Signed-off-by: runzexia <runzexia@yunify.com>

* update pipeline operator interface

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add tenant devops handler

Signed-off-by: runzexia <runzexia@yunify.com>

* update merge

Signed-off-by: runzexia <runzexia@yunify.com>

* clean

Signed-off-by: runzexia <runzexia@yunify.com>

* fmt

Signed-off-by: runzexia <runzexia@yunify.com>

* update ListPipelineRuns

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* complate pipelineOperator interface

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* update HttpParameters

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add pipeline steps interface

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* update pipeline GetNodesDetail

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add s2i api

Signed-off-by: runzexia <runzexia@yunify.com>

* add branch pipeline interface and update handler

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add scan branch interface and update handler

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add common interface and update handler

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add SCM interface and update handler

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add handler

Signed-off-by: runzexia <runzexia@yunify.com>

* add fake s3

Signed-off-by: runzexia <runzexia@yunify.com>

* add webhook&check interface and update handler

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* clean

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* clean

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* format

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add some func

Signed-off-by: runzexia <runzexia@yunify.com>

* clean code

Signed-off-by: runzexia <runzexia@yunify.com>

* implement interface

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* fix interface GetBranchArtifacts

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add s2ibinary upload test

Signed-off-by: runzexia <runzexia@yunify.com>

* tenant devops

Signed-off-by: runzexia <runzexia@yunify.com>

* update tenant

Signed-off-by: runzexia <runzexia@yunify.com>

* fake

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add some unit test

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add devops tenant handler

Signed-off-by: runzexia <runzexia@yunify.com>

* status

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* status

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* status

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* update fake test

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* update unit test and fake data

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* update

* enable devops client

Signed-off-by: runzexia <runzexia@yunify.com>

* enable devops client

Signed-off-by: runzexia <runzexia@yunify.com>

Co-authored-by: Xiaoyang Zhu <sunzhu@yunify.com>
2020-02-24 15:39:04 +08:00
runzexia
c5a340a2b4 devops refactor (#1739)
* add devops client interface

Signed-off-by: runzexia <runzexia@yunify.com>

* direct return jenkins

Signed-off-by: runzexia <runzexia@yunify.com>

* add some interface

Signed-off-by: runzexia <runzexia@yunify.com>

* update

Signed-off-by: runzexia <runzexia@yunify.com>

* update interface

Signed-off-by: runzexia <runzexia@yunify.com>

* update

Signed-off-by: runzexia <runzexia@yunify.com>

* credential op structs

Signed-off-by: runzexia <runzexia@yunify.com>

* status

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* update interface

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* credential handler

Signed-off-by: runzexia <runzexia@yunify.com>

* update devopsoperator func

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* get build sonar

Signed-off-by: runzexia <runzexia@yunify.com>

* sonar handler

* mv code to cilent

Signed-off-by: runzexia <runzexia@yunify.com>

* update

Signed-off-by: runzexia <runzexia@yunify.com>

* project member handler

Signed-off-by: runzexia <runzexia@yunify.com>

* update pipeline operator interface

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add tenant devops handler

Signed-off-by: runzexia <runzexia@yunify.com>

* update merge

Signed-off-by: runzexia <runzexia@yunify.com>

* clean

Signed-off-by: runzexia <runzexia@yunify.com>

* fmt

Signed-off-by: runzexia <runzexia@yunify.com>

* update ListPipelineRuns

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* complate pipelineOperator interface

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* update HttpParameters

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add pipeline steps interface

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* update pipeline GetNodesDetail

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add s2i api

Signed-off-by: runzexia <runzexia@yunify.com>

* add branch pipeline interface and update handler

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add scan branch interface and update handler

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add common interface and update handler

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add SCM interface and update handler

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add handler

Signed-off-by: runzexia <runzexia@yunify.com>

* add fake s3

Signed-off-by: runzexia <runzexia@yunify.com>

* add webhook&check interface and update handler

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* clean

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* clean

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* format

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add some func

Signed-off-by: runzexia <runzexia@yunify.com>

* clean code

Signed-off-by: runzexia <runzexia@yunify.com>

* implement interface

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* fix interface GetBranchArtifacts

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add s2ibinary upload test

Signed-off-by: runzexia <runzexia@yunify.com>

* tenant devops

Signed-off-by: runzexia <runzexia@yunify.com>

* update tenant

Signed-off-by: runzexia <runzexia@yunify.com>

* fake

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add some unit test

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* add devops tenant handler

Signed-off-by: runzexia <runzexia@yunify.com>

* status

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* status

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* status

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* update fake test

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* update unit test and fake data

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

* update

Co-authored-by: Xiaoyang Zhu <sunzhu@yunify.com>
2020-02-04 10:40:36 +08:00
hongming
71849f028f [WIP] API refactor (#1737)
* refactor openpitrix API

Signed-off-by: hongming <talonwan@yunify.com>

* add openpitrix mock client

Signed-off-by: hongming <talonwan@yunify.com>

* refactor tenant API

Signed-off-by: hongming <talonwan@yunify.com>

* refactor IAM API

Signed-off-by: hongming <talonwan@yunify.com>

* refactor IAM API

Signed-off-by: hongming <talonwan@yunify.com>
2020-01-13 13:36:21 +08:00
zryfish
c40d1542a2 refactor code structure (#1738) 2020-01-04 12:44:54 +08:00
zryfish
eceadec69c devlopment branch (#1736) 2020-01-02 20:52:00 +08:00
zehuaiWANG
3b927ba847 kubesphere-add-default-param 2019-12-03 10:38:47 +08:00
hongming
981669ca5a fix openpitrix resource sort param
Signed-off-by: hongming <talonwan@yunify.com>
2019-11-08 17:13:26 +08:00
hongming
2c52a7064c refactor kubectl websocket API
Signed-off-by: hongming <talonwan@yunify.com>
2019-11-07 13:29:42 +08:00
runzexia
e72b0be0c9 job rerun with resourceVersion
Signed-off-by: runzexia <runzexia@yunify.com>
2019-11-06 21:22:01 +08:00
hongming
0177baf916 fix: privilege escalation
Signed-off-by: hongming <talonwan@yunify.com>
2019-10-31 15:47:49 +08:00
hongming
6110889922 fix: deployed instances counting error
Signed-off-by: hongming <talonwan@yunify.com>
2019-10-24 14:39:45 +08:00
hongming
2352e2a526 support application sorting
Signed-off-by: hongming <talonwan@yunify.com>
2019-10-21 15:32:12 +08:00
KubeSphere CI Bot
7a6935ff17 Merge pull request #607 from wansir/token-management
feat: token management
2019-10-18 16:23:46 +08:00
hongming
2024e928a2 feat: support resource owner password credentials grant
Signed-off-by: hongming <talonwan@yunify.com>
2019-10-18 16:08:56 +08:00
huanggze
1a40f49416 explicate file type
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-10-17 15:07:29 +08:00
hongming
26a7f2b75e fix: add missing parameter
Signed-off-by: hongming <talonwan@yunify.com>
2019-10-15 10:33:21 +08:00
KubeSphere CI Bot
f9fe577df3 Merge pull request #811 from wansir/refactor-openpitrix
fix: filter app template in built-in repo
2019-09-29 12:37:57 +08:00
hongming
bfb8924eb3 refactor: openpitrix module
Signed-off-by: hongming <talonwan@yunify.com>
2019-09-29 10:38:24 +08:00
runzexia
f6c616f1e9 parse 401 err, change code to 428
Signed-off-by: runzexia <runzexia@yunify.com>
2019-09-27 23:50:07 +08:00
huanggze
bbfb546246 log: fix crash if api caller has no access to provided namespaces
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-09-27 16:22:24 +08:00
KubeSphere CI Bot
24b0a97396 Merge pull request #668 from wansir/refactor-openpitrix
refactor: openpitrix module
2019-09-26 14:00:11 +08:00
hongming
1b5681c12b refactor: openpitrix module
Signed-off-by: hongming <talonwan@yunify.com>
2019-09-26 13:41:00 +08:00
huanggze
a71b35db9c feat: allow to export logs
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-09-25 14:03:47 +08:00
KubeSphere CI Bot
3fc4207585 Merge pull request #756 from huanggze/monitor-2.1-a
refactor monitor module
2019-09-19 13:44:53 +08:00
huanggze
df6ed5e995 refactor monitor module
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-09-18 15:53:25 +08:00
Jeff
f61c5e09ba refactor logging options 2019-09-17 16:00:54 +08:00
Jeff
97c9a1786a 1. change glog to klog
2. move types to api package to avoid cyclic import
2019-09-16 18:46:28 +08:00
Jeff
96d2ac4112 This is a huge commit, it does following things:
1. refactor kubesphere dependency service client creation, we can
disable dependency by config
2. dependencies can be configured by configuration file
3. refactor cmd package using cobra.Command, so we can use hypersphere
to invoke command sepearately. Later we only need to build one image to
contains all kubesphere core components. One command to rule them all!
4. live reloading configuration currently not implemented
2019-09-11 19:53:35 +08:00
KubeSphere CI Bot
52a1c2e619 Merge pull request #689 from huanggze/log-resource-name
refine log search
2019-09-11 19:12:49 +08:00