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

Jump to bottom

fix: able to override controller level namespace when set in annotation #692

Closed
wants to merge 2 commits into from
Closed

fix: able to override controller level namespace when set in annotation #692

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e722e7
fix: able to override controller level namespace when set in annotation
csviri Aug 21, 2023
4daaa7a
Merge branch 'main' into all-ns-settings
csviri Aug 21, 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
10 changes: 5 additions & 5 deletions ...n/java/io/quarkiverse/operatorsdk/deployment/QuarkusControllerConfigurationBuildStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,17 +217,17 @@ static QuarkusControllerConfiguration createConfiguration(
.orElse(null);
}
// remember whether or not we explicitly set the namespaces
final boolean wereNamespacesSet;
final boolean namespaceSetFromAnnotation;
if (namespaces == null) {
namespaces = io.javaoperatorsdk.operator.api.reconciler.Constants.DEFAULT_NAMESPACES_SET;
wereNamespacesSet = false;
namespaceSetFromAnnotation = false;
} else {
wereNamespacesSet = true;
namespaceSetFromAnnotation = true;
}

// check if we're asking to generate manifests with a specific set of namespaces
// note that this should *NOT* be considered as explicitly setting the namespaces for the purpose of runtime overriding
final var buildTimeNamespaces = configExtractor.generateWithWatchedNamespaces(wereNamespacesSet);
final var buildTimeNamespaces = configExtractor.generateWithWatchedNamespaces(namespaceSetFromAnnotation);
if (buildTimeNamespaces != null) {
namespaces = buildTimeNamespaces;
}
Expand Down Expand Up @@ -255,7 +255,7 @@ static QuarkusControllerConfiguration createConfiguration(
resourceClass,
nullableInformerListLimit,
namespaces,
wereNamespacesSet,
false,
getFinalizer(controllerAnnotation, resourceFullName),
getLabelSelector(controllerAnnotation),
primaryAsResource.hasNonVoidStatus(),
Expand Down