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

1154 Commits

Author SHA1 Message Date
zackzhang
2b0b36672b fix application reconcile 
Signed-off-by: zackzhang <zackzhang@yunify.com>
 2021-01-19 14:58:07 +08:00
KubeSphere CI Bot
1f4d5cb686 Merge pull request #3181 from junotx/custom-alerting 
feature: custom alerting
 2021-01-18 10:19:14 +08:00
junotx
514fec7eb4 custom alerting use the same API group and flagset to alerting 
Signed-off-by: junotx <junotx@126.com>
 2021-01-15 13:48:48 +08:00
KubeSphere CI Bot
f5e2b05240 Merge pull request #3220 from xyz-li/master 
add metrics
 2021-01-15 10:16:37 +08:00
junotx
6f9d306368 custom alerting resolve conflicts 
Signed-off-by: junotx <junotx@126.com>
 2021-01-12 16:52:37 +08:00
junotx
9831eb3533 custom alerting optimize 
Signed-off-by: junotx <junotx@126.com>
 2021-01-12 16:52:36 +08:00
junotx
371c9b187d custom alerting 
Signed-off-by: junotx <junotx@126.com>
 2021-01-12 16:52:36 +08:00
KubeSphere CI Bot
a638df58ab Merge pull request #3235 from LinuxSuRen/fix-pipeline-not-sync 
Fix the pipeline do not sync with Jenkins
 2021-01-11 10:13:35 +08:00
KubeSphere CI Bot
3788124641 Merge pull request #3256 from zheng1/network.topology 
Add network.topology into conf.ToMap()
 2021-01-11 10:03:35 +08:00
LiHui
e57e602b69 change method name 
Signed-off-by: LiHui <andrewli@yunify.com>
 2021-01-08 14:16:02 +08:00
junotx
9304e839b1 fix metrics query bug for pods with duplicate name in one node 
Signed-off-by: junotx <junotx@126.com>
 2021-01-08 13:53:49 +08:00
Zhengyi Lai
492b4ae8c2 Add network.topology into conf.ToMap() 
Signed-off-by: Zhengyi Lai <zheng1@yunify.com>
 2021-01-06 15:04:43 +08:00
LiHui
bc9fe7f656 add process and goroutine metrics 
Signed-off-by: LiHui <andrewli@yunify.com>
 2021-01-06 10:23:30 +08:00
LiHui
1ecec78379 enable metrics by default 
Signed-off-by: LiHui <andrewli@yunify.com>
 2021-01-06 10:18:14 +08:00
LiHui
611f1c6991 add metrics to controller-manager 
Signed-off-by: LiHui <andrewli@yunify.com>
 2021-01-06 10:18:14 +08:00
LiHui
056bebdec6 fix test 
Signed-off-by: LiHui <andrewli@yunify.com>
 2021-01-06 10:18:14 +08:00
LiHui
5c8ac10d26 add metrics 
Signed-off-by: LiHui <andrewli@yunify.com>
 2021-01-06 10:18:14 +08:00
rick
14367d1954 Fix the pipeline do not sync with Jenkins 
Signed-off-by: rick <rick@jenkins-zh.cn>
 2021-01-06 10:11:59 +08:00
KubeSphere CI Bot
ee373b8e55 Merge pull request #3247 from RolandMa1986/group-parent 
Cascading deletion of children groups
 2021-01-06 09:50:33 +08:00
Zack Zhang
f20c1f33f1 refactor application controller 
Signed-off-by: zackzhang <zackzhang@yunify.com>
 2021-01-04 16:34:04 +08:00
Roland.Ma
2d6b7fef8b cascading deletion of children groups 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
 2021-01-04 07:39:50 +00:00
hongming
fe6c5de00f update dependencies 
Signed-off-by: hongming <talonwan@yunify.com>
 2021-01-04 15:35:32 +08:00
Duan Jiong
27b335a9c9 Support ippool configuration status field 
Signed-off-by: Duan Jiong <djduanjiong@gmail.com>
 2020-12-29 14:32:21 +08:00
Duan Jiong
24e3ac865f add ippool resource api 
add ippool webhook and fix some bugs

Signed-off-by: Duan Jiong <djduanjiong@gmail.com>
 2020-12-29 14:32:21 +08:00
hongming
0fa3dab250 fix no informer found 
Signed-off-by: hongming <talonwan@yunify.com>
 2020-12-29 10:26:38 +08:00
KubeSphere CI Bot
d7a8490cde Merge pull request #3229 from wanjunlei/audit-ldap 
fix bug Failed to configure LDAP login, error message: socket hang up
 2020-12-29 10:23:53 +08:00
