Skip to content
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

Prefactor: extract central CR reconciliation to dedicated function in fleetshard central reconciler #1054

Merged
merged 2 commits into from
Jun 19, 2023
Merged

Prefactor: extract central CR reconciliation to dedicated function in fleetshard central reconciler #1054

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4d86d1
Prefactor: extract central CR reconciliation to dedicated function in…
rhybrillou Jun 13, 2023
4b2a7c7
Pass remoteCentral by pointer
rhybrillou Jun 13, 2023
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
81 changes: 46 additions & 35 deletions fleetshard/pkg/central/reconciler/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,41 +291,8 @@ func (r *CentralReconciler) Reconcile(ctx context.Context, remoteCentral private
}
}

centralExists := true
existingCentral := v1alpha1.Central{}
err = r.client.Get(ctx, ctrlClient.ObjectKey{Namespace: remoteCentralNamespace, Name: remoteCentralName}, &existingCentral)
if err != nil {
if !apiErrors.IsNotFound(err) {
return nil, errors.Wrapf(err, "unable to check the existence of central %s/%s", central.GetNamespace(), central.GetName())
}
centralExists = false
}

if !centralExists {
if central.GetAnnotations() == nil {
central.Annotations = map[string]string{}
}
if err := util.IncrementCentralRevision(central); err != nil {
return nil, errors.Wrap(err, "incrementing central's revision")
}

glog.Infof("Creating central %s/%s", central.GetNamespace(), central.GetName())
if err := r.client.Create(ctx, central); err != nil {
return nil, errors.Wrapf(err, "creating new central %s/%s", remoteCentralNamespace, remoteCentralName)
}
glog.Infof("Central %s/%s created", central.GetNamespace(), central.GetName())
} else {
glog.Infof("Update central %s/%s", central.GetNamespace(), central.GetName())
existingCentral.Spec = central.Spec

if err := util.IncrementCentralRevision(&existingCentral); err != nil {
return nil, errors.Wrap(err, "incrementing central's revision")
}
existingCentral.Spec = *central.Spec.DeepCopy()

if err := r.client.Update(ctx, &existingCentral); err != nil {
return nil, errors.Wrapf(err, "updating central %s/%s", central.GetNamespace(), central.GetName())
}
if err = r.reconcileCentral(ctx, &remoteCentral, central); err != nil {
return nil, err
}

centralTLSSecretFound := true // pragma: allowlist secret
Expand Down Expand Up @@ -369,6 +336,50 @@ func (r *CentralReconciler) Reconcile(ctx context.Context, remoteCentral private
return status, nil
}

func (r *CentralReconciler) reconcileCentral(ctx context.Context, remoteCentral *private.ManagedCentral, central *v1alpha1.Central) error {
remoteCentralName := remoteCentral.Metadata.Name
remoteCentralNamespace := remoteCentral.Metadata.Namespace

centralExists := true
existingCentral := v1alpha1.Central{}
err := r.client.Get(ctx, ctrlClient.ObjectKey{Namespace: remoteCentralNamespace, Name: remoteCentralName}, &existingCentral)
if err != nil {
if !apiErrors.IsNotFound(err) {
return errors.Wrapf(err, "unable to check the existence of central %s/%s", central.GetNamespace(), central.GetName())
}
centralExists = false
}

if !centralExists {
if central.GetAnnotations() == nil {
central.Annotations = map[string]string{}
}
if err := util.IncrementCentralRevision(central); err != nil {
return errors.Wrap(err, "incrementing central's revision")
}

glog.Infof("Creating central %s/%s", central.GetNamespace(), central.GetName())
if err := r.client.Create(ctx, central); err != nil {
return errors.Wrapf(err, "creating new central %s/%s", remoteCentralNamespace, remoteCentralName)
}
glog.Infof("Central %s/%s created", central.GetNamespace(), central.GetName())
} else {
glog.Infof("Update central %s/%s", central.GetNamespace(), central.GetName())
existingCentral.Spec = central.Spec

if err := util.IncrementCentralRevision(&existingCentral); err != nil {
return errors.Wrap(err, "incrementing central's revision")
}
existingCentral.Spec = *central.Spec.DeepCopy()

if err := r.client.Update(ctx, &existingCentral); err != nil {
return errors.Wrapf(err, "updating central %s/%s", central.GetNamespace(), central.GetName())
}
}

return nil
}

func (r *CentralReconciler) reconcileAuthProvider(ctx context.Context, remoteCentral *private.ManagedCentral) error {
// Skip auth provider initialisation if:
// 1. Auth provider is already created
Expand Down