Skip to content

fix: build javadoc issue #703

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

Merged
merged 3 commits into from
Nov 24, 2021
Merged

fix: build javadoc issue #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c553b6
fix: build javadoc issue
csviri Nov 24, 2021
6e9ca85
fix: formatting
csviri Nov 24, 2021
27b3a19
fix: typo in docs
csviri Nov 24, 2021
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
8 changes: 4 additions & 4 deletions ...framework-core/src/main/java/io/javaoperatorsdk/operator/api/ObservedGenerationAware.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.javaoperatorsdk.operator.api;

import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.client.CustomResource;
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;

Expand All @@ -11,10 +12,9 @@
* is ignored.
*
* In order to work the status object returned by CustomResource.getStatus() should not be null. In
* addition to that from the controller that the
* {@link UpdateControl#updateStatusSubResource(CustomResource)} or
* {@link UpdateControl#updateCustomResourceAndStatus(CustomResource)} should be returned. The
* observed generation is not updated in other cases.
* addition to that from the controller that the {@link UpdateControl#updateStatus(HasMetadata)} or
* {@link UpdateControl#updateResourceAndStatus(HasMetadata)} should be returned. The observed
* generation is not updated in other cases.
*
* @see ObservedGenerationAwareStatus
*/
Expand Down
3 changes: 2 additions & 1 deletion ...ramework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/UpdateControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ public static <T extends HasMetadata> UpdateControl<T> updateStatus(
/**
* As a results of this there will be two call to K8S API. First the custom resource will be
* updates then the status sub-resource.
*
*
* @param <T> resource type
* @param customResource - custom resource to use in both API calls
* @return UpdateControl instance
*/
Expand Down