fix the reference of option's field

yunionio · Jun 16, 2020 · 368fcf2 · 368fcf2
1 parent 2bdd574
commit 368fcf2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/controllers/ansibleplaybook_controller.go b/controllers/ansibleplaybook_controller.go
@@ -37,12 +37,6 @@ import (
 	"yunion.io/x/onecloud-service-operator/pkg/resources"
 )
 
-var (
-	apPendingAfter = time.Duration(options.Options.AnsiblePlaybookConfig.IntervalPending) * time.Second
-	apWaitingAfter = time.Duration(options.Options.AnsiblePlaybookConfig.IntervalWaiting) * time.Second
-	dense          = options.Options.AnsiblePlaybookConfig.Dense
-)
-
 // AnsiblePlaybookReconciler reconciles a AnsiblePlaybook object
 type AnsiblePlaybookReconciler struct {
 	client.Client
@@ -72,6 +66,11 @@ func (r *AnsiblePlaybookReconciler) Reconcile(req ctrl.Request) (ctrl.Result, er
 		return dealErr(ctx, log, r, &ansiblePlaybook, resources.ResourceAP, err)
 	}
 
+	var (
+		apPendingAfter = time.Duration(options.Options.AnsiblePlaybookConfig.IntervalPending) * time.Second
+		dense          = options.Options.AnsiblePlaybookConfig.Dense
+	)
+
 	myFinalizerName := "virtualmachine.finalizers.onecloud.yunion.io"
 	// add finalizer
 	if ansiblePlaybook.ObjectMeta.DeletionTimestamp.IsZero() {
@@ -377,6 +376,7 @@ func (r *AnsiblePlaybookReconciler) markWaiting(ctx context.Context, log logr.Lo
 	newStatus := ap.Status.DeepCopy()
 	newStatus.Phase = onecloudv1.ResourceWaiting
 	newStatus.Reason = msg
+	apWaitingAfter := time.Duration(options.Options.AnsiblePlaybookConfig.IntervalWaiting) * time.Second
 	if !r.requireUpdate(ap, newStatus) {
 		log.Info(fmt.Sprintf("no need to update, requeue after %d s", 15))
 		return ctrl.Result{Requeue: true, RequeueAfter: apWaitingAfter}, nil

diff --git a/controllers/virtualmachine_controller.go b/controllers/virtualmachine_controller.go
@@ -32,10 +32,6 @@ import (
 	"yunion.io/x/onecloud-service-operator/pkg/util"
 )
 
-var (
-	vmPendingAfter = time.Duration(options.Options.VirtualMachineConfig.IntervalPending) * time.Minute
-)
-
 // VirtualMachineReconciler reconciles a VirtualMachine object
 type VirtualMachineReconciler struct {
 	client.Client
@@ -61,6 +57,10 @@ func (r *VirtualMachineReconciler) Reconcile(req ctrl.Request) (ctrl.Result, err
 		return dealErr(ctx, log, r, &virtualMachine, resources.ResourceVM, err)
 	}
 
+	var (
+		vmPendingAfter = time.Duration(options.Options.VirtualMachineConfig.IntervalPending) * time.Minute
+	)
+
 	myFinalizerName := "virtualmachine.finalizers.onecloud.yunion.io"
 	// add finalizer
 	if virtualMachine.ObjectMeta.DeletionTimestamp.IsZero() {
@@ -160,7 +160,7 @@ func (r *VirtualMachineReconciler) Reconcile(req ctrl.Request) (ctrl.Result, err
 
 	// Pending
 	if virtualMachine.Status.Phase == onecloudv1.ResourcePending {
-		return ctrl.Result{Requeue: true, RequeueAfter: 5 * time.Second}, nil
+		return ctrl.Result{Requeue: true, RequeueAfter: vmPendingAfter * time.Second}, nil
 	}
 
 	// Unkown