Style changes and some more (#17)

* minor style change

Signed-off-by: zhangzhengyuan <[email protected]>

* style change

Signed-off-by: zhangzhengyuan <[email protected]>

* use stricter test in Reconcile

Signed-off-by: zhangzhengyuan <[email protected]>

* Revert "style change"

This reverts commit ac60260dd328fb2ceb78d5fda67ff739f86f8469.

Author: Ruminateer

controllers/paddlejob_controller.go

@@ -195,7 +195,7 @@ func (r *PaddleJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		}
 	}
 
-	if getPaddleJobAlivePods(&pdj) == getPaddleJobReplicas(&pdj) {
+	if len(pdj.Status.PS.Refs) == pdj.Spec.PS.Replicas && len(pdj.Status.Worker.Refs) == pdj.Spec.Worker.Replicas {
 		if err := r.Get(ctx, types.NamespacedName{Name: pdj.Name, Namespace: pdj.Namespace}, &corev1.ConfigMap{}); err == nil || !apierrors.IsNotFound(err) {
 			return ctrl.Result{}, err
 		}
@@ -273,21 +273,20 @@ func (r *PaddleJobReconciler) deleteResource(ctx context.Context, pdj *pdv1.Padd
 	if err := r.Delete(ctx, obj, client.PropagationPolicy(metav1.DeletePropagationBackground)); (err) != nil {
 		r.Recorder.Event(pdj, corev1.EventTypeWarning, "Delete", fmt.Sprintf("delete failed %s %s", tp, obj.GetName()))
 		return err
-	} else {
-		r.Recorder.Event(pdj, corev1.EventTypeNormal, "Deleted", fmt.Sprintf("deleted %s %s", tp, obj.GetName()))
-		return nil
 	}
+	r.Recorder.Event(pdj, corev1.EventTypeNormal, "Deleted", fmt.Sprintf("deleted %s %s", tp, obj.GetName()))
+	return nil
 }
 
 func (r *PaddleJobReconciler) createResource(ctx context.Context, pdj *pdv1.PaddleJob, obj client.Object) error {
 	tp := obj.GetObjectKind().GroupVersionKind().Kind
 	if err := r.Create(ctx, obj); err != nil {
 		r.Recorder.Event(pdj, corev1.EventTypeWarning, "Create", fmt.Sprintf("create failed %s %s", tp, obj.GetName()))
 		return err
-	} else {
-		r.Recorder.Event(pdj, corev1.EventTypeNormal, "Created", fmt.Sprintf("created %s %s", tp, obj.GetName()))
-		return nil
 	}
+	r.Recorder.Event(pdj, corev1.EventTypeNormal, "Created", fmt.Sprintf("created %s %s", tp, obj.GetName()))
+	return nil
+
 }
 
 func (r *PaddleJobReconciler) finalize(ctx context.Context, pdj *pdv1.PaddleJob) error {

controllers/paddlejob_helper.go

@@ -18,28 +18,21 @@ package controllers
 
 import (
 	"fmt"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"strconv"
 	"strings"
 
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	pdv1 "github.com/paddleflow/paddle-operator/api/v1"
 )
 
 const (
-	INIT_CONTAINER_NAME          = "init-paddle"
+	initContainerName            = "init-paddle"
 	schedulingPodGroupAnnotation = "scheduling.k8s.io/group-name"
 	schedulerNameVolcano         = "volcano"
 )
 
-func getPaddleJobAlivePods(pdj *pdv1.PaddleJob) int {
-	return len(pdj.Status.PS.Refs) + len(pdj.Status.Worker.Refs)
-}
-
-func getPaddleJobReplicas(pdj *pdv1.PaddleJob) int {
-	return pdj.Spec.PS.Replicas + pdj.Spec.Worker.Replicas
-}
-
 func getPaddleJobPhase(pdj *pdv1.PaddleJob) pdv1.PaddleJobPhase {
 
 	if pdj.Status.Phase == pdv1.Completed {
@@ -268,7 +261,7 @@ func isPodInitializing(pod *corev1.Pod) bool {
 	}
 	for i := range pod.Status.InitContainerStatuses {
 		container := pod.Status.InitContainerStatuses[i]
-		if container.Name == INIT_CONTAINER_NAME && container.State.Running != nil {
+		if container.Name == initContainerName && container.State.Running != nil {
 			return true
 		}
 	}
@@ -284,7 +277,7 @@ func constructService4Pod(pod corev1.Pod) *corev1.Service {
 		},
 		Spec: corev1.ServiceSpec{
 			Ports: []corev1.ServicePort{
-				corev1.ServicePort{
+				{
 					Port: pdv1.PADDLE_PORT,
 				},
 			},