Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
凌波微步_大先生
dashboard
提交
43ee97ee
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,体验更适合开发者的 AI 搜索 >>
提交
43ee97ee
编写于
7月 24, 2017
作者:
S
Sebastian Florek
提交者:
Marcin Maciaszczyk
7月 24, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix error handling (#2170)
上级
4eeca0b6
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
51 addition
and
29 deletion
+51
-29
src/app/backend/resource/event/common.go
src/app/backend/resource/event/common.go
+2
-2
src/app/backend/resource/ingress/detail.go
src/app/backend/resource/ingress/detail.go
+3
-0
src/app/backend/resource/ingress/list.go
src/app/backend/resource/ingress/list.go
+1
-1
src/app/backend/resource/node/detail.go
src/app/backend/resource/node/detail.go
+11
-5
src/app/backend/resource/pod/detail.go
src/app/backend/resource/pod/detail.go
+1
-1
src/app/backend/resource/pod/events.go
src/app/backend/resource/pod/events.go
+9
-4
src/app/backend/resource/service/detail.go
src/app/backend/resource/service/detail.go
+11
-10
src/app/backend/resource/service/events.go
src/app/backend/resource/service/events.go
+9
-4
src/app/frontend/pod/detail/containerinfo.html
src/app/frontend/pod/detail/containerinfo.html
+4
-2
未找到文件。
src/app/backend/resource/event/common.go
浏览文件 @
43ee97ee
...
...
@@ -139,12 +139,12 @@ func GetNodeEvents(client client.Interface, dsQuery *dataselect.DataSelectQuery,
mc
:=
client
.
CoreV1
()
.
Nodes
()
node
,
err
:=
mc
.
Get
(
nodeName
,
metaV1
.
GetOptions
{})
if
err
!=
nil
{
return
nil
,
err
return
&
eventList
,
err
}
events
,
err
:=
client
.
CoreV1
()
.
Events
(
v1
.
NamespaceAll
)
.
Search
(
scheme
,
node
)
if
err
!=
nil
{
return
nil
,
err
return
&
eventList
,
err
}
if
!
IsTypeFilled
(
events
.
Items
)
{
...
...
src/app/backend/resource/ingress/detail.go
浏览文件 @
43ee97ee
...
...
@@ -35,6 +35,9 @@ type IngressDetail struct {
// Status is the current state of the Ingress.
Status
extensions
.
IngressStatus
`json:"status"`
// List of non-critical errors, that occurred during resource retrieval.
Errors
[]
error
`json:"errors"`
}
// GetIngressDetail returns returns detailed information about an ingress
...
...
src/app/backend/resource/ingress/list.go
浏览文件 @
43ee97ee
...
...
@@ -58,7 +58,7 @@ func GetIngressList(client client.Interface, namespace *common.NamespaceQuery, d
return
nil
,
criticalError
}
return
toIngressList
(
ingressList
.
Items
,
nonCriticalErrors
,
dsQuery
),
err
return
toIngressList
(
ingressList
.
Items
,
nonCriticalErrors
,
dsQuery
),
nil
}
// GetIngressListFromChannels - return all ingresses in the given namespace.
...
...
src/app/backend/resource/node/detail.go
浏览文件 @
43ee97ee
...
...
@@ -237,22 +237,28 @@ func getNodeAllocatedResources(node v1.Node, podList *v1.PodList) (NodeAllocated
// GetNodePods return pods list in given named node
func
GetNodePods
(
client
k8sClient
.
Interface
,
metricClient
metricapi
.
MetricClient
,
dsQuery
*
dataselect
.
DataSelectQuery
,
name
string
)
(
*
pod
.
PodList
,
error
)
{
podList
:=
pod
.
PodList
{
Pods
:
[]
pod
.
Pod
{},
CumulativeMetrics
:
[]
metricapi
.
Metric
{},
}
node
,
err
:=
client
.
CoreV1
()
.
Nodes
()
.
Get
(
name
,
metaV1
.
GetOptions
{})
if
err
!=
nil
{
return
nil
,
err
return
&
podList
,
err
}
pods
,
err
:=
getNodePods
(
client
,
*
node
)
if
err
!=
nil
{
return
nil
,
err
return
&
podList
,
err
}
events
,
err
:=
event
.
GetPodsEvents
(
client
,
v1
.
NamespaceAll
,
pods
.
Items
)
if
err
!=
nil
{
return
nil
,
err
nonCriticalErrors
,
criticalError
:=
errors
.
HandleError
(
err
)
if
criticalError
!=
nil
{
return
&
podList
,
criticalError
}
podList
:=
pod
.
ToPodList
(
pods
.
Items
,
events
,
[]
error
{}
,
dsQuery
,
metricClient
)
podList
=
pod
.
ToPodList
(
pods
.
Items
,
events
,
nonCriticalErrors
,
dsQuery
,
metricClient
)
return
&
podList
,
nil
}
...
...
src/app/backend/resource/pod/detail.go
浏览文件 @
43ee97ee
...
...
@@ -186,7 +186,7 @@ func getPodCreator(client kubernetes.Interface, creatorAnnotation string, nsQuer
events
:=
<-
channels
.
EventList
.
List
if
err
:=
<-
channels
.
EventList
.
Error
;
err
!=
nil
{
return
nil
,
err
events
=
&
v1
.
EventList
{}
}
reference
:=
serializedReference
.
Reference
...
...
src/app/backend/resource/pod/events.go
浏览文件 @
43ee97ee
...
...
@@ -17,6 +17,7 @@ package pod
import
(
"log"
"github.com/kubernetes/dashboard/src/app/backend/api"
"github.com/kubernetes/dashboard/src/app/backend/resource/common"
"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
"github.com/kubernetes/dashboard/src/app/backend/resource/event"
...
...
@@ -26,16 +27,20 @@ import (
// GetEventsForPod gets events that are associated with this pod.
func
GetEventsForPod
(
client
client
.
Interface
,
dsQuery
*
dataselect
.
DataSelectQuery
,
namespace
,
podName
string
)
(
*
common
.
EventList
,
error
)
{
eventList
:=
common
.
EventList
{
Events
:
make
([]
common
.
Event
,
0
),
ListMeta
:
api
.
ListMeta
{
TotalItems
:
0
},
}
podEvents
,
err
:=
event
.
GetPodEvents
(
client
,
namespace
,
podName
)
if
err
!=
nil
{
return
nil
,
err
return
&
eventList
,
err
}
event
s
:
=
event
.
CreateEventList
(
podEvents
,
dsQuery
)
event
List
=
event
.
CreateEventList
(
podEvents
,
dsQuery
)
log
.
Printf
(
"Found %d events related to %s pod in %s namespace"
,
len
(
event
s
.
Events
),
podName
,
log
.
Printf
(
"Found %d events related to %s pod in %s namespace"
,
len
(
event
List
.
Events
),
podName
,
namespace
)
return
&
event
s
,
nil
return
&
event
List
,
nil
}
src/app/backend/resource/service/detail.go
浏览文件 @
43ee97ee
...
...
@@ -96,18 +96,18 @@ func GetServiceDetail(client k8sClient.Interface, metricClient metricapi.MetricC
// GetServicePods gets list of pods targeted by given label selector in given namespace.
func
GetServicePods
(
client
k8sClient
.
Interface
,
metricClient
metricapi
.
MetricClient
,
namespace
,
name
string
,
dsQuery
*
dataselect
.
DataSelectQuery
)
(
*
pod
.
PodList
,
error
)
{
podList
:=
pod
.
PodList
{
Pods
:
[]
pod
.
Pod
{},
CumulativeMetrics
:
[]
metricapi
.
Metric
{},
}
service
,
err
:=
client
.
CoreV1
()
.
Services
(
namespace
)
.
Get
(
name
,
metaV1
.
GetOptions
{})
if
err
!=
nil
{
return
nil
,
err
return
&
podList
,
err
}
if
service
.
Spec
.
Selector
==
nil
{
emptyPodList
:=
&
pod
.
PodList
{
Pods
:
[]
pod
.
Pod
{},
CumulativeMetrics
:
[]
metricapi
.
Metric
{},
}
return
emptyPodList
,
nil
return
&
podList
,
nil
}
labelSelector
:=
labels
.
SelectorFromSet
(
service
.
Spec
.
Selector
)
...
...
@@ -121,14 +121,15 @@ func GetServicePods(client k8sClient.Interface, metricClient metricapi.MetricCli
apiPodList
:=
<-
channels
.
PodList
.
List
if
err
:=
<-
channels
.
PodList
.
Error
;
err
!=
nil
{
return
nil
,
err
return
&
podList
,
err
}
events
,
err
:=
event
.
GetPodsEvents
(
client
,
namespace
,
apiPodList
.
Items
)
if
err
!=
nil
{
return
nil
,
err
nonCriticalErrors
,
criticalError
:=
errors
.
HandleError
(
err
)
if
criticalError
!=
nil
{
return
&
podList
,
criticalError
}
podList
:=
pod
.
ToPodList
(
apiPodList
.
Items
,
events
,
[]
error
{}
,
dsQuery
,
metricClient
)
podList
=
pod
.
ToPodList
(
apiPodList
.
Items
,
events
,
nonCriticalErrors
,
dsQuery
,
metricClient
)
return
&
podList
,
nil
}
src/app/backend/resource/service/events.go
浏览文件 @
43ee97ee
...
...
@@ -17,6 +17,7 @@ package service
import
(
"log"
"github.com/kubernetes/dashboard/src/app/backend/api"
"github.com/kubernetes/dashboard/src/app/backend/resource/common"
"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
"github.com/kubernetes/dashboard/src/app/backend/resource/event"
...
...
@@ -26,17 +27,21 @@ import (
// GetServiceEvents returns model events for a service with the given name in the given namespace.
func
GetServiceEvents
(
client
client
.
Interface
,
dsQuery
*
dataselect
.
DataSelectQuery
,
namespace
,
name
string
)
(
*
common
.
EventList
,
error
)
{
eventList
:=
common
.
EventList
{
Events
:
make
([]
common
.
Event
,
0
),
ListMeta
:
api
.
ListMeta
{
TotalItems
:
0
},
}
serviceEvents
,
err
:=
event
.
GetEvents
(
client
,
namespace
,
name
)
if
err
!=
nil
{
return
nil
,
err
return
&
eventList
,
err
}
if
!
event
.
IsTypeFilled
(
serviceEvents
)
{
serviceEvents
=
event
.
FillEventsType
(
serviceEvents
)
}
event
s
:
=
event
.
CreateEventList
(
serviceEvents
,
dsQuery
)
log
.
Printf
(
"Found %d events related to %s service in %s namespace"
,
len
(
event
s
.
Events
),
name
,
namespace
)
return
&
event
s
,
nil
event
List
=
event
.
CreateEventList
(
serviceEvents
,
dsQuery
)
log
.
Printf
(
"Found %d events related to %s service in %s namespace"
,
len
(
event
List
.
Events
),
name
,
namespace
)
return
&
event
List
,
nil
}
src/app/frontend/pod/detail/containerinfo.html
浏览文件 @
43ee97ee
...
...
@@ -27,14 +27,16 @@ limitations under the License.
<div
ng-if=
"::container.env.length"
>
<div
ng-repeat=
"env in ::container.env"
layout=
"row"
>
<span
ng-if=
"::$ctrl.isHref(env)"
>
<span
ng-if=
"::$ctrl.isHref(env)"
class=
"kd-env-href-wrapper"
>
{{::env.name}}
(
<a
ng-href=
"{{::$ctrl.getRefObjectHref(env)}}"
>
{{::$ctrl.getRefObjectName(env)}}
</a>
):
<span
ng-if=
"::$ctrl.isSecret(env)"
>
<md-button
ng-if=
"!$ctrl.isSecretVisible"
ng-click=
"::$ctrl.showSecret()"
class=
"md-icon-button kd-env-secret-button"
>
<i
class=
"material-icons kd-env-secret-icon"
>
visibility
</i>
<md-tooltip
md-direction=
"top"
>
[[Show secret value|Tooltip on container env variables taken from secret]]
</md-tooltip>
</md-button>
<span
ng-if=
"$ctrl.isSecretVisible"
class=
"kd-env-value"
>
{{::$ctrl.formatSecretValue(env.value)}}
</span>
<span
ng-if=
"$ctrl.isSecretVisible && env.value"
class=
"kd-env-value"
>
{{::$ctrl.formatSecretValue(env.value)}}
</span>
<span
ng-if=
"$ctrl.isSecretVisible && !env.value"
>
-
</span>
</span>
<pre
class=
"kd-env-config-map-value"
ng-if=
"!$ctrl.isSecret(env)"
>
{{::env.value}}
</pre>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录