Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
水淹萌龙
kubesphere
提交
9b16c058
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,发现更多精彩内容 >>
未验证
提交
9b16c058
编写于
6月 07, 2020
作者:
Z
zryfish
提交者:
GitHub
6月 07, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix openpitrix return non nil client when enpoint is empty (#2165)
上级
df348b19
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
74 addition
and
25 deletion
+74
-25
cmd/ks-apiserver/app/options/options.go
cmd/ks-apiserver/app/options/options.go
+1
-1
pkg/models/monitoring/monitoring.go
pkg/models/monitoring/monitoring.go
+18
-16
pkg/models/openpitrix/interface.go
pkg/models/openpitrix/interface.go
+4
-0
pkg/simple/client/openpitrix/openpitrix.go
pkg/simple/client/openpitrix/openpitrix.go
+51
-8
未找到文件。
cmd/ks-apiserver/app/options/options.go
浏览文件 @
9b16c058
...
...
@@ -179,7 +179,7 @@ func (s *ServerRunOptions) NewAPIServer(stopCh <-chan struct{}) (*apiserver.APIS
apiServer
.
AuditingClient
=
auditingClient
}
if
s
.
OpenPitrixOptions
!=
nil
{
if
s
.
OpenPitrixOptions
!=
nil
&&
!
s
.
OpenPitrixOptions
.
IsEmpty
()
{
opClient
,
err
:=
openpitrix
.
NewClient
(
s
.
OpenPitrixOptions
)
if
err
!=
nil
{
return
nil
,
err
...
...
pkg/models/monitoring/monitoring.go
浏览文件 @
9b16c058
...
...
@@ -188,24 +188,26 @@ func (mo monitoringOperator) GetKubeSphereStats() Metrics {
openpitrix
.
RepoId
:
openpitrix
.
BuiltinRepoId
,
},
}
tmpls
,
err
:=
mo
.
op
.
ListApps
(
cond
,
""
,
false
,
0
,
0
)
if
err
!=
nil
{
res
.
Results
=
append
(
res
.
Results
,
monitoring
.
Metric
{
MetricName
:
KubeSphereAppTmplCount
,
Error
:
err
.
Error
(),
})
}
else
{
res
.
Results
=
append
(
res
.
Results
,
monitoring
.
Metric
{
MetricName
:
KubeSphereAppTmplCount
,
MetricData
:
monitoring
.
MetricData
{
MetricType
:
monitoring
.
MetricTypeVector
,
MetricValues
:
[]
monitoring
.
MetricValue
{
{
Sample
:
&
monitoring
.
Point
{
now
,
float64
(
tmpls
.
TotalCount
)},
if
mo
.
op
!=
nil
{
tmpl
,
err
:=
mo
.
op
.
ListApps
(
cond
,
""
,
false
,
0
,
0
)
if
err
!=
nil
{
res
.
Results
=
append
(
res
.
Results
,
monitoring
.
Metric
{
MetricName
:
KubeSphereAppTmplCount
,
Error
:
err
.
Error
(),
})
}
else
{
res
.
Results
=
append
(
res
.
Results
,
monitoring
.
Metric
{
MetricName
:
KubeSphereAppTmplCount
,
MetricData
:
monitoring
.
MetricData
{
MetricType
:
monitoring
.
MetricTypeVector
,
MetricValues
:
[]
monitoring
.
MetricValue
{
{
Sample
:
&
monitoring
.
Point
{
now
,
float64
(
tmpl
.
TotalCount
)},
},
},
},
}
,
}
)
}
)
}
}
return
res
...
...
pkg/models/openpitrix/interface.go
浏览文件 @
9b16c058
...
...
@@ -37,6 +37,10 @@ type openpitrixOperator struct {
}
func
NewOpenpitrixOperator
(
informers
informers
.
SharedInformerFactory
,
opClient
openpitrix
.
Client
)
Interface
{
if
opClient
==
nil
{
return
nil
}
return
&
openpitrixOperator
{
ApplicationInterface
:
newApplicationOperator
(
informers
,
opClient
),
AppTemplateInterface
:
newAppTemplateOperator
(
opClient
),
...
...
pkg/simple/client/openpitrix/openpitrix.go
浏览文件 @
9b16c058
...
...
@@ -74,7 +74,15 @@ func parseToHostPort(endpoint string) (string, int, error) {
}
func
newRuntimeManagerClient
(
endpoint
string
)
(
pb
.
RuntimeManagerClient
,
error
)
{
if
len
(
endpoint
)
==
0
{
return
nil
,
nil
}
host
,
port
,
err
:=
parseToHostPort
(
endpoint
)
if
err
!=
nil
{
return
nil
,
err
}
conn
,
err
:=
manager
.
NewClient
(
host
,
port
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -82,7 +90,14 @@ func newRuntimeManagerClient(endpoint string) (pb.RuntimeManagerClient, error) {
return
pb
.
NewRuntimeManagerClient
(
conn
),
nil
}
func
newClusterManagerClient
(
endpoint
string
)
(
pb
.
ClusterManagerClient
,
error
)
{
if
len
(
endpoint
)
==
0
{
return
nil
,
nil
}
host
,
port
,
err
:=
parseToHostPort
(
endpoint
)
if
err
!=
nil
{
return
nil
,
err
}
conn
,
err
:=
manager
.
NewClient
(
host
,
port
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -90,7 +105,14 @@ func newClusterManagerClient(endpoint string) (pb.ClusterManagerClient, error) {
return
pb
.
NewClusterManagerClient
(
conn
),
nil
}
func
newCategoryManagerClient
(
endpoint
string
)
(
pb
.
CategoryManagerClient
,
error
)
{
if
len
(
endpoint
)
==
0
{
return
nil
,
nil
}
host
,
port
,
err
:=
parseToHostPort
(
endpoint
)
if
err
!=
nil
{
return
nil
,
err
}
conn
,
err
:=
manager
.
NewClient
(
host
,
port
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -99,7 +121,14 @@ func newCategoryManagerClient(endpoint string) (pb.CategoryManagerClient, error)
}
func
newAttachmentManagerClient
(
endpoint
string
)
(
pb
.
AttachmentManagerClient
,
error
)
{
if
len
(
endpoint
)
==
0
{
return
nil
,
nil
}
host
,
port
,
err
:=
parseToHostPort
(
endpoint
)
if
err
!=
nil
{
return
nil
,
err
}
conn
,
err
:=
manager
.
NewClient
(
host
,
port
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -108,7 +137,14 @@ func newAttachmentManagerClient(endpoint string) (pb.AttachmentManagerClient, er
}
func
newRepoManagerClient
(
endpoint
string
)
(
pb
.
RepoManagerClient
,
error
)
{
if
len
(
endpoint
)
==
0
{
return
nil
,
nil
}
host
,
port
,
err
:=
parseToHostPort
(
endpoint
)
if
err
!=
nil
{
return
nil
,
err
}
conn
,
err
:=
manager
.
NewClient
(
host
,
port
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -117,7 +153,14 @@ func newRepoManagerClient(endpoint string) (pb.RepoManagerClient, error) {
}
func
newRepoIndexer
(
endpoint
string
)
(
pb
.
RepoIndexerClient
,
error
)
{
if
len
(
endpoint
)
==
0
{
return
nil
,
nil
}
host
,
port
,
err
:=
parseToHostPort
(
endpoint
)
if
err
!=
nil
{
return
nil
,
err
}
conn
,
err
:=
manager
.
NewClient
(
host
,
port
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -126,7 +169,14 @@ func newRepoIndexer(endpoint string) (pb.RepoIndexerClient, error) {
}
func
newAppManagerClient
(
endpoint
string
)
(
pb
.
AppManagerClient
,
error
)
{
if
len
(
endpoint
)
==
0
{
return
nil
,
nil
}
host
,
port
,
err
:=
parseToHostPort
(
endpoint
)
if
err
!=
nil
{
return
nil
,
err
}
conn
,
err
:=
manager
.
NewClient
(
host
,
port
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -134,52 +184,45 @@ func newAppManagerClient(endpoint string) (pb.AppManagerClient, error) {
return
pb
.
NewAppManagerClient
(
conn
),
nil
}
// will return a nil client and nil error if endpoint is empty
func
NewClient
(
options
*
Options
)
(
Client
,
error
)
{
runtimeMangerClient
,
err
:=
newRuntimeManagerClient
(
options
.
RuntimeManagerEndpoint
)
if
err
!=
nil
{
klog
.
Error
(
err
)
return
nil
,
err
}
clusterManagerClient
,
err
:=
newClusterManagerClient
(
options
.
ClusterManagerEndpoint
)
if
err
!=
nil
{
klog
.
Error
(
err
)
return
nil
,
err
}
repoManagerClient
,
err
:=
newRepoManagerClient
(
options
.
RepoManagerEndpoint
)
if
err
!=
nil
{
klog
.
Error
(
err
)
return
nil
,
err
}
repoIndexerClient
,
err
:=
newRepoIndexer
(
options
.
RepoIndexerEndpoint
)
if
err
!=
nil
{
klog
.
Error
(
err
)
return
nil
,
err
}
appManagerClient
,
err
:=
newAppManagerClient
(
options
.
AppManagerEndpoint
)
if
err
!=
nil
{
klog
.
Error
(
err
)
return
nil
,
err
}
categoryManagerClient
,
err
:=
newCategoryManagerClient
(
options
.
CategoryManagerEndpoint
)
if
err
!=
nil
{
klog
.
Error
(
err
)
return
nil
,
err
}
attachmentManagerClient
,
err
:=
newAttachmentManagerClient
(
options
.
AttachmentManagerEndpoint
)
if
err
!=
nil
{
klog
.
Error
(
err
)
return
nil
,
err
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录