admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
492 Commits 13 Branches 51 Tags
eeef8b217ef36404b8d6cfed5dcd539fa1343b8d
Commit Graph

492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
runzexia
eeef8b217e Merge branch 'refactor-credential-create' of https://github.com/runzexia/kubesphere into refactor-credential-create 
Signed-off-by: runzexia <runzexia@yunify.com>

# Conflicts:
#	pkg/models/devops/project_credential_handler.go
 2019-05-09 18:11:10 +08:00
runzexia
96f2641e8b do not find description 
Signed-off-by: runzexia <runzexia@yunify.com>
 2019-05-09 18:09:48 +08:00
runzexia
b9d7ff5e4c Merge branch 'master' into refactor-credential-create 2019-05-09 17:54:19 +08:00
runzexia
8bf5ae0910 refactor credential api 
Signed-off-by: runzexia <runzexia@yunify.com>
 2019-05-09 17:53:33 +08:00
runzexia
00e3ed1a15 Merge pull request #399 from runzexia/recover-panic 
recover from panic
 2019-05-09 17:51:56 +08:00
runzexia
4f8f8d6f3c refactor credential api 2019-05-09 17:51:21 +08:00
runzexia
578af2ae19 recover from panic 
Signed-off-by: runzexia <runzexia@yunify.com>
 2019-05-09 15:16:54 +08:00
runzexia
be0ae7780a Merge pull request #396 from soulseen/master 
update post run pipeline
 2019-05-09 10:23:05 +08:00
Zhuxiaoyang
52b63f5ebc update post run pipeline 
Signed-off-by: soulseen <sunzhu@yunify.com>
 2019-05-08 21:01:45 +08:00
不羁
3aba5b15f4 Merge pull request #397 from kubesphere/add-jenkins-init-return 
return nil if init failed
 2019-05-08 17:31:06 +08:00
runzexia
70977f0d8a return nil 
Signed-off-by: runzexia <runzexia@yunify.com>
 2019-05-08 17:00:49 +08:00
不羁
e94ef57df5 Merge pull request #394 from huanggze/logging-dev 
fix: log query starttime must be greater than the namespace creation time
 2019-05-08 15:53:50 +08:00
Guangzhe Huang
260ffe90f9 Merge branch 'master' into logging-dev 2019-05-08 15:42:30 +08:00
不羁
60d0c81bb3 Merge pull request #392 from wansir/master 
add pvc filter
 2019-05-08 15:36:36 +08:00
Guangzhe Huang
750c3f1eb5 Merge branch 'master' into logging-dev 2019-05-08 15:34:15 +08:00
huanggze
5523725421 fix: log query starttime must be greater than the namespace creation time 
Signed-off-by: huanggze <loganhuang@yunify.com>
 2019-05-08 15:30:56 +08:00
不羁
0e50a93e26 Merge branch 'master' into master 2019-05-08 15:14:59 +08:00
runzexia
8ba8078a62 Merge pull request #391 from runzexia/reinit-jenkins- 
retry init if jenkinsClient == nil
 2019-05-08 14:59:03 +08:00
runzexia
e0f84ab5b4 Merge branch 'master' into reinit-jenkins- 2019-05-08 14:53:11 +08:00
runzexia
e40dd11521 Merge pull request #390 from soulseen/master 
add jenkins branch api
 2019-05-08 14:52:53 +08:00
Zhuxiaoyang
a5cd5bee82 add jenkins branch api 
Signed-off-by: soulseen <sunzhu@yunify.com>
 2019-05-08 14:44:53 +08:00
runzexia
b7889e4172 jenkins init 
Signed-off-by: runzexia <runzexia@yunify.com>
 2019-05-08 14:41:55 +08:00
不羁
dbb02bd081 Merge branch 'master' into master 2019-05-08 13:22:23 +08:00
hongming
0083a48e01 add pvc filter 
Signed-off-by: hongming <talonwan@yunify.com>
 2019-05-08 13:21:05 +08:00
