Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
水淹萌龙
kubesphere
提交
049b3dd1
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看板
提交
049b3dd1
编写于
5月 13, 2019
作者:
J
Jeff
提交者:
zryfish
5月 13, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update router workload
上级
89f54da6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
20 addition
and
18 deletion
+20
-18
pkg/models/routers/routers.go
pkg/models/routers/routers.go
+20
-18
未找到文件。
pkg/models/routers/routers.go
浏览文件 @
049b3dd1
...
...
@@ -207,7 +207,7 @@ func CreateRouter(namespace string, routerType corev1.ServiceType, annotations m
}
}
err
:=
createRouterWorkload
(
namespace
,
routerType
==
corev1
.
ServiceTypeLoadBalancer
,
injectSidecar
)
err
:=
create
OrUpdate
RouterWorkload
(
namespace
,
routerType
==
corev1
.
ServiceTypeLoadBalancer
,
injectSidecar
)
if
err
!=
nil
{
glog
.
Error
(
err
)
return
nil
,
err
...
...
@@ -320,7 +320,7 @@ func deleteRouterService(namespace string) (*corev1.Service, error) {
return
service
,
nil
}
func
createRouterWorkload
(
namespace
string
,
publishService
bool
,
servicemeshEnabled
bool
)
error
{
func
create
OrUpdate
RouterWorkload
(
namespace
string
,
publishService
bool
,
servicemeshEnabled
bool
)
error
{
obj
,
ok
:=
routerTemplates
[
"DEPLOYMENT"
]
if
!
ok
{
glog
.
Error
(
"Deployment template file not loaded"
)
...
...
@@ -329,6 +329,7 @@ func createRouterWorkload(namespace string, publishService bool, servicemeshEnab
k8sClient
:=
k8s
.
Client
()
createDeployment
:=
true
deployment
:=
obj
.
(
*
extensionsv1beta1
.
Deployment
)
deployment
.
Name
=
constants
.
IngressControllerPrefix
+
namespace
...
...
@@ -355,7 +356,18 @@ func createRouterWorkload(namespace string, publishService bool, servicemeshEnab
deployment
.
Spec
.
Template
.
Spec
.
Containers
[
0
]
.
Args
=
append
(
deployment
.
Spec
.
Template
.
Spec
.
Containers
[
0
]
.
Args
,
"--report-node-internal-ip-address"
)
}
deployment
,
err
:=
k8sClient
.
ExtensionsV1beta1
()
.
Deployments
(
constants
.
IngressControllerNamespace
)
.
Create
(
deployment
)
_
,
err
:=
k8sClient
.
ExtensionsV1beta1
()
.
Deployments
(
constants
.
IngressControllerNamespace
)
.
Get
(
deployment
.
Name
,
meta_v1
.
GetOptions
{})
if
err
==
nil
{
createDeployment
=
false
}
if
createDeployment
{
deployment
,
err
=
k8sClient
.
ExtensionsV1beta1
()
.
Deployments
(
constants
.
IngressControllerNamespace
)
.
Create
(
deployment
)
}
else
{
deployment
,
err
=
k8sClient
.
ExtensionsV1beta1
()
.
Deployments
(
constants
.
IngressControllerNamespace
)
.
Update
(
deployment
)
}
if
err
!=
nil
{
glog
.
Error
(
err
)
return
err
...
...
@@ -411,22 +423,12 @@ func UpdateRouter(namespace string, routerType corev1.ServiceType, annotations m
return
router
,
err
}
routerAnnotations
:=
router
.
GetAnnotations
()
enableServicemesh
:=
annotations
[
SERVICEMESH_ENABLED
]
==
"true"
if
routerAnnotations
[
SERVICEMESH_ENABLED
]
!=
annotations
[
SERVICEMESH_ENABLED
]
||
routerType
!=
router
.
Spec
.
Type
{
err
=
deleteRouterWorkload
(
namespace
)
if
err
!=
nil
{
glog
.
Error
(
err
)
return
router
,
err
}
enableServicemesh
:=
annotations
[
SERVICEMESH_ENABLED
]
==
"true"
err
:=
createRouterWorkload
(
namespace
,
routerType
==
corev1
.
ServiceTypeLoadBalancer
,
enableServicemesh
)
if
err
!=
nil
{
glog
.
Error
(
err
)
return
router
,
err
}
err
=
createOrUpdateRouterWorkload
(
namespace
,
routerType
==
corev1
.
ServiceTypeLoadBalancer
,
enableServicemesh
)
if
err
!=
nil
{
glog
.
Error
(
err
)
return
router
,
err
}
newRouter
,
err
:=
updateRouterService
(
namespace
,
routerType
,
annotations
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录