admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,890 Commits 13 Branches 51 Tags
5e02f1b86bdc03bcce06fc9654b6eb1002dc61be
Commit Graph

2890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Duan Jiong
fc373b18e3 update workspace spec 
Add field networkIsolate in workspace spec, in order to support workspace network isolate

Signed-off-by: Duan Jiong <djduanjiong@gmail.com>
 2020-04-28 10:06:54 +08:00
Duan Jiong
26d014302e namespace: add namespace label 
in order to select namespace when convert nsnp to k8snp

Signed-off-by: Duan Jiong <djduanjiong@gmail.com>
 2020-04-28 10:06:53 +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
zryfish
5a3eb651f3 change cluster schema (#2026) 
* change cluster schema

* change cluster schema
 2020-04-27 17:34:02 +08:00
KubeSphere CI Bot
794f388306 Merge pull request #2022 from zheng1/sdn 
Regenerate swagger.json
 2020-04-27 13:53:26 +08:00
KubeSphere CI Bot
3fada47623 Merge pull request #2032 from wansir/update-makefile 
update makefile
 2020-04-26 15:15:26 +08:00
hongming
bfd3d21540 multi-tenancy 3.0 roadmap 
Signed-off-by: hongming <talonwan@yunify.com>
 2020-04-26 14:42:23 +08:00
hongming
014f0c4df2 update makefile 
Signed-off-by: hongming <talonwan@yunify.com>
 2020-04-26 14:33:58 +08:00
KubeSphere CI Bot
748cc161fc Merge pull request #2027 from huanggze/dev-fix 
monitoring: some bug fix
 2020-04-24 21:45:26 +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
f717172971 Merge pull request #2021 from wansir/makefile 
update makefile
 2020-04-24 16:21:25 +08:00
Zhengyi Lai
878d0fe517 Generate swagger.json 2020-04-22 19:24:43 +08:00
KubeSphere CI Bot
3f89eaef7e Merge pull request #2016 from huanggze/dev-fix 
fix isRangeQuery
 2020-04-21 13:37:23 +08:00
hongming
acac0b6888 update makefile 
Signed-off-by: hongming <talonwan@yunify.com>
 2020-04-21 12:32:06 +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
88d90b3964 Merge pull request #2017 from rayzhou2017/master 
Update Makefile header license description
 2020-04-19 10:18:22 +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
Ray Zhou
34d5340005 Update makefile header license description 2020-04-18 14:25:38 +08:00
Ray Zhou
1e21c0ff42 Revert "Update Makefile license description" 
This reverts commit b736078e3c.
 2020-04-18 14:22:38 +08:00
Ray Zhou
b736078e3c Update Makefile license description 2020-04-18 14:17:56 +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
KubeSphere CI Bot
ff7f99c589 Merge pull request #2011 from wansir/dev 
migrate legacy API
 2020-04-15 17:21:21 +08:00
hongming
5f951508c5 migrate legacy API 
Signed-off-by: hongming <talonwan@yunify.com>
 2020-04-15 16:59:13 +08:00
KubeSphere CI Bot
d38e396e8c Merge pull request #1961 from runzexia/devops-refactor 
add test for s2i controller & devops CRD
 2020-04-15 13:48:21 +08:00
runzexia
df3ad79786 rm unused file 2020-04-15 11:44:13 +08:00
runzexia
052af22761 regenerate 2020-04-15 11:37:52 +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
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
KubeSphere CI Bot
1604ed4b1a Merge pull request #1976 from rayzhou2017/master 
Update README
 2020-04-08 22:40:19 +08:00
zryfish
e174dcb3d6 add cluster controller (#1993) 2020-04-08 00:40:28 +08:00