karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2942 from helen-frank/fix/namespace_sync_controller-buildWorks 

need return after ch <-
This commit is contained in:
karmada-bot 2022-12-12 11:54:22 +08:00 committed by GitHub
parent 99845a6a16 681d51bd7f
commit 941637e805
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controllers/namespace/namespace_sync_controller.go
View File

@ -119,18 +119,21 @@ func (c *Controller) buildWorks(namespace *corev1.Namespace, clusters []clusterv
if err != nil { if err != nil {
klog.Errorf("Failed to apply overrides for %s/%s/%s, err is: %v", clonedNamespaced.GetKind(), clonedNamespaced.GetNamespace(), clonedNamespaced.GetName(), err) klog.Errorf("Failed to apply overrides for %s/%s/%s, err is: %v", clonedNamespaced.GetKind(), clonedNamespaced.GetNamespace(), clonedNamespaced.GetName(), err)
ch <- fmt.Errorf("sync namespace(%s) to cluster(%s) failed due to: %v", clonedNamespaced.GetName(), cluster.GetName(), err) ch <- fmt.Errorf("sync namespace(%s) to cluster(%s) failed due to: %v", clonedNamespaced.GetName(), cluster.GetName(), err)
return
} }
annotations, err := binding.RecordAppliedOverrides(cops, nil, nil) annotations, err := binding.RecordAppliedOverrides(cops, nil, nil)
if err != nil { if err != nil {
klog.Errorf("failed to record appliedOverrides, Error: %v", err) klog.Errorf("failed to record appliedOverrides, Error: %v", err)
ch <- fmt.Errorf("sync namespace(%s) to cluster(%s) failed due to: %v", clonedNamespaced.GetName(), cluster.GetName(), err) ch <- fmt.Errorf("sync namespace(%s) to cluster(%s) failed due to: %v", clonedNamespaced.GetName(), cluster.GetName(), err)
return
} }
workNamespace, err := names.GenerateExecutionSpaceName(cluster.Name) workNamespace, err := names.GenerateExecutionSpaceName(cluster.Name)
if err != nil { if err != nil {
klog.Errorf("Failed to generate execution space name for member cluster %s, err is %v", cluster.Name, err) klog.Errorf("Failed to generate execution space name for member cluster %s, err is %v", cluster.Name, err)
ch <- fmt.Errorf("sync namespace(%s) to cluster(%s) failed due to: %v", clonedNamespaced.GetName(), cluster.GetName(), err) ch <- fmt.Errorf("sync namespace(%s) to cluster(%s) failed due to: %v", clonedNamespaced.GetName(), cluster.GetName(), err)
return
} }
workName := names.GenerateWorkName(namespaceObj.GetKind(), namespaceObj.GetName(), namespaceObj.GetNamespace()) workName := names.GenerateWorkName(namespaceObj.GetKind(), namespaceObj.GetName(), namespaceObj.GetNamespace())
@ -149,6 +152,7 @@ func (c *Controller) buildWorks(namespace *corev1.Namespace, clusters []clusterv
if err = helper.CreateOrUpdateWork(c.Client, objectMeta, clonedNamespaced); err != nil { if err = helper.CreateOrUpdateWork(c.Client, objectMeta, clonedNamespaced); err != nil {
ch <- fmt.Errorf("sync namespace(%s) to cluster(%s) failed due to: %v", clonedNamespaced.GetName(), cluster.GetName(), err) ch <- fmt.Errorf("sync namespace(%s) to cluster(%s) failed due to: %v", clonedNamespaced.GetName(), cluster.GetName(), err)
return
} }
ch <- nil ch <- nil
}(&clusters[i], errChan) }(&clusters[i], errChan)