Skip to content

[ISSUE #143] Loop reconcile console which can get the latest nameserver address #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[ISSUE #143] Loop reconcile console which can get the latest nameserver address #238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions pkg/controller/console/console_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,18 +156,14 @@ func (r *ReconcileConsole) Reconcile(ctx context.Context, request reconcile.Requ
return reconcile.Result{}, err
}

// created successfully - don't requeue
return reconcile.Result{}, nil
return reconcile.Result{
Requeue: true,
RequeueAfter: time.Duration(cons.RequeueIntervalInSecond) * time.Second,
}, nil
} else if err != nil {
return reconcile.Result{}, err
}

// Support console deployment update
if !reflect.DeepEqual(instance.Spec.ConsoleDeployment.Spec.Replicas, found.Spec.Replicas) ||
!reflect.DeepEqual(instance.Spec.ConsoleDeployment.Spec.Template.Spec.Containers[0].Resources, found.Spec.Template.Spec.Containers[0].Resources) {

found.Spec.Replicas = instance.Spec.ConsoleDeployment.Spec.Replicas
found.Spec.Template.Spec.Containers[0].Resources = instance.Spec.ConsoleDeployment.Spec.Template.Spec.Containers[0].Resources
} else if !reflect.DeepEqual(consoleDeployment.Spec, found.Spec) {
found.Spec = *consoleDeployment.Spec.DeepCopy()
err = r.client.Update(context.TODO(), found)
if err != nil {
reqLogger.Error(err, "Failed to update console CR", "Namespace", found.Namespace, "Name", found.Name)
Expand All @@ -176,11 +172,10 @@ func (r *ReconcileConsole) Reconcile(ctx context.Context, request reconcile.Requ
}
}

// TODO: update console if name server address changes

// CR already exists - don't requeue
reqLogger.Info("Skip reconcile: RocketMQ Console Deployment already exists", "Namespace", found.Namespace, "Name", found.Name)
return reconcile.Result{}, nil
return reconcile.Result{
Requeue: true,
RequeueAfter: time.Duration(cons.RequeueIntervalInSecond) * time.Second,
}, nil
}

// newDeploymentForCR returns a deployment pod with modifying the ENV
Expand Down
Loading