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.

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

Conversation

rhybrillou
Copy link
Contributor

Description

Checklist (Definition of Done)

  • Unit and integration tests added
  • Added test description under Test manual
  • Documentation added if necessary (i.e. changes to dev setup, test execution, ...)
  • CI and all relevant tests are passing
  • Add the ticket number to the PR title if available, i.e. ROX-12345: ...
  • Discussed security and business related topics privately. Will move any security and business related topics that arise to private communication channel.
  • Add secret to app-interface Vault or Secrets Manager if necessary

Test manual

TODO: Add manual testing efforts

# To run tests locally run:
make db/teardown db/setup db/migrate
make ocm/setup OCM_OFFLINE_TOKEN=<ocm-offline-token> OCM_ENV=development
make verify lint binary test test/integration

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 25, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Copy link
Member

@SimonBaeumer SimonBaeumer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

@@ -366,6 +333,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 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
func (r *CentralReconciler) reconcileCentral(ctx context.Context, remoteCentral private.ManagedCentral, central *v1alpha1.Central) error {
func (r *CentralReconciler) reconcileCentral(ctx context.Context, remoteCentral *private.ManagedCentral, central *v1alpha1.Central) error {

@rhybrillou rhybrillou force-pushed the yann/prefactor_restructure_reconcile_loop_authprovider_reconciliation branch from c276be1 to eb4490a Compare June 12, 2023 16:30
@rhybrillou rhybrillou force-pushed the yann/prefactor_restructure_reconcile_loop_central_cr_reconciliation branch from f38c090 to 65f584b Compare June 12, 2023 16:30
@rhybrillou rhybrillou force-pushed the yann/prefactor_restructure_reconcile_loop_authprovider_reconciliation branch from eb4490a to 4236ba2 Compare June 13, 2023 07:04
@rhybrillou rhybrillou force-pushed the yann/prefactor_restructure_reconcile_loop_central_cr_reconciliation branch from 65f584b to bfa6220 Compare June 13, 2023 07:04
@rhybrillou rhybrillou temporarily deployed to development June 13, 2023 07:04 — with GitHub Actions Inactive
@rhybrillou rhybrillou temporarily deployed to development June 13, 2023 07:04 — with GitHub Actions Inactive
@rhybrillou rhybrillou force-pushed the yann/prefactor_restructure_reconcile_loop_authprovider_reconciliation branch from 4236ba2 to 243614e Compare June 13, 2023 13:09
@rhybrillou rhybrillou temporarily deployed to development June 13, 2023 13:58 — with GitHub Actions Inactive
@rhybrillou rhybrillou temporarily deployed to development June 13, 2023 13:58 — with GitHub Actions Inactive
@rhybrillou rhybrillou temporarily deployed to development June 13, 2023 13:58 — with GitHub Actions Inactive
@rhybrillou rhybrillou force-pushed the yann/prefactor_restructure_reconcile_loop_central_cr_reconciliation branch from a1a7e08 to 8aa4d33 Compare June 13, 2023 14:58
@rhybrillou rhybrillou temporarily deployed to development June 13, 2023 14:58 — with GitHub Actions Inactive
@rhybrillou rhybrillou temporarily deployed to development June 13, 2023 14:58 — with GitHub Actions Inactive
@rhybrillou rhybrillou temporarily deployed to development June 13, 2023 14:58 — with GitHub Actions Inactive
@rhybrillou rhybrillou force-pushed the yann/prefactor_restructure_reconcile_loop_authprovider_reconciliation branch from 243614e to 3f39ee7 Compare June 19, 2023 11:04
Base automatically changed from yann/prefactor_restructure_reconcile_loop_authprovider_reconciliation to main June 19, 2023 11:36
@rhybrillou rhybrillou force-pushed the yann/prefactor_restructure_reconcile_loop_central_cr_reconciliation branch from 8aa4d33 to 4b2a7c7 Compare June 19, 2023 11:38
@openshift-ci openshift-ci bot removed the lgtm label Jun 19, 2023
@rhybrillou rhybrillou temporarily deployed to development June 19, 2023 11:38 — with GitHub Actions Inactive
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 19, 2023

New changes are detected. LGTM label has been removed.

@rhybrillou rhybrillou temporarily deployed to development June 19, 2023 11:38 — with GitHub Actions Inactive
@rhybrillou rhybrillou temporarily deployed to development June 19, 2023 11:38 — with GitHub Actions Inactive
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 19, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhybrillou, SimonBaeumer

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@rhybrillou rhybrillou merged commit 723b334 into main Jun 19, 2023
@rhybrillou rhybrillou deleted the yann/prefactor_restructure_reconcile_loop_central_cr_reconciliation branch June 19, 2023 13:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants