Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
KubeSphere
kubesphere
提交
ac3e83b4
K
kubesphere
项目概览
KubeSphere
/
kubesphere
通知
143
Star
32
Fork
5
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
2
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kubesphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
2
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
ac3e83b4
编写于
3月 17, 2021
作者:
K
KubeSphere CI Bot
提交者:
GitHub
3月 17, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3491 from duanjiong/ippool
modify ippool api resource to namespace scope
上级
3a79df0d
ff1587f4
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
17 addition
and
2 deletion
+17
-2
pkg/controller/network/ippool/ippool_controller.go
pkg/controller/network/ippool/ippool_controller.go
+16
-1
pkg/models/resources/v1alpha3/resource/resource.go
pkg/models/resources/v1alpha3/resource/resource.go
+1
-1
未找到文件。
pkg/controller/network/ippool/ippool_controller.go
浏览文件 @
ac3e83b4
...
...
@@ -402,9 +402,11 @@ func (c *IPPoolController) processNS(name string) error {
}
for
_
,
pool
:=
range
pools
{
if
pool
.
Status
.
Synced
{
poolsName
=
append
(
poolsName
,
pool
.
Name
)
}
}
}
clone
:=
ns
.
DeepCopy
()
err
=
c
.
provider
.
UpdateNamespace
(
clone
,
poolsName
)
...
...
@@ -534,6 +536,19 @@ func NewIPPoolController(
}
c
.
enqueueIPPools
(
new
)
},
DeleteFunc
:
func
(
new
interface
{})
{
_
,
defaultNew
:=
new
.
(
*
networkv1alpha1
.
IPPool
)
.
Labels
[
networkv1alpha1
.
IPPoolDefaultLabel
]
if
defaultNew
{
nss
,
err
:=
c
.
nsInformer
.
Lister
()
.
List
(
labels
.
Everything
())
if
err
!=
nil
{
return
}
for
_
,
ns
:=
range
nss
{
c
.
enqueueNamespace
(
nil
,
ns
)
}
}
},
})
//just for update ippool status
...
...
pkg/models/resources/v1alpha3/resource/resource.go
浏览文件 @
ac3e83b4
...
...
@@ -113,9 +113,9 @@ func NewResourceGetter(factory informers.InformerFactory, cache cache.Cache) *Re
clusterResourceGetters
[
schema
.
GroupVersionResource
{
Group
:
"apiextensions.k8s.io"
,
Version
:
"v1"
,
Resource
:
"customresourcedefinitions"
}]
=
customresourcedefinition
.
New
(
factory
.
ApiExtensionSharedInformerFactory
())
// kubesphere resources
namespacedResourceGetters
[
networkv1alpha1
.
SchemeGroupVersion
.
WithResource
(
networkv1alpha1
.
ResourcePluralIPPool
)]
=
ippool
.
New
(
factory
.
KubeSphereSharedInformerFactory
(),
factory
.
KubernetesSharedInformerFactory
())
clusterResourceGetters
[
devopsv1alpha3
.
SchemeGroupVersion
.
WithResource
(
devopsv1alpha3
.
ResourcePluralDevOpsProject
)]
=
devops
.
New
(
factory
.
KubeSphereSharedInformerFactory
())
clusterResourceGetters
[
tenantv1alpha1
.
SchemeGroupVersion
.
WithResource
(
tenantv1alpha1
.
ResourcePluralWorkspace
)]
=
workspace
.
New
(
factory
.
KubeSphereSharedInformerFactory
())
clusterResourceGetters
[
networkv1alpha1
.
SchemeGroupVersion
.
WithResource
(
networkv1alpha1
.
ResourcePluralIPPool
)]
=
ippool
.
New
(
factory
.
KubeSphereSharedInformerFactory
(),
factory
.
KubernetesSharedInformerFactory
())
clusterResourceGetters
[
tenantv1alpha1
.
SchemeGroupVersion
.
WithResource
(
tenantv1alpha2
.
ResourcePluralWorkspaceTemplate
)]
=
workspacetemplate
.
New
(
factory
.
KubeSphereSharedInformerFactory
())
clusterResourceGetters
[
iamv1alpha2
.
SchemeGroupVersion
.
WithResource
(
iamv1alpha2
.
ResourcesPluralGlobalRole
)]
=
globalrole
.
New
(
factory
.
KubeSphereSharedInformerFactory
())
clusterResourceGetters
[
iamv1alpha2
.
SchemeGroupVersion
.
WithResource
(
iamv1alpha2
.
ResourcesPluralWorkspaceRole
)]
=
workspacerole
.
New
(
factory
.
KubeSphereSharedInformerFactory
())
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录