Skip to content

use CreateOrUpdate for OLM collect profiles resources #1018

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

Merged
openshift-merge-robot merged 1 commit into from
Feb 15, 2022
Merged

use CreateOrUpdate for OLM collect profiles resources #1018

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
22 changes: 13 additions & 9 deletions control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1912,9 +1912,11 @@ func (r *HostedControlPlaneReconciler) reconcileOperatorLifecycleManager(ctx con

// Collect Profiles
collectProfilesConfigMap := manifests.CollectProfilesConfigMap(hcp.Namespace)
olm.ReconcileCollectProfilesConfigMap(collectProfilesConfigMap, p.OwnerRef)
if err := r.Create(ctx, collectProfilesConfigMap); err != nil && !apierrors.IsAlreadyExists(err) {
return fmt.Errorf("failed to reconcile collect profiles cronjob: %w", err)
if _, err := r.CreateOrUpdate(ctx, r, collectProfilesConfigMap, func() error {
olm.ReconcileCollectProfilesConfigMap(collectProfilesConfigMap, p.OwnerRef)
return nil
}); err != nil {
return fmt.Errorf("failed to reconcile collect profiles config map: %w", err)
}

collectProfilesCronJob := manifests.CollectProfilesCronJob(hcp.Namespace)
Expand All @@ -1930,29 +1932,31 @@ func (r *HostedControlPlaneReconciler) reconcileOperatorLifecycleManager(ctx con
olm.ReconcileCollectProfilesRole(collectProfilesRole, p.OwnerRef)
return nil
}); err != nil {
return fmt.Errorf("failed to reconcile collect profiles cronjob: %w", err)
return fmt.Errorf("failed to reconcile collect profiles role: %w", err)
}

collectProfilesRoleBinding := manifests.CollectProfilesRoleBinding(hcp.Namespace)
if _, err := r.CreateOrUpdate(ctx, r, collectProfilesRoleBinding, func() error {
olm.ReconcileCollectProfilesRoleBinding(collectProfilesRoleBinding, p.OwnerRef)
return nil
}); err != nil {
return fmt.Errorf("failed to reconcile collect profiles cronjob: %w", err)
return fmt.Errorf("failed to reconcile collect profiles rolebinding: %w", err)
}

collectProfilesSecret := manifests.CollectProfilesSecret(hcp.Namespace)
olm.ReconcileCollectProfilesSecret(collectProfilesSecret, p.OwnerRef)
if err := r.Create(ctx, collectProfilesSecret); err != nil && !apierrors.IsAlreadyExists(err) {
return fmt.Errorf("failed to reconcile collect profiles cronjob: %w", err)
if _, err := r.CreateOrUpdate(ctx, r, collectProfilesSecret, func() error {
olm.ReconcileCollectProfilesSecret(collectProfilesSecret, p.OwnerRef)
return nil
}); err != nil {
return fmt.Errorf("failed to reconcile collect profiles secret: %w", err)
}

collectProfilesServiceAccount := manifests.CollectProfilesServiceAccount(hcp.Namespace)
if _, err := r.CreateOrUpdate(ctx, r, collectProfilesServiceAccount, func() error {
olm.ReconcileCollectProfilesServiceAccount(collectProfilesServiceAccount, p.OwnerRef)
return nil
}); err != nil {
return fmt.Errorf("failed to reconcile collect profiles cronjob: %w", err)
return fmt.Errorf("failed to reconcile collect profiles serviceaccount: %w", err)
}
return nil
}
Expand Down