Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
凌波微步_大先生
dashboard
提交
b1ef0354
D
dashboard
项目概览
凌波微步_大先生
/
dashboard
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dashboard
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b1ef0354
编写于
1月 05, 2016
作者:
B
bryk
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix a bug where logs menu would crash when there were no statuses reported for containers
上级
bfbfd0e8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
31 addition
and
10 deletion
+31
-10
src/app/backend/replicasetpods.go
src/app/backend/replicasetpods.go
+20
-8
src/test/backend/replicasetpods_test.go
src/test/backend/replicasetpods_test.go
+11
-0
src/test/backend/validateappname_test.go
src/test/backend/validateappname_test.go
+0
-2
未找到文件。
src/app/backend/replicasetpods.go
浏览文件 @
b1ef0354
...
...
@@ -80,17 +80,28 @@ func getReplicaSetPods(pods []api.Pod, limit int) *ReplicaSetPods {
for
_
,
pod
:=
range
pods
{
totalRestartCount
:=
0
replicaSetPodWithContainers
:=
ReplicaSetPodWithContainers
{
Name
:
pod
.
Name
,
StartTime
:
pod
.
Status
.
StartTime
,
Name
:
pod
.
Name
,
StartTime
:
pod
.
Status
.
StartTime
,
PodContainers
:
make
([]
PodContainer
,
0
),
}
for
_
,
containerStatus
:=
range
pod
.
Status
.
ContainerStatuses
{
podContainer
:=
PodContainer
{
Name
:
containerStatus
.
Name
,
RestartCount
:
containerStatus
.
RestartCount
,
}
podContainersByName
:=
make
(
map
[
string
]
*
PodContainer
)
for
_
,
container
:=
range
pod
.
Spec
.
Containers
{
podContainer
:=
PodContainer
{
Name
:
container
.
Name
}
replicaSetPodWithContainers
.
PodContainers
=
append
(
replicaSetPodWithContainers
.
PodContainers
,
podContainer
)
totalRestartCount
+=
containerStatus
.
RestartCount
podContainersByName
[
container
.
Name
]
=
&
(
replicaSetPodWithContainers
.
PodContainers
[
len
(
replicaSetPodWithContainers
.
PodContainers
)
-
1
])
}
for
_
,
containerStatus
:=
range
pod
.
Status
.
ContainerStatuses
{
podContainer
,
ok
:=
podContainersByName
[
containerStatus
.
Name
]
if
ok
{
podContainer
.
RestartCount
=
containerStatus
.
RestartCount
totalRestartCount
+=
containerStatus
.
RestartCount
}
}
replicaSetPodWithContainers
.
TotalRestartCount
=
totalRestartCount
replicaSetPods
.
Pods
=
append
(
replicaSetPods
.
Pods
,
replicaSetPodWithContainers
)
...
...
@@ -103,5 +114,6 @@ func getReplicaSetPods(pods []api.Pod, limit int) *ReplicaSetPods {
}
replicaSetPods
.
Pods
=
replicaSetPods
.
Pods
[
0
:
limit
]
}
return
replicaSetPods
}
src/test/backend/replicasetpods_test.go
浏览文件 @
b1ef0354
...
...
@@ -27,6 +27,12 @@ func TestGetReplicaSetPods(t *testing.T) {
ObjectMeta
:
api
.
ObjectMeta
{
Name
:
"pod-1"
,
},
Spec
:
api
.
PodSpec
{
Containers
:
[]
api
.
Container
{
{
Name
:
"container-1"
},
{
Name
:
"container-2"
},
},
},
Status
:
api
.
PodStatus
{
ContainerStatuses
:
[]
api
.
ContainerStatus
{
{
...
...
@@ -44,6 +50,11 @@ func TestGetReplicaSetPods(t *testing.T) {
ObjectMeta
:
api
.
ObjectMeta
{
Name
:
"pod-2"
,
},
Spec
:
api
.
PodSpec
{
Containers
:
[]
api
.
Container
{
{
Name
:
"container-3"
},
},
},
Status
:
api
.
PodStatus
{
ContainerStatuses
:
[]
api
.
ContainerStatus
{
{
...
...
src/test/backend/validateappname_test.go
浏览文件 @
b1ef0354
...
...
@@ -15,7 +15,6 @@
package
main
import
(
"fmt"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/unversioned/testclient"
"k8s.io/kubernetes/pkg/runtime"
...
...
@@ -57,7 +56,6 @@ func TestValidateName(t *testing.T) {
for
_
,
c
:=
range
cases
{
testClient
:=
testclient
.
NewSimpleFake
(
c
.
objects
...
)
validity
,
_
:=
ValidateAppName
(
c
.
spec
,
testClient
)
fmt
.
Printf
(
"%#v
\n
"
,
validity
)
if
validity
.
Valid
!=
c
.
expected
{
t
.
Errorf
(
"Expected %#v validity to be %#v for objects %#v, but was %#v
\n
"
,
c
.
spec
,
c
.
expected
,
c
.
objects
,
validity
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录