Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2020fengziyang
kubesphere
提交
e8c1d6fb
K
kubesphere
项目概览
2020fengziyang
/
kubesphere
与 Fork 源项目一致
Fork自
KubeSphere / kubesphere
通知
1
Star
1
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,发现更多精彩内容 >>
提交
e8c1d6fb
编写于
4月 08, 2019
作者:
J
Jeff
提交者:
zryfish
4月 08, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add node ip to router
上级
9a9664f0
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
65 addition
and
4 deletion
+65
-4
pkg/models/routers/routers.go
pkg/models/routers/routers.go
+65
-4
未找到文件。
pkg/models/routers/routers.go
浏览文件 @
e8c1d6fb
...
...
@@ -20,13 +20,14 @@ package routers
import
(
"fmt"
"github.com/golang/glog"
"io/ioutil"
"kubesphere.io/kubesphere/pkg/simple/client/k8s"
"sort"
"k8s.io/apimachinery/pkg/labels"
"kubesphere.io/kubesphere/pkg/informers"
"github.com/golang/glog"
corev1
"k8s.io/api/core/v1"
extensionsv1beta1
"k8s.io/api/extensions/v1beta1"
meta_v1
"k8s.io/apimachinery/pkg/apis/meta/v1"
...
...
@@ -40,12 +41,68 @@ import (
"kubesphere.io/kubesphere/pkg/models/iam"
)
// choose router node ip by labels, currently select master node
var
RouterNodeIPLabelSelector
=
map
[
string
]
string
{
"node-role.kubernetes.io/master"
:
""
,
}
// get master node ip, if there are multiple master nodes,
// choose first one according by their names alphabetically
func
getMasterNodeIp
()
string
{
nodeLister
:=
informers
.
SharedInformerFactory
()
.
Core
()
.
V1
()
.
Nodes
()
.
Lister
()
selector
:=
labels
.
SelectorFromSet
(
RouterNodeIPLabelSelector
)
masters
,
err
:=
nodeLister
.
List
(
selector
)
sort
.
Slice
(
masters
,
func
(
i
,
j
int
)
bool
{
return
strings
.
Compare
(
masters
[
i
]
.
Name
,
masters
[
j
]
.
Name
)
>
0
})
if
err
!=
nil
{
glog
.
Error
(
err
)
return
""
}
if
len
(
masters
)
==
0
{
return
""
}
else
{
for
_
,
address
:=
range
masters
[
0
]
.
Status
.
Addresses
{
if
address
.
Type
==
corev1
.
NodeInternalIP
{
return
address
.
Address
}
}
}
return
""
}
func
addLoadBalancerIp
(
service
*
corev1
.
Service
)
{
// append selected node ip as loadbalancer ingress ip
if
len
(
service
.
Status
.
LoadBalancer
.
Ingress
)
==
0
{
rip
:=
getMasterNodeIp
()
if
len
(
rip
)
==
0
{
glog
.
Info
(
"can not get node ip"
)
return
}
gIngress
:=
corev1
.
LoadBalancerIngress
{
IP
:
rip
,
}
service
.
Status
.
LoadBalancer
.
Ingress
=
append
(
service
.
Status
.
LoadBalancer
.
Ingress
,
gIngress
)
}
}
func
GetAllRouters
()
([]
*
corev1
.
Service
,
error
)
{
selector
:=
labels
.
SelectorFromSet
(
labels
.
Set
{
"app"
:
"kubesphere"
,
"component"
:
"ks-router"
,
"tier"
:
"backend"
})
serviceLister
:=
informers
.
SharedInformerFactory
()
.
Core
()
.
V1
()
.
Services
()
.
Lister
()
services
,
err
:=
serviceLister
.
Services
(
constants
.
IngressControllerNamespace
)
.
List
(
selector
)
for
i
:=
range
services
{
addLoadBalancerIp
(
services
[
i
])
}
if
err
!=
nil
{
glog
.
Error
(
err
)
return
nil
,
err
...
...
@@ -79,6 +136,7 @@ func GetAllRoutersOfUser(username string) ([]*corev1.Service, error) {
glog
.
Error
(
err
)
return
routers
,
err
}
else
if
router
!=
nil
{
addLoadBalancerIp
(
router
)
routers
=
append
(
routers
,
router
)
}
}
...
...
@@ -99,9 +157,10 @@ func GetRouter(namespace string) (*corev1.Service, error) {
glog
.
Error
(
err
)
return
nil
,
err
}
for
_
,
s
:=
range
services
{
if
s
.
Name
==
serviceName
{
return
s
,
nil
for
i
:=
range
services
{
if
services
[
i
]
.
Name
==
serviceName
{
addLoadBalancerIp
(
services
[
i
])
return
services
[
i
],
nil
}
}
...
...
@@ -208,6 +267,7 @@ func CreateRouter(namespace string, routerType corev1.ServiceType, annotations m
}
}
addLoadBalancerIp
(
router
)
return
router
,
nil
}
...
...
@@ -312,5 +372,6 @@ func UpdateRouter(namespace string, routerType corev1.ServiceType, annotations m
}
}
addLoadBalancerIp
(
router
)
return
router
,
nil
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录