Skip to content

Commit e344cdc

Browse files
csvirimetacosm
authored andcommitted
fix: error with java docs validation (#2336)
Signed-off-by: Attila Mészáros <[email protected]>
1 parent cea0b78 commit e344cdc

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/ObservedGenerationAware.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import io.fabric8.kubernetes.api.model.HasMetadata;
44
import io.fabric8.kubernetes.client.CustomResource;
5+
import io.javaoperatorsdk.operator.api.config.ConfigurationService;
56
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
67

78
/**
@@ -11,10 +12,11 @@
1112
* In order for this automatic handling to work the status object returned by
1213
* {@link CustomResource#getStatus()} should not be null.
1314
* <p>
14-
* The observed generation is updated even when {@link UpdateControl#noUpdate()} or
15-
* {@link UpdateControl#updateResource(HasMetadata)} is called. Although those results call normally
16-
* does not result in a status update, there will be a subsequent status update Kubernetes API call
17-
* in this case.
15+
* The observed generation is updated with SSA mode only if
16+
* {@link UpdateControl#patchStatus(HasMetadata)} or
17+
* {@link UpdateControl#patchResourceAndStatus(HasMetadata)} is called. In non-SSA mode (see
18+
* {@link ConfigurationService#useSSAToPatchPrimaryResource()}) observed generation is update even
19+
* if patch is not called.
1820
*
1921
* @see ObservedGenerationAwareStatus
2022
*/

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,8 @@ default ExecutorServiceManager getExecutorServiceManager() {
340340
* method of Kubernetes Dependent Resource.
341341
*
342342
* @since 4.4.0
343+
*
344+
* @return if SSA should be used for dependent resources
343345
*/
344346
default boolean ssaBasedCreateUpdateMatchForDependentResources() {
345347
return true;
@@ -425,6 +427,8 @@ default Set<Class<? extends HasMetadata>> defaultNonSSAResource() {
425427
* Disable this if you want to react to your own dependent resource updates
426428
*
427429
* @since 4.5.0
430+
*
431+
* @return if special annotation should be used for dependent resource to filter events
428432
*/
429433
default boolean previousAnnotationForDependentResourcesEventFiltering() {
430434
return true;
@@ -436,10 +440,12 @@ default boolean previousAnnotationForDependentResourcesEventFiltering() {
436440
* <p>
437441
* Disabled by default as Kubernetes does not support, and discourages, this interpretation of
438442
* resourceVersions. Enable only if your api server event processing seems to lag the operator
439-
* logic and you want to further minimize the amount of work done / updates issued by the
443+
* logic, and you want to further minimize the amount of work done / updates issued by the
440444
* operator.
441445
*
442446
* @since 4.5.0
447+
*
448+
* @return if resource version should be parsed (as integer)
443449
*/
444450
default boolean parseResourceVersionsForEventFilteringAndCaching() {
445451
return false;

0 commit comments

Comments
 (0)