Skip to content

Commit 43ca2d9

Browse files
authored
Merge pull request karmada-io#2698 from ikaven1024/ut-cluster
[ut] add ut for cluster.go, clusterlease.go, membercluster_client.go
2 parents 026781f + 68e24a2 commit 43ca2d9

File tree

4 files changed

+943
-41
lines changed

4 files changed

+943
-41
lines changed

pkg/util/cluster.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ type ClusterRegisterOption struct {
5151

5252
// IsKubeCredentialsEnabled represents whether report secret
5353
func (r ClusterRegisterOption) IsKubeCredentialsEnabled() bool {
54-
if len(r.ReportSecrets) == 1 && r.ReportSecrets[0] == None {
55-
return false
56-
}
5754
for _, sct := range r.ReportSecrets {
5855
if sct == KubeCredentials {
5956
return true
@@ -64,9 +61,6 @@ func (r ClusterRegisterOption) IsKubeCredentialsEnabled() bool {
6461

6562
// IsKubeImpersonatorEnabled represents whether report impersonator secret
6663
func (r ClusterRegisterOption) IsKubeImpersonatorEnabled() bool {
67-
if len(r.ReportSecrets) == 1 && r.ReportSecrets[0] == None {
68-
return false
69-
}
7064
for _, sct := range r.ReportSecrets {
7165
if sct == KubeImpersonator {
7266
return true
@@ -146,7 +140,7 @@ func GetClusterWithKarmadaClient(client karmadaclientset.Interface, name string)
146140
return nil, false, nil
147141
}
148142

149-
klog.Warningf("failed to retrieve cluster(%s). error: %v", cluster.Name, err)
143+
klog.Warningf("failed to retrieve cluster(%s). error: %v", name, err)
150144
return nil, false, err
151145
}
152146

@@ -174,7 +168,7 @@ func updateCluster(controlPlaneClient karmadaclientset.Interface, cluster *clust
174168
}
175169

176170
// ObtainClusterID returns the cluster ID property with clusterKubeClient
177-
func ObtainClusterID(clusterKubeClient *kubernetes.Clientset) (string, error) {
171+
func ObtainClusterID(clusterKubeClient kubernetes.Interface) (string, error) {
178172
ns, err := clusterKubeClient.CoreV1().Namespaces().Get(context.TODO(), metav1.NamespaceSystem, metav1.GetOptions{})
179173
if err != nil {
180174
return "", err

0 commit comments

Comments
 (0)