This repository was archived by the owner on Jun 25, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
1 parent
7e706e9
commit f5c5a01
Showing
4 changed files
with
42 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -93,7 +93,11 @@ type OpenStackDataPlaneNodeSetReconciler struct { | |
| client.Client | ||
| Kclient kubernetes.Interface | ||
| Scheme *runtime.Scheme | ||
| Log logr.Logger | ||
| } | ||
|
|
||
| // Getlogger returns a logger object with a prefix of "conroller.name" and aditional controller context fields | ||
| func (r *OpenStackDataPlaneNodeSetReconciler) GetLogger(ctx context.Context) logr.Logger { | ||
| return log.FromContext(ctx).WithName("Controllers").WithName("OpenStackDataPlaneNodeSet") | ||
| } | ||
|
|
||
| //+kubebuilder:rbac:groups=dataplane.openstack.org,resources=openstackdataplanenodesets,verbs=get;list;watch;create;update;patch;delete | ||
|
|
@@ -129,8 +133,9 @@ type OpenStackDataPlaneNodeSetReconciler struct { | |
| // For more details, check Reconcile and its Result here: | ||
| // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile | ||
| func (r *OpenStackDataPlaneNodeSetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, _err error) { | ||
| logger := log.FromContext(ctx) | ||
| logger.Info("Reconciling NodeSet") | ||
|
|
||
| Log := r.GetLogger(ctx) | ||
| Log.Info("Reconciling NodeSet") | ||
|
|
||
| // Fetch the OpenStackDataPlaneNodeSet instance | ||
| instance := &dataplanev1.OpenStackDataPlaneNodeSet{} | ||
|
|
@@ -151,7 +156,7 @@ func (r *OpenStackDataPlaneNodeSetReconciler) Reconcile(ctx context.Context, req | |
| r.Client, | ||
| r.Kclient, | ||
| r.Scheme, | ||
| logger, | ||
| Log, | ||
| ) | ||
|
|
||
| // Always patch the instance status when exiting this function so we can persist any changes. | ||
|
|
@@ -169,7 +174,7 @@ func (r *OpenStackDataPlaneNodeSetReconciler) Reconcile(ctx context.Context, req | |
| } | ||
| err := helper.PatchInstance(ctx, instance) | ||
| if err != nil { | ||
| logger.Error(err, "Error updating instance status conditions") | ||
| Log.Error(err, "Error updating instance status conditions") | ||
| _err = err | ||
| return | ||
| } | ||
|
|
@@ -281,7 +286,7 @@ func (r *OpenStackDataPlaneNodeSetReconciler) Reconcile(ctx context.Context, req | |
| if instance.Status.Deployed && instance.DeletionTimestamp.IsZero() { | ||
| // The role is already deployed and not being deleted, so reconciliation | ||
| // is already complete. | ||
| logger.Info("NodeSet already deployed", "instance", instance) | ||
| Log.Info("NodeSet already deployed", "instance", instance) | ||
| return ctrl.Result{}, nil | ||
| } | ||
|
|
||
|
|
@@ -299,23 +304,23 @@ func (r *OpenStackDataPlaneNodeSetReconciler) Reconcile(ctx context.Context, req | |
| // Set DeploymentReadyCondition to False if it was unknown. | ||
| // Handles the case where the NodeSet is created, but not yet deployed. | ||
| if instance.Status.Conditions.IsUnknown(condition.DeploymentReadyCondition) { | ||
| logger.Info("Set DeploymentReadyCondition false") | ||
| Log.Info("Set DeploymentReadyCondition false") | ||
| instance.Status.Conditions.MarkFalse(condition.DeploymentReadyCondition, | ||
| condition.NotRequestedReason, condition.SeverityInfo, | ||
| condition.DeploymentReadyInitMessage) | ||
| } | ||
|
|
||
| deploymentExists, isDeploymentReady, err := checkDeployment(helper, req) | ||
| if err != nil { | ||
| logger.Error(err, "Unable to get deployed OpenStackDataPlaneDeployments.") | ||
| Log.Error(err, "Unable to get deployed OpenStackDataPlaneDeployments.") | ||
| return ctrl.Result{}, err | ||
| } | ||
| if isDeploymentReady { | ||
| logger.Info("Set NodeSet DeploymentReadyCondition true") | ||
| Log.Info("Set NodeSet DeploymentReadyCondition true") | ||
| instance.Status.Conditions.MarkTrue(condition.DeploymentReadyCondition, | ||
| condition.DeploymentReadyMessage) | ||
| } else if deploymentExists { | ||
| logger.Info("Set NodeSet DeploymentReadyCondition false") | ||
| Log.Info("Set NodeSet DeploymentReadyCondition false") | ||
| instance.Status.Conditions.MarkFalse(condition.DeploymentReadyCondition, | ||
| condition.RequestedReason, condition.SeverityInfo, | ||
| condition.DeploymentReadyRunningMessage) | ||
|
|
@@ -349,8 +354,9 @@ func checkDeployment(helper *helper.Helper, | |
| } | ||
|
|
||
| // SetupWithManager sets up the controller with the Manager. | ||
| func (r *OpenStackDataPlaneNodeSetReconciler) SetupWithManager(mgr ctrl.Manager) error { | ||
| func (r *OpenStackDataPlaneNodeSetReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error { | ||
| reconcileFunction := handler.EnqueueRequestsFromMapFunc(func(o client.Object) []reconcile.Request { | ||
| Log := r.GetLogger(ctx) | ||
| result := []reconcile.Request{} | ||
|
|
||
| // For each DNSMasq change event get the list of all | ||
|
|
@@ -362,7 +368,7 @@ func (r *OpenStackDataPlaneNodeSetReconciler) SetupWithManager(mgr ctrl.Manager) | |
| client.InNamespace(o.GetNamespace()), | ||
| } | ||
| if err := r.Client.List(context.Background(), nodeSets, listOpts...); err != nil { | ||
| r.Log.Error(err, "Unable to retrieve OpenStackDataPlaneNodeSetList %w") | ||
| Log.Error(err, "Unable to retrieve OpenStackDataPlaneNodeSetList %w") | ||
| return nil | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters