Do not duplicate base package controllers in the monolithic provider#534
Merged
ulucinar merged 1 commit intocrossplane:mainfrom Oct 9, 2025
Merged
Do not duplicate base package controllers in the monolithic provider#534ulucinar merged 1 commit intocrossplane:mainfrom
ulucinar merged 1 commit intocrossplane:mainfrom
Conversation
Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
ulucinar
requested review from
erhancagirici,
mergenci and
sergenyalcin
as code owners
ulucinar
added a commit
to ulucinar/upbound-provider-azure
that referenced
this pull request
Oct 9, 2025
- We need to consume the fix from: crossplane/upjet#534 Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
This was referenced Oct 9, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of your changes
As we are introducing readiness probes for the family provider
upbound/provider-azurein crossplane-contrib/provider-upjet-azure#1074, an existing bug for the monolithic provider package becomes visible. If a provider family configures base package controllers other than the defaultproviderconfigcontroller, the monolithic provider attempts to start those controllers twice.This used to be a non-issue back then when we introduced the configuration options for base package controllers but now the monolithic provider fails to start because multiple controllers will be publishing metrics using the same names, which is refused by controller-runtime during provider setup.
We have the
local-deployjob as part of the build pipeline that's supposed to have caught this issue but because the provider did not have readiness probes enabled, that bug has survived.But now that we are introducing readiness probes in uptest runs and with the
local-deployjob, this bug becomes visible in crossplane-contrib/provider-upjet-azure#1074.We may convert the local variable
controllerPkgMapto a map to prevent duplicates but that would result in a much larger change, that's not necessary for now. Could be part of a larger refactoring effort...Note: Although we are no longer publishing the monolithic providers for provider families, they are still being used for development & testing.
I have:
make reviewableto ensure this PR is ready for review.backport release-x.ylabels to auto-backport this PR if necessary.How has this code been tested
Validated with
upbound/provider-azure(Github repo:crossplane-contrib/provider-upjet-azure) & crossplane-contrib/provider-upjet-azure#1074.