KubeSphere CI Bot
d672b6cc98 Merge pull request #3179 from wansir/workspace 
refactor workspace controller
 2020-12-28 15:06:52 +08:00
hongming
a900b6af4e refactor workspace controller 
Signed-off-by: hongming <talonwan@yunify.com>
 2020-12-28 14:31:48 +08:00
KubeSphere CI Bot
51c853c886 Merge pull request #3203 from yuswift/bugfix/proxy-cluster-status-sync 
[BugFix] Fix cluster unjoin federation plane when using proxy connection
 2020-12-28 13:55:52 +08:00
KubeSphere CI Bot
ed18749172 Merge pull request #3201 from wanjunlei/auditing-log2 
fix bug get goroutine for audit timeout
 2020-12-28 13:55:40 +08:00
KubeSphere CI Bot
eaf8cc40c4 Merge pull request #3217 from RolandMa1986/feat-groupapi 
add group api
 2020-12-25 22:29:50 +08:00
KubeSphere CI Bot
5ffc76dee9 Merge pull request #3206 from RolandMa1986/fix-clusterjoin 
Validate member cluster's workspaces when joining clusters
 2020-12-25 17:53:50 +08:00
wanjunlei
ea34bda865 fix bug #3226 
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
 2020-12-25 11:56:02 +08:00
Roland.Ma
84f5fb7e69 valid member cluster's workspaces when joining 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
 2020-12-25 03:16:03 +00:00
Roland.Ma
ab6e1f171c UT 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
 2020-12-24 10:10:39 +00:00
Roland.Ma
bec38d7e0f add group api 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
 2020-12-24 09:27:59 +00:00
KubeSphere CI Bot
d814d5db7b Merge pull request #3195 from LinuxSuRen/fix/devops-project-del 
Fix devops project cannot be deleted due to mess up with finalizer control
 2020-12-18 14:03:47 +08:00
zackzhangkai
f153390468 support using Kiali API directly 
Signed-off-by: zackzhangkai <zackzhang@yunify.com>
 2020-12-17 21:28:16 +08:00
rick
f908aa42f7 Fix devops project cannot be deleted due to mess up with finalizer control 
Signed-off-by: rick <rick@jenkins-zh.cn>
 2020-12-16 10:08:34 +08:00
KubeSphere CI Bot
ce0f417949 Merge pull request #3149 from LinuxSuRen/import-pipeline-list 
Mix up the pipeline list between ks and Jenkins
 2020-12-15 11:35:46 +08:00
zryfish
6da7ab03dd remove unused package (#3204) 
Signed-off-by: Jeff <jeffzhang@yunify.com>
 2020-12-15 11:32:05 +08:00
wanjunlei
ee95aeff15 resolve conversation 
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
 2020-12-14 15:38:11 +08:00
yuswift
ee13aa7c8a fix #3202 
Signed-off-by: yuswift <yuswiftli@yunify.com>
 2020-12-14 15:30:48 +08:00
linruichao
98ae80207f fixed: check the cluster has initialized 
Previously, always check whether the cluster has been initialized, but the updateClusterCondition function always removes the old condition and then adds the new condition, resulting in always returning after updating the initialized condition.

This commit check the cluster has initialized, if initialized will not updated condition

Signed-off-by: linruichao <linruichao@ruijie.com.cn>
 2020-12-14 15:02:30 +08:00
wanjunlei
b543ae1a12 fix bug get goroutine for audit timeout 
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
 2020-12-14 11:10:40 +08:00
rick
e2fee2cd90 Fix two issues according to review opinions 
Signed-off-by: rick <rick@jenkins-zh.cn>
 2020-12-11 13:38:25 +08:00
rick
3d12019e23 Mix up the pipeline list between ks and Jenkins 
Technically we should take the Pipeline list from ks or mixup the instead of only taking it from Jenkins. Because we always manipulate Pipeline from ks.

Signed-off-by: rick <rick@jenkins-zh.cn>
 2020-12-11 13:38:20 +08:00
KubeSphere CI Bot
a314b31bf0 Merge pull request #3177 from LinuxSuRen/fix/multi-branch-panic-with-nil 
Fix ks-controller panic due to missing nil checking in mutli-branch pipeline
 2020-12-11 12:00:45 +08:00
KubeSphere CI Bot
d7607b3eaf Merge pull request #3167 from wansir/sensitive-config 
config data desensitization
 2020-12-11 10:06:45 +08:00
KubeSphere CI Bot
af5b1fe6be Merge pull request #3193 from junotx/custom-monitoring-enhance 
custom monitoring with cluster level
 2020-12-11 09:54:45 +08:00