Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
水淹萌龙
kubesphere
提交
addf11c3
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看板
提交
addf11c3
编写于
4月 23, 2019
作者:
J
Jeff
提交者:
zryfish
4月 23, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix nodeport router
上级
dd963c0b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
14 deletion
+26
-14
pkg/apiserver/routers/routers.go
pkg/apiserver/routers/routers.go
+2
-3
pkg/constants/constants.go
pkg/constants/constants.go
+13
-11
pkg/models/components/components.go
pkg/models/components/components.go
+11
-0
未找到文件。
pkg/apiserver/routers/routers.go
浏览文件 @
addf11c3
...
...
@@ -144,9 +144,8 @@ func parseParameter(router Router) (routerType v1.ServiceType, annotationMap map
routerType
=
v1
.
ServiceTypeNodePort
if
strings
.
Compare
(
strings
.
ToLower
(
router
.
RouterType
),
"loadbalancer"
)
==
0
{
return
v1
.
ServiceTypeLoadBalancer
,
router
.
Annotations
,
nil
}
else
{
return
v1
.
ServiceTypeNodePort
,
make
(
map
[
string
]
string
,
0
),
nil
routerType
=
v1
.
ServiceTypeLoadBalancer
}
return
routerType
,
router
.
Annotations
,
nil
}
pkg/constants/constants.go
浏览文件 @
addf11c3
...
...
@@ -20,16 +20,18 @@ package constants
const
(
APIVersion
=
"v1alpha1"
KubeSystemNamespace
=
"kube-system"
OpenPitrixNamespace
=
"openpitrix-system"
IstioNamespace
=
"istio-system"
KubeSphereNamespace
=
"kubesphere-system"
KubeSphereControlNamespace
=
"kubesphere-controls-system"
IngressControllerNamespace
=
KubeSphereControlNamespace
AdminUserName
=
"admin"
DataHome
=
"/etc/kubesphere"
IngressControllerFolder
=
DataHome
+
"/ingress-controller"
IngressControllerPrefix
=
"kubesphere-router-"
KubeSystemNamespace
=
"kube-system"
OpenPitrixNamespace
=
"openpitrix-system"
IstioNamespace
=
"istio-system"
KubeSphereMonitoringNamespace
=
"kubesphere-monitoring-system"
KubeSphereLoggingNamespace
=
"kubesphere-logging-system"
KubeSphereNamespace
=
"kubesphere-system"
KubeSphereControlNamespace
=
"kubesphere-controls-system"
IngressControllerNamespace
=
KubeSphereControlNamespace
AdminUserName
=
"admin"
DataHome
=
"/etc/kubesphere"
IngressControllerFolder
=
DataHome
+
"/ingress-controller"
IngressControllerPrefix
=
"kubesphere-router-"
WorkspaceLabelKey
=
"kubesphere.io/workspace"
DisplayNameAnnotationKey
=
"displayName"
...
...
@@ -47,5 +49,5 @@ const (
var
(
WorkSpaceRoles
=
[]
string
{
WorkspaceAdmin
,
WorkspaceRegular
,
WorkspaceViewer
}
SystemNamespaces
=
[]
string
{
KubeSphereNamespace
,
OpenPitrixNamespace
,
KubeSystem
Namespace
}
SystemNamespaces
=
[]
string
{
KubeSphereNamespace
,
KubeSphereLoggingNamespace
,
KubeSphereMonitoringNamespace
,
OpenPitrixNamespace
,
KubeSystemNamespace
,
Istio
Namespace
}
)
pkg/models/components/components.go
浏览文件 @
addf11c3
...
...
@@ -18,6 +18,7 @@
package
components
import
(
"fmt"
meta_v1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"kubesphere.io/kubesphere/pkg/models"
"kubesphere.io/kubesphere/pkg/simple/client/k8s"
...
...
@@ -49,6 +50,10 @@ func GetComponentStatus(name string) (interface{}, error) {
return
nil
,
err
}
if
len
(
service
.
Spec
.
Selector
)
==
0
{
return
nil
,
fmt
.
Errorf
(
"component %s has no selector"
,
name
)
}
podLister
:=
informers
.
SharedInformerFactory
()
.
Core
()
.
V1
()
.
Pods
()
.
Lister
()
pods
,
err
:=
podLister
.
Pods
(
service
.
Namespace
)
.
List
(
labels
.
SelectorFromValidatedSet
(
service
.
Spec
.
Selector
))
...
...
@@ -148,6 +153,12 @@ func GetAllComponentsStatus() (map[string]interface{}, error) {
}
for
_
,
service
:=
range
services
{
// skip services without a selector
if
len
(
service
.
Spec
.
Selector
)
==
0
{
continue
}
component
:=
models
.
Component
{
Name
:
service
.
Name
,
Namespace
:
service
.
Namespace
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录