huanggze
ac96101142 fix: namespace resourcequota of pod count 
Signed-off-by: huanggze <loganhuang@yunify.com>
 2019-05-07 23:17:19 +08:00
huanggze
0b55a064e8 add flag description of prometheus client 
Signed-off-by: huanggze <loganhuang@yunify.com>
 2019-05-07 23:17:19 +08:00
runzexia
af5f50ffb7 Merge pull request #387 from soulseen/master 
update post run url
 2019-05-07 13:27:09 +08:00
Zhuxiaoyang
daac30bfae update post run url 
Signed-off-by: soulseen <sunzhu@yunify.com>
 2019-05-07 11:37:42 +08:00
huanggze
85836e2e1a log: remove redudant wrapper 
Signed-off-by: huanggze <loganhuang@yunify.com>
 2019-05-07 10:27:55 +08:00
hongming
e115feeb8a fix: duplicate namespace 
Signed-off-by: hongming <talonwan@yunify.com>
 2019-05-06 17:54:51 +08:00
soulseen
0a37bfd0a4 update const 
Signed-off-by: soulseen <sunzhu@yunify.com>
 2019-05-06 17:46:23 +08:00
soulseen
9f24801eeb update jenkins pre-check 
Signed-off-by: soulseen <sunzhu@yunify.com>
 2019-05-06 17:46:23 +08:00
soulseen
a57947fd45 add jenkins pre-check & fix jenkins flag 
Signed-off-by: soulseen <sunzhu@yunify.com>
 2019-05-06 17:46:23 +08:00
Zhuxiaoyang
2857071bdd Dev (#9) 
* add tag & add webhook api

Signed-off-by: soulseen <sunzhu@yunify.com>
 2019-05-06 17:46:23 +08:00
Zhuxiaoyang
daab932e9f update jenkins api 
Signed-off-by: soulseen <sunzhu@yunify.com>
 2019-05-06 17:46:23 +08:00
runzexia
b416aa27bb fmt code 2019-05-06 17:37:24 +08:00
runzexia
21c2e4920f delete user in devops 2019-05-06 17:37:24 +08:00
huanggze
7748ad8f3c update resource quota metrics 
Signed-off-by: huanggze <loganhuang@yunify.com>
 2019-05-06 17:36:02 +08:00
huanggze
1239ed23ac bug fix: workload monitoring 
Signed-off-by: huanggze <loganhuang@yunify.com>
 2019-05-06 17:36:02 +08:00
hongming
8e2acfa7f6 add extra annotations 
Signed-off-by: hongming <talonwan@yunify.com>
 2019-05-05 23:02:21 +08:00
huanggze
3e8035dc2b update pod metrics 
Signed-off-by: huanggze <loganhuang@yunify.com>
 2019-05-05 09:11:05 +08:00
runzexia
3931912f8d fix typo 2019-04-30 00:55:36 +08:00
hongming
ed5e1c53e9 fix: workspace manage permission 
Signed-off-by: hongming <talonwan@yunify.com>
 2019-04-30 00:54:45 +08:00
runzexia
8268c969ba request devops api with auth info 2019-04-29 12:26:39 +08:00
hongming
57f3eed28c fix: wrong file path 
Signed-off-by: hongming <talonwan@yunify.com>
 2019-04-29 10:46:59 +08:00
huanggze
20a4525d58 refactor monitoring modules 
Signed-off-by: huanggze <loganhuang@yunify.com>
 2019-04-28 21:08:27 +08:00
huanggze
5d8fd5c6ac round cpu usage metrics 
Signed-off-by: huanggze <loganhuang@yunify.com>
 2019-04-28 21:08:27 +08:00
huanggze
d8117e567c update etcd metrics 
Signed-off-by: huanggze <loganhuang@yunify.com>
 2019-04-28 21:08:27 +08:00
hongming
ebd681770e hide internal user 
Signed-off-by: hongming <talonwan@yunify.com>
 2019-04-28 17:52:21 +08:00
hongming
9a530c2cec add job controller 
Signed-off-by: hongming <talonwan@yunify.com>
 2019-04-28 17:52:21 +08:00