Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
水淹萌龙
kubesphere
提交
c02417bd
K
kubesphere
项目概览
水淹萌龙
/
kubesphere
与 Fork 源项目一致
Fork自
KubeSphere / kubesphere
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kubesphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
c02417bd
编写于
10月 17, 2019
作者:
K
KubeSphere CI Bot
提交者:
GitHub
10月 17, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1038 from wansir/sort-resource
fix: sort deployment by last update time
上级
3b9e7432
0ee6b8d7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
1 deletion
+23
-1
pkg/models/resources/deployments.go
pkg/models/resources/deployments.go
+14
-1
pkg/models/resources/pods.go
pkg/models/resources/pods.go
+8
-0
pkg/models/resources/resources.go
pkg/models/resources/resources.go
+1
-0
未找到文件。
pkg/models/resources/deployments.go
浏览文件 @
c02417bd
...
...
@@ -24,6 +24,7 @@ import (
"kubesphere.io/kubesphere/pkg/utils/sliceutil"
"sort"
"strings"
"time"
"k8s.io/apimachinery/pkg/labels"
...
...
@@ -108,10 +109,12 @@ func (*deploymentSearcher) fuzzy(fuzzy map[string]string, item *v1.Deployment) b
return
true
}
func
(
*
deploymentSearcher
)
compare
(
a
,
b
*
v1
.
Deployment
,
orderBy
string
)
bool
{
func
(
s
*
deploymentSearcher
)
compare
(
a
,
b
*
v1
.
Deployment
,
orderBy
string
)
bool
{
switch
orderBy
{
case
CreateTime
:
return
a
.
CreationTimestamp
.
Time
.
Before
(
b
.
CreationTimestamp
.
Time
)
case
UpdateTime
:
return
s
.
lastUpdateTime
(
a
)
.
Before
(
s
.
lastUpdateTime
(
b
))
case
Name
:
fallthrough
default
:
...
...
@@ -119,6 +122,16 @@ func (*deploymentSearcher) compare(a, b *v1.Deployment, orderBy string) bool {
}
}
func
(
s
*
deploymentSearcher
)
lastUpdateTime
(
deployment
*
v1
.
Deployment
)
time
.
Time
{
lastUpdateTime
:=
deployment
.
CreationTimestamp
.
Time
for
_
,
condition
:=
range
deployment
.
Status
.
Conditions
{
if
condition
.
LastUpdateTime
.
After
(
lastUpdateTime
)
{
lastUpdateTime
=
condition
.
LastUpdateTime
.
Time
}
}
return
lastUpdateTime
}
func
(
s
*
deploymentSearcher
)
search
(
namespace
string
,
conditions
*
params
.
Conditions
,
orderBy
string
,
reverse
bool
)
([]
interface
{},
error
)
{
deployments
,
err
:=
informers
.
SharedInformerFactory
()
.
Apps
()
.
V1
()
.
Deployments
()
.
Lister
()
.
Deployments
(
namespace
)
.
List
(
labels
.
Everything
())
...
...
pkg/models/resources/pods.go
浏览文件 @
c02417bd
...
...
@@ -221,6 +221,14 @@ func (*podSearcher) fuzzy(fuzzy map[string]string, item *v1.Pod) bool {
func
(
*
podSearcher
)
compare
(
a
,
b
*
v1
.
Pod
,
orderBy
string
)
bool
{
switch
orderBy
{
case
StartTime
:
if
a
.
Status
.
StartTime
==
nil
{
return
false
}
if
b
.
Status
.
StartTime
==
nil
{
return
true
}
return
a
.
Status
.
StartTime
.
Before
(
b
.
Status
.
StartTime
)
case
CreateTime
:
return
a
.
CreationTimestamp
.
Time
.
Before
(
b
.
CreationTimestamp
.
Time
)
case
Name
:
...
...
pkg/models/resources/resources.go
浏览文件 @
c02417bd
...
...
@@ -67,6 +67,7 @@ const (
Role
=
"role"
CreateTime
=
"createTime"
UpdateTime
=
"updateTime"
StartTime
=
"startTime"
LastScheduleTime
=
"lastScheduleTime"
chart
=
"chart"
release
=
"release"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录