Skip to content

ROX-34562: Delete the declarative config reconciliation from fleetshard-sync#2696

Merged
kovayur merged 2 commits into
mainfrom
yury/ROX-34562-declarative-config-reconciliation2
May 19, 2026
Merged

ROX-34562: Delete the declarative config reconciliation from fleetshard-sync#2696
kovayur merged 2 commits into
mainfrom
yury/ROX-34562-declarative-config-reconciliation2

Conversation

@kovayur

@kovayur kovayur commented May 12, 2026

Copy link
Copy Markdown
Contributor

Description

  • Cleanup the reconciliation of the declarative config in Fleetshard Sync. Keep only the client credentials secret
  • Delete the additional auth provider settings from the gitops config and the private API (to be managed in tenant-resources)
  • Change the default value of declarativeConfig.enabled in FSS to config.WantsAuthProvider

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
  • RDS changes were e2e tested manually
  • Check AWS limits are reasonable for changes provisioning new resources

Test manual

TODO: Add manual testing efforts

# To run tests locally run:
make db/teardown db/setup db/migrate
make ocm/setup
make verify lint binary test test/integration

})
}
return &declarativeconfig.AuthProvider{
Name: authProviderName(remoteCentral),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

By removing this authProviderName in pkg/central/reconciler/util.go became unused and can be deleted.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done, thanks

})
}

func TestGetAuditLogNotifierConfig(t *testing.T) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Lots of test, testing the old code removed, which is expected.

Is there a test that make sure the authProviderClientCredentialsSecret gets actually created, if not I think that would be good to add.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Tests for authProviderClientCredentialsSecret added, thanks

@johannes94

Copy link
Copy Markdown
Contributor

1000 LoC removed, awesome 🔥  

@openshift-ci

openshift-ci Bot commented May 18, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johannes94, kovayur

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

The pull request process is described here

Details 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

@kovayur kovayur merged commit 39b3cfb into main May 19, 2026
18 checks passed
@kovayur kovayur deleted the yury/ROX-34562-declarative-config-reconciliation2 branch May 19, 2026 08:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants