Jeff
|
d9cce21f05
|
add quota left to namespace quota
|
2019-05-15 20:56:06 +08:00 |
|
soulseen
|
6b3b0aa4f1
|
update jenkins log
Signed-off-by: soulseen <sunzhu@yunify.com>
|
2019-05-15 20:52:33 +08:00 |
|
hongming
|
4ae7d3256e
|
fix: application api
Signed-off-by: hongming <talonwan@yunify.com>
|
2019-05-14 23:50:12 +08:00 |
|
huanggze
|
4c111533b1
|
fix: log statitiscs
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-14 23:40:55 +08:00 |
|
Zhuxiaoyang
|
1acfe509c2
|
Merge pull request #425 from soulseen/master
update api description
|
2019-05-14 20:30:30 +08:00 |
|
Zhuxiaoyang
|
0838ceb585
|
Merge branch 'master' into master
|
2019-05-14 19:33:23 +08:00 |
|
soulseen
|
5b0fd59788
|
Merge branch 'master' of github.com:soulseen/kubesphere
|
2019-05-14 19:30:57 +08:00 |
|
soulseen
|
c8de1d6487
|
fix typo
Signed-off-by: soulseen <sunzhu@yunify.com>
|
2019-05-14 19:30:10 +08:00 |
|
huanggze
|
6784865207
|
logging: record errors
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-14 19:29:11 +08:00 |
|
runzexia
|
0f290a1d41
|
Merge branch 'master' into master
|
2019-05-14 17:28:52 +08:00 |
|
runzexia
|
ca99e0a08a
|
Merge pull request #422 from runzexia/fix-sonar-status-NPE
fix sonarStatus api NEP, return `[]` if could not get last run
|
2019-05-14 17:25:42 +08:00 |
|
soulseen
|
ff45220411
|
update api description
Signed-off-by: soulseen <sunzhu@yunify.com>
|
2019-05-14 17:16:10 +08:00 |
|
runzexia
|
5e4b50061c
|
fix ci
|
2019-05-14 17:15:46 +08:00 |
|
runzexia
|
11a9d166ee
|
fix
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-14 16:31:42 +08:00 |
|
runzexia
|
a6f46bc84a
|
fix sonarStatus api NEP, return [] if could not get last run
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-14 16:29:54 +08:00 |
|
Benjamin Huo
|
86c7cf6185
|
Merge pull request #410 from huanggze/monitoring
fix: filter out old namespace data from workspace cpu and memory metrics
|
2019-05-14 11:29:29 +08:00 |
|
Benjamin Huo
|
f84e58b0db
|
Merge branch 'master' into monitoring
|
2019-05-14 11:22:56 +08:00 |
|
Jeff
|
48cf27095b
|
update workload
|
2019-05-13 23:24:12 +08:00 |
|
Jeff
|
049b3dd11d
|
update router workload
|
2019-05-13 23:24:12 +08:00 |
|
Jeff
|
89f54da60a
|
fix router update bug
|
2019-05-13 14:02:32 +08:00 |
|
Jeff
|
5462f51e65
|
fix application bug
|
2019-05-13 11:28:20 +08:00 |
|
runzexia
|
996d6fe4c5
|
update
|
2019-05-13 11:27:10 +08:00 |
|
runzexia
|
1270e36c2d
|
ks iam recover
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-13 11:27:10 +08:00 |
|
runzexia
|
8edcd0c355
|
wrap panic
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-13 11:27:10 +08:00 |
|
zryfish
|
bfb0a83364
|
Merge branch 'master' into monitoring
|
2019-05-12 18:11:04 +08:00 |
|
Jeff
|
6dd8622136
|
fix update router bug
|
2019-05-12 17:59:25 +08:00 |
|
Jeff
|
692de802b3
|
change application source location
|
2019-05-12 17:40:34 +08:00 |
|
huanggze
|
d4864d2c0e
|
Merge remote-tracking branch 'remotes/kubesphere/master' into monitoring
|
2019-05-11 20:42:33 +08:00 |
|
huanggze
|
d9cc03408c
|
fix: filter out old namespace data from workspace cpu and memory metrics
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-11 20:42:01 +08:00 |
|
Benjamin Huo
|
ea5009d571
|
Merge pull request #409 from huanggze/monitoring
update: change an argument
|
2019-05-11 17:34:53 +08:00 |
|
huanggze
|
e575a217f3
|
update: change an argument
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-11 16:12:33 +08:00 |
|
runzexia
|
3af400e71b
|
Merge pull request #408 from soulseen/master
fix init jenkins
|
2019-05-11 14:02:53 +08:00 |
|
Zhuxiaoyang
|
a2c5b27703
|
Merge branch 'master' into master
|
2019-05-11 13:38:56 +08:00 |
|
Benjamin Huo
|
c33f39d531
|
Merge pull request #404 from huanggze/monitoring
fix: ensure namespces to be filterred correctly in workspace metrics
|
2019-05-11 13:36:25 +08:00 |
|
Benjamin Huo
|
8381bba4ca
|
Merge branch 'master' into monitoring
|
2019-05-11 13:26:10 +08:00 |
|
soulseen
|
ecfcad9ea8
|
fix init jenkins
Signed-off-by: soulseen <sunzhu@yunify.com>
|
2019-05-11 13:01:45 +08:00 |
|
Zhuxiaoyang
|
642d52a45f
|
Merge pull request #406 from runzexia/jenkins-client-check
jenkins client NPE check
|
2019-05-11 12:51:22 +08:00 |
|
runzexia
|
c8c66c1d6c
|
fix typo
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-11 12:18:40 +08:00 |
|
runzexia
|
21b663de50
|
jenkins client NPE check
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-11 12:09:03 +08:00 |
|
huanggze
|
1a9b17f98d
|
fix: ensure old namespce data to be filterred out correctly in metrics
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-11 12:00:15 +08:00 |
|
huanggze
|
3d36b254b0
|
fix: ensure namespces to be filterred correctly in workspace metrics
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-10 23:37:28 +08:00 |
|
Zhuxiaoyang
|
9cec5489ba
|
Merge pull request #402 from soulseen/master
remove repeat api
|
2019-05-10 13:44:42 +08:00 |
|
soulseen
|
a472c311dc
|
fix typo & remove repeat api
Signed-off-by: soulseen <sunzhu@yunify.com>
|
2019-05-10 13:36:22 +08:00 |
|
runzexia
|
7bf044a766
|
Merge pull request #401 from runzexia/refactor-credential-create
refactor credential api
|
2019-05-10 10:18:50 +08:00 |
|
runzexia
|
002b54a1f8
|
Merge branch 'master' into refactor-credential-create
|
2019-05-09 18:14:32 +08:00 |
|
runzexia
|
c9abd0052b
|
do not need get id
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-09 18:13:54 +08:00 |
|
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 |
|
不羁
|
d27c5b96cf
|
add missing api group (#400)
Signed-off-by: hongming <talonwan@yunify.com>
|
2019-05-09 18:10:20 +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 |
|