Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
KubeSphere
kubesphere
提交
62b39810
K
kubesphere
项目概览
KubeSphere
/
kubesphere
通知
144
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,发现更多精彩内容 >>
提交
62b39810
编写于
11月 20, 2020
作者:
Y
yuswift
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
bugfix: multi-cluster-status-condition
Signed-off-by:
N
yuswift
<
yuswiftli@yunify.com
>
上级
f6fea24a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
17 deletion
+11
-17
pkg/controller/cluster/cluster_controller.go
pkg/controller/cluster/cluster_controller.go
+11
-17
未找到文件。
pkg/controller/cluster/cluster_controller.go
浏览文件 @
62b39810
...
@@ -20,6 +20,12 @@ import (
...
@@ -20,6 +20,12 @@ import (
"bytes"
"bytes"
"encoding/json"
"encoding/json"
"fmt"
"fmt"
"math/rand"
"net/http"
"reflect"
"sync"
"time"
v1
"k8s.io/api/core/v1"
v1
"k8s.io/api/core/v1"
apiextv1b1
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextv1b1
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
"k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/equality"
...
@@ -39,17 +45,13 @@ import (
...
@@ -39,17 +45,13 @@ import (
"k8s.io/client-go/tools/record"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/workqueue"
"k8s.io/client-go/util/workqueue"
"k8s.io/klog"
"k8s.io/klog"
fedv1b1
"sigs.k8s.io/kubefed/pkg/apis/core/v1beta1"
clusterv1alpha1
"kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
clusterv1alpha1
"kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
clusterclient
"kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/cluster/v1alpha1"
clusterclient
"kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/cluster/v1alpha1"
clusterinformer
"kubesphere.io/kubesphere/pkg/client/informers/externalversions/cluster/v1alpha1"
clusterinformer
"kubesphere.io/kubesphere/pkg/client/informers/externalversions/cluster/v1alpha1"
clusterlister
"kubesphere.io/kubesphere/pkg/client/listers/cluster/v1alpha1"
clusterlister
"kubesphere.io/kubesphere/pkg/client/listers/cluster/v1alpha1"
"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
"math/rand"
"net/http"
"reflect"
fedv1b1
"sigs.k8s.io/kubefed/pkg/apis/core/v1beta1"
"sync"
"time"
)
)
// Cluster controller only runs under multicluster mode. Cluster controller is following below steps,
// Cluster controller only runs under multicluster mode. Cluster controller is following below steps,
...
@@ -792,23 +794,15 @@ func (c *clusterController) updateClusterCondition(cluster *clusterv1alpha1.Clus
...
@@ -792,23 +794,15 @@ func (c *clusterController) updateClusterCondition(cluster *clusterv1alpha1.Clus
}
}
newConditions
:=
make
([]
clusterv1alpha1
.
ClusterCondition
,
0
)
newConditions
:=
make
([]
clusterv1alpha1
.
ClusterCondition
,
0
)
needToUpdate
:=
true
for
_
,
cond
:=
range
cluster
.
Status
.
Conditions
{
for
_
,
cond
:=
range
cluster
.
Status
.
Conditions
{
if
cond
.
Type
==
condition
.
Type
{
if
cond
.
Type
==
condition
.
Type
{
if
cond
.
Status
==
condition
.
Status
{
continue
needToUpdate
=
false
continue
}
else
{
newConditions
=
append
(
newConditions
,
cond
)
}
}
}
newConditions
=
append
(
newConditions
,
cond
)
newConditions
=
append
(
newConditions
,
cond
)
}
}
if
needToUpdate
{
newConditions
=
append
(
newConditions
,
condition
)
newConditions
=
append
(
newConditions
,
condition
)
cluster
.
Status
.
Conditions
=
newConditions
cluster
.
Status
.
Conditions
=
newConditions
}
}
}
// joinFederation joins a cluster into federation clusters.
// joinFederation joins a cluster into federation clusters.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录