Commit Graph

974 Commits

Author SHA1 Message Date
Jeff
d0dc66cf28 fix servicemesh options nil bug 2019-09-25 01:47:46 +08:00
KubeSphere CI Bot
284c0d6425 Merge pull request #783 from soulseen/resource_map
update resourceMap
2019-09-24 18:40:10 +08:00
zhuxiaoyang
563f554a98 update resourceMap
Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>
2019-09-24 10:50:44 +08:00
Jeff
468f7eddca fix config nil error 2019-09-23 14:30:48 +08:00
KubeSphere CI Bot
3dca9feb0f Merge pull request #771 from wansir/fix-ldap-client
fix: ldap connection pool leak
2019-09-23 14:27:10 +08:00
KubeSphere CI Bot
1361106bdd Merge pull request #774 from wansir/fix-controller
fix: controller error handle function
2019-09-21 17:55:54 +08:00
hongming
a4281989c3 fix: controller error handle function
Signed-off-by: hongming <talonwan@yunify.com>
2019-09-20 20:58:19 +08:00
Jeff
f85f6b6b58 fix request logs 2019-09-20 17:45:31 +08:00
hongming
11570288af fix: ldap connection pool
Signed-off-by: hongming <talonwan@yunify.com>
2019-09-20 14:02:05 +08:00
Jeff
49dacd3e70 fix kubesphere gateway bug 2019-09-19 14:24:48 +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
0e6a19a779 comment-1
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-09-19 11:56:12 +08:00
KubeSphere CI Bot
84c6997711 Merge pull request #765 from wnxn/remove-ceph-secret-controller
Remove creating Ceph secret controller
2019-09-19 11:12:52 +08:00
Xin Wang
8dbefd74fe Remove creating Ceph secret controller 2019-09-19 10:49:24 +08:00
KubeSphere CI Bot
0b50a5db75 Merge pull request #762 from soulseen/fix/cronjob_parse
fix cronjob msg parse
2019-09-18 16:20:08 +08:00
huanggze
df6ed5e995 refactor monitor module
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-09-18 15:53:25 +08:00
soulseen
31eacd6c29 fix cronjob msg parse
Signed-off-by: soulseen <sunzhu@yunify.com>
2019-09-18 15:50:17 +08:00
Jeff
c53bdcad60 fix apiserver setup logs 2019-09-17 23:44:42 +08:00
KubeSphere CI Bot
06e16b5087 Merge pull request #757 from zryfish/new_options
refactor logging options
2019-09-17 20:40:52 +08:00
Jeff
f61c5e09ba refactor logging options 2019-09-17 16:00:54 +08:00
KubeSphere CI Bot
fa1e62f6ac Merge pull request #754 from runzexia/clean-golog
cleanup glog
2019-09-17 13:45:08 +08:00
runzexia
984764979a do not need glog
Signed-off-by: runzexia <runzexia@yunify.com>
2019-09-16 20:31:07 +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
KubeSphere CI Bot
79735c4543 Merge pull request #753 from wansir/fix-npe
fix: null pointer exception
2019-09-16 18:31:51 +08:00
hongming
7fef26233b fix: NPE
Signed-off-by: hongming <talonwan@yunify.com>
2019-09-16 18:22:33 +08:00
calvinyv
693ca1e8b1 fix zh sample command 2019-09-16 17:54:18 +08:00
calvinyv
bc3ec2a7d8 fix sample command 2019-09-16 17:53:22 +08:00
KubeSphere CI Bot
6594112ba9 Merge pull request #751 from runzexia/docker-api-version-negotiation
docker api version negotiation
2019-09-16 15:16:51 +08:00
KubeSphere CI Bot
635dcc9b39 Merge pull request #739 from wnxn/attach-controller
add expand volume controller
2019-09-16 14:55:51 +08:00
runzexia
2759b20be6 docker api version negotiation
Signed-off-by: runzexia <runzexia@yunify.com>
2019-09-16 14:44:53 +08:00
Xin Wang
55483e6578 add expand volume controller
Signed-off-by: Xin Wang <wileywang@yunify.com>
2019-09-16 14:20:07 +08:00
KubeSphere CI Bot
7c049a24da Merge pull request #744 from satrobit/master
Corrected the scripts directory in README files
2019-09-13 23:40:50 +08:00
satrobit
45e108ab13 Corrected the scripts directory in README files 2019-09-13 19:44:51 +04:30
Jeff
18243b8b64 add sc informer 2019-09-12 16:29:22 +08:00
KubeSphere CI Bot
715c1a462d Merge pull request #716 from runzexia/jenkins-pageable-response
get runs & pipelines pageable resposne
2019-09-12 15:31:06 +08:00
Jeff
5dde737e6c add more option comments 2019-09-12 15:29:53 +08:00
KubeSphere CI Bot
66af315a85 Merge pull request #737 from runzexia/devops-disable-logic
when devops is disabled, there is no need to clean up the devops data.
2019-09-12 15:28:50 +08:00
runzexia
95a9d5ff20 when devops is disabled, there is no need to clean up the devops data.
Signed-off-by: runzexia <runzexia@yunify.com>
2019-09-12 14:16:26 +08:00
KubeSphere CI Bot
ee1c5f9d5f Merge pull request #736 from runzexia/update-devops-flags
update devops flags default value
2019-09-12 14:10:50 +08:00
runzexia
f0ab59f75b fix comment
Signed-off-by: runzexia <runzexia@yunify.com>
2019-09-12 14:07:37 +08:00
runzexia
17f9b0879f refmt code
Signed-off-by: runzexia <runzexia@yunify.com>
2019-09-12 11:47:12 +08:00
runzexia
85a0586529 fix comment
Signed-off-by: runzexia <runzexia@yunify.com>
2019-09-12 11:25:58 +08:00
runzexia
8d2d8f64a0 fix comment
Signed-off-by: runzexia <runzexia@yunify.com>
2019-09-12 11:09:17 +08:00
runzexia
307309269c Merge branch 'master' into jenkins-pageable-response
Signed-off-by: runzexia <runzexia@yunify.com>

# Conflicts:
#	pkg/models/devops/devops.go
2019-09-12 11:04:32 +08:00
runzexia
60298d9e20 update devops flags default value
Signed-off-by: runzexia <runzexia@yunify.com>
2019-09-12 10:46:19 +08:00
Jeff
495785092e add ks-apiserver options 2019-09-12 02:09:17 +08:00
Jeff
e4d84b020c add ks-apiserver options 2019-09-12 01:33:07 +08:00
Jeff
c1cec8e1bc add ks-apiserver options 2019-09-12 00:50:42 +08:00
Jeff
27cdb3a304 add ks-apiserver options 2019-09-12 00:10:07 +08:00
Jeff
ddaf5b181b add ks-apiserver options 2019-09-11 23:54:14 +08:00