Skip to content

Expand ownership check for profile bundle controller #1098

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

Closed
rhmdnd wants to merge 1 commit into from
Closed

Expand ownership check for profile bundle controller #1098

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
11 changes: 11 additions & 0 deletions pkg/controller/profilebundle/profilebundle_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ var oneReplica int32 = 1
func (r *ReconcileProfileBundle) SetupWithManager(mgr ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mgr).
For(&compliancev1alpha1.ProfileBundle{}).
Owns(&appsv1.Deployment{}).
Complete(r)
}

Expand All @@ -67,6 +68,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
return ctrl.NewControllerManagedBy(mgr).
Named("profilebundle-controller").
For(&compliancev1alpha1.ProfileBundle{}).
Owns(&appsv1.Deployment{}).
Complete(r)
}

Expand Down Expand Up @@ -252,6 +254,15 @@ func (r *ReconcileProfileBundle) Reconcile(ctx context.Context, request reconcil
// Pod already exists and its init container at least ran - don't requeue
reqLogger.Info("Skip reconcile: Workload already up-to-date", "Deployment.Namespace", found.Namespace, "Deployment.Name", found.Name)

// If the ProfileBundle is still pending, the profileparser hasn't
// finished updating the status yet. Requeue so we can detect if
// it fails without updating the status (e.g., pod crash, rollout
// delay, API connectivity issues).
if instance.Status.DataStreamStatus == compliancev1alpha1.DataStreamPending {
reqLogger.Info("ProfileBundle still pending, requeueing to check status")
return reconcile.Result{Requeue: true, RequeueAfter: 10 * time.Second}, nil
}

// Handle upgrades
if instance.Status.DataStreamStatus == compliancev1alpha1.DataStreamValid &&
instance.Status.Conditions.GetCondition("Ready") == nil {
Expand Down
Loading