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 #807 from wawa0210/fix-ensureremoveexecutionspace 

refactor ensureRemoveExecutionSpace method
This commit is contained in:
karmada-bot 2021-10-15 17:46:05 +08:00 committed by GitHub
parent a9250c5977 0503a0e4a9
commit c97fa4b96e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/controllers/cluster/cluster_controller.go
View File

@ -130,12 +130,11 @@ func (c *Controller) removeCluster(cluster *clusterv1alpha1.Cluster) (controller
return controllerruntime.Result{Requeue: true}, err return controllerruntime.Result{Requeue: true}, err
} }
// make sure the given execution space has been deleted exist, err := c.ExecutionSpaceExistForCluster(cluster.Name)
existES, err := c.ensureRemoveExecutionSpace(cluster)
if err != nil { if err != nil {
klog.Errorf("Failed to check weather the execution space exist in the given member cluster or not, error is: %v", err) klog.Errorf("Failed to check weather the execution space exist in the given member cluster or not, error is: %v", err)
return controllerruntime.Result{Requeue: true}, err return controllerruntime.Result{Requeue: true}, err
} else if existES { } else if exist {
return controllerruntime.Result{Requeue: true}, fmt.Errorf("requeuing operation until the execution space %v deleted, ", cluster.Name) return controllerruntime.Result{Requeue: true}, fmt.Errorf("requeuing operation until the execution space %v deleted, ", cluster.Name)
} }
@ -166,18 +165,18 @@ func (c *Controller) removeExecutionSpace(cluster *clusterv1alpha1.Cluster) erro
return nil return nil
} }
// ensureRemoveExecutionSpace makes sure the given execution space has been deleted // ExecutionSpaceExistForCluster determine whether the execution space exists in the cluster
func (c *Controller) ensureRemoveExecutionSpace(cluster *clusterv1alpha1.Cluster) (bool, error) { func (c *Controller) ExecutionSpaceExistForCluster(clusterName string) (bool, error) {
executionSpaceName, err := names.GenerateExecutionSpaceName(cluster.Name) executionSpaceName, err := names.GenerateExecutionSpaceName(clusterName)
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", clusterName, err)
return false, err return false, err
} }
executionSpaceObj := &corev1.Namespace{} executionSpaceObj := &corev1.Namespace{}
err = c.Client.Get(context.TODO(), types.NamespacedName{Name: executionSpaceName}, executionSpaceObj) err = c.Client.Get(context.TODO(), types.NamespacedName{Name: executionSpaceName}, executionSpaceObj)
if apierrors.IsNotFound(err) { if apierrors.IsNotFound(err) {
klog.V(2).Infof("Removed execution space(%s)", executionSpaceName) klog.V(2).Infof("execution space(%s) no longer exists", executionSpaceName)
return false, nil return false, nil
} }
if err != nil { if err != nil {