Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
凌波微步_大先生
dashboard
提交
53d5235f
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 搜索 >>
提交
53d5235f
编写于
1月 07, 2020
作者:
Z
ZeHuaiWang
提交者:
Kubernetes Prow Robot
1月 07, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bug for pod status in replicaSet (#4698)
* fix bug for pod status in replicaSet * golangci fix
上级
acb9f1fb
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
10 deletion
+13
-10
src/app/backend/resource/replicaset/pods.go
src/app/backend/resource/replicaset/pods.go
+13
-10
未找到文件。
src/app/backend/resource/replicaset/pods.go
浏览文件 @
53d5235f
...
...
@@ -26,17 +26,16 @@ import (
apps
"k8s.io/api/apps/v1"
v1
"k8s.io/api/core/v1"
metaV1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/labels"
k8sClient
"k8s.io/client-go/kubernetes"
)
// GetReplicaSetPods return list of pods targeting replica set.
func
GetReplicaSetPods
(
client
k8sClient
.
Interface
,
metricClient
metricapi
.
MetricClient
,
dsQuery
*
dataselect
.
DataSelectQuery
,
pet
SetName
,
namespace
string
)
(
*
pod
.
PodList
,
error
)
{
log
.
Printf
(
"Getting replication controller %s pods in namespace %s"
,
pet
SetName
,
namespace
)
dsQuery
*
dataselect
.
DataSelectQuery
,
replica
SetName
,
namespace
string
)
(
*
pod
.
PodList
,
error
)
{
log
.
Printf
(
"Getting replication controller %s pods in namespace %s"
,
replica
SetName
,
namespace
)
pods
,
err
:=
getRawReplicaSetPods
(
client
,
pet
SetName
,
namespace
)
pods
,
err
:=
getRawReplicaSetPods
(
client
,
replica
SetName
,
namespace
)
if
err
!=
nil
{
return
pod
.
EmptyPodList
,
err
}
...
...
@@ -51,14 +50,18 @@ func GetReplicaSetPods(client k8sClient.Interface, metricClient metricapi.Metric
return
&
podList
,
nil
}
func
getRawReplicaSetPods
(
client
k8sClient
.
Interface
,
pet
SetName
,
namespace
string
)
([]
v1
.
Pod
,
error
)
{
rs
,
err
:=
client
.
AppsV1
()
.
ReplicaSets
(
namespace
)
.
Get
(
pet
SetName
,
metaV1
.
GetOptions
{})
func
getRawReplicaSetPods
(
client
k8sClient
.
Interface
,
replica
SetName
,
namespace
string
)
([]
v1
.
Pod
,
error
)
{
rs
,
err
:=
client
.
AppsV1
()
.
ReplicaSets
(
namespace
)
.
Get
(
replica
SetName
,
metaV1
.
GetOptions
{})
if
err
!=
nil
{
return
nil
,
err
}
labelSelector
:=
labels
.
SelectorFromSet
(
rs
.
Spec
.
Selector
.
MatchLabels
)
channels
:=
&
common
.
ResourceChannels
{
PodList
:
common
.
GetPodListChannel
(
client
,
common
.
NewSameNamespaceQuery
(
namespace
),
1
),
PodList
:
common
.
GetPodListChannelWithOptions
(
client
,
common
.
NewSameNamespaceQuery
(
namespace
),
metaV1
.
ListOptions
{
LabelSelector
:
labelSelector
.
String
(),
},
1
),
}
podList
:=
<-
channels
.
PodList
.
List
...
...
@@ -75,15 +78,15 @@ func getReplicaSetPodInfo(client k8sClient.Interface, replicaSet *apps.ReplicaSe
PodList
:
common
.
GetPodListChannelWithOptions
(
client
,
common
.
NewSameNamespaceQuery
(
replicaSet
.
Namespace
),
metaV1
.
ListOptions
{
LabelSelector
:
labelSelector
.
String
(),
FieldSelector
:
fields
.
Everything
()
.
String
(),
},
1
),
}
pod
s
:=
<-
channels
.
PodList
.
List
pod
List
:=
<-
channels
.
PodList
.
List
if
err
:=
<-
channels
.
PodList
.
Error
;
err
!=
nil
{
return
nil
,
err
}
podInfo
:=
common
.
GetPodInfo
(
replicaSet
.
Status
.
Replicas
,
replicaSet
.
Spec
.
Replicas
,
pods
.
Items
)
filterPod
:=
common
.
FilterPodsByControllerRef
(
replicaSet
,
podList
.
Items
)
podInfo
:=
common
.
GetPodInfo
(
replicaSet
.
Status
.
Replicas
,
replicaSet
.
Spec
.
Replicas
,
filterPod
)
return
&
podInfo
,
nil
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录