Commit Graph

56 Commits

Author SHA1 Message Date
hongming
8976ee242f remove useless go moudle
Signed-off-by: hongming <talonwan@yunify.com>
2020-04-29 10:28:25 +08:00
hongming
b7a2705ac9 Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	go.mod
#	pkg/apiserver/apiserver.go
#	pkg/apiserver/config/config.go
2020-04-28 00:52:30 +08:00
hongming
7db2ba662c migrate legacy API
Signed-off-by: hongming <talonwan@yunify.com>
2020-04-28 00:45:12 +08:00
huanggze
fc56333d3c monitoring: some bug fix
Signed-off-by: huanggze <loganhuang@yunify.com>
2020-04-24 21:00:59 +08:00
KubeSphere CI Bot
3f89eaef7e Merge pull request #2016 from huanggze/dev-fix
fix isRangeQuery
2020-04-21 13:37:23 +08:00
KubeSphere CI Bot
3f1efb8e45 Merge pull request #2007 from huanggze/dev-custom
feat: custom monitoring
2020-04-20 20:04:22 +08:00
huanggze
dd78c1a036 feat: custom monitoring
Signed-off-by: huanggze <loganhuang@yunify.com>
2020-04-20 17:33:06 +08:00
KubeSphere CI Bot
d2a8b27a76 Merge pull request #1985 from zheng1/sdn
Add network topology APIs
2020-04-19 09:40:21 +08:00
Zhengyi Lai
8ad17a4648 Add network configuration to apiserver/config 2020-04-17 23:27:57 +08:00
huanggze
9709161540 fix isRangeQuery
Signed-off-by: huanggze <loganhuang@yunify.com>
2020-04-17 16:48:07 +08:00
huanggze
6ef372a923 upgrade monitoring api version (#2015)
Signed-off-by: huanggze <loganhuang@yunify.com>
2020-04-17 16:00:01 +08:00
Zhengyi Lai
828f7726fd Add network topology APIs
Signed-off-by: Zhengyi Lai <zheng1@yunify.com>
2020-04-16 16:13:06 +08:00
zryfish
b51013333d Fix openapi schema (#2013)
* fix openapi spec

fix openapi schema bug

* fix api schema bug
2020-04-16 15:27:19 +08:00
hongming
5f951508c5 migrate legacy API
Signed-off-by: hongming <talonwan@yunify.com>
2020-04-15 16:59:13 +08:00
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
zryfish
372a52e70e monitor: add tests
Signed-off-by: huanggze <loganhuang@yunify.com>
2020-04-13 09:37:37 +08:00
hongming
8d18fc3657 update
Signed-off-by: hongming <talonwan@yunify.com>
2020-04-12 18:56:33 +08:00
hongming
a3d3c8e427 update
Signed-off-by: hongming <talonwan@yunify.com>
2020-04-10 15:41:23 +08:00
hongming
0e814bb5e4 add iam crd
Signed-off-by: hongming <talonwan@yunify.com>
2020-04-10 04:05:23 +08:00
runzexia
7a6b27d77b Merge branch 'dev' into devops-refactor 2020-04-02 10:25:36 +08:00
zryfish
3c73471f79 fix path authorizer give no opinion on resource requests (#1981) 2020-04-01 17:41:50 +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
runzexia
c80a17f4b4 sonar handler init 2020-04-01 15:21:15 +08:00
runzexia
564d39caf0 clean codee 2020-04-01 12:04:05 +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
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
hongming
96a1d3825e update
Signed-off-by: hongming <talonwan@yunify.com>
2020-03-28 14:09:39 +08:00
runzexia
f827116a1d add credential usage hander
Signed-off-by: runzexia <runzexia@yunify.com>
2020-03-27 15:03:17 +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
23c8d71a5a pipeline crd
Signed-off-by: runzexia <runzexia@yunify.com>
2020-03-25 10:58:39 +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
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
zryfish
eb8a3c0dc6 refactor authentication (#1950) 2020-03-15 17:55:55 +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
runzexia
7270307b66 fix devops go vet (#1928)
Signed-off-by: runzexia <runzexia@yunify.com>
2020-03-07 12:46:09 +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
a9e1183f3c code refactor (#1924)
* code refactor

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

* code refactor

Signed-off-by: hongming <talonwan@yunify.com>
2020-02-26 10:08:13 +08:00
hongming
570ef8b60a code refactor (#1923)
Signed-off-by: hongming <talonwan@yunify.com>
2020-02-25 20:47:59 +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