Skip to content

fix: minor fixes #802

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.

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 5 commits into from
Jan 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions .github/workflows/e2e-test-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ on:
push:
branches:
- main
jobs:
tomcat_e2e_test:
runs-on: ubuntu-latest
env:
KIND_CL_NAME: e2e-test
steps:
- name: Checkout
uses: actions/checkout@v2
jobs:
mysql_e2e_test:
runs-on: ubuntu-latest
env:
KIND_CL_NAME: e2e-test
steps:
- name: Checkout
uses: actions/checkout@v2

- name: clean resident local docker
if: ${{ env.ACT }}
continue-on-error: true
- name: clean resident local docker
if: ${{ env.ACT }}
continue-on-error: true
run: |
for DIMG in "$KIND_CL_NAME-control-plane "; do
docker stop $DIMG ; docker rm $DIMG ;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ default boolean useFinalizer() {
/**
* Allow controllers to filter events before they are provided to the
* {@link io.javaoperatorsdk.operator.processing.event.EventHandler}. Note that the provided
* filter is combined with {@link #isGenerationAware()} to compute the final set of fiolters that
* filter is combined with {@link #isGenerationAware()} to compute the final set of filters that
* should be applied;
*
* @return filter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public interface ErrorStatusHandler<T extends HasMetadata> {
* should not be updates on custom resource after it is marked for deletion.
*
* @param resource to update the status on
* @param retryInfo
* @param retryInfo the current retry status
* @param e exception thrown from the reconciler
* @return the updated resource
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@ void retrievingAnEventSourceWhenMultipleAreRegisteredForATypeShouldRequireAQuali
assertTrue(exception.getMessage().contains("name1"));
assertTrue(exception.getMessage().contains("name2"));

assertTrue(manager.getResourceEventSourceFor(TestCustomResource.class, "name2").get()
.equals(eventSource2));
assertTrue(manager.getResourceEventSourceFor(TestCustomResource.class, "name1").get()
.equals(eventSource));
assertEquals(manager.getResourceEventSourceFor(TestCustomResource.class, "name2").get(),
eventSource2);
assertEquals(manager.getResourceEventSourceFor(TestCustomResource.class, "name1").get(),
eventSource);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private <R extends HasMetadata> ReconciliationDispatcher<R> init(R customResourc
when(configService.getResourceCloner()).thenReturn(new Cloner() {
@Override

public <R extends HasMetadata> R clone(R object) {
public <T extends HasMetadata> T clone(T object) {
return object;
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ public AccumulativeMappingWriter add(String key, String value) {
}

/**
* Generates or overrise the resource file with the given path
* ({@linkAccumulativeMappingWriter#resourcePath})
* Generates or override the resource file with the given path
* ({@link AccumulativeMappingWriter#resourcePath})
*/
public void flush() {
PrintWriter printWriter = null;
Expand Down