Skip to content

Commit 9942cda

Browse files
committed
fix: error with java docs validation (#2336)
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 472848b commit 9942cda

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

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
*/

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,8 @@ default ExecutorServiceManager getExecutorServiceManager() {
337337
* method of Kubernetes Dependent Resource.
338338
*
339339
* @since 4.4.0
340+
*
341+
* @return if SSA should be used for dependent resources
340342
*/
341343
default boolean ssaBasedCreateUpdateMatchForDependentResources() {
342344
return true;
@@ -365,6 +367,8 @@ default Set<Class<? extends HasMetadata>> defaultNonSSAResource() {
365367
* Disable this if you want to react to your own dependent resource updates
366368
*
367369
* @since 4.5.0
370+
*
371+
* @return if special annotation should be used for dependent resource to filter events
368372
*/
369373
default boolean previousAnnotationForDependentResourcesEventFiltering() {
370374
return true;
@@ -376,10 +380,12 @@ default boolean previousAnnotationForDependentResourcesEventFiltering() {
376380
* <p>
377381
* Disabled by default as Kubernetes does not support, and discourages, this interpretation of
378382
* resourceVersions. Enable only if your api server event processing seems to lag the operator
379-
* logic and you want to further minimize the the amount of work done / updates issued by the
383+
* logic, and you want to further minimize the amount of work done / updates issued by the
380384
* operator.
381385
*
382386
* @since 4.5.0
387+
*
388+
* @return if resource version should be parsed (as integer)
383389
*/
384390
default boolean parseResourceVersionsForEventFilteringAndCaching() {
385391
return false;

0 commit comments

Comments
 (0)