Skip to content

Commit 5ff7980

Browse files
committed
Merge branch 'main' into next
# Conflicts: # micrometer-support/pom.xml # operator-framework-core/pom.xml # operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/UtilsTest.java # operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/ControllerTest.java # operator-framework-junit5/pom.xml # operator-framework/pom.xml # pom.xml # sample-operators/mysql-schema/pom.xml # sample-operators/pom.xml # sample-operators/tomcat-operator/pom.xml # sample-operators/webpage/pom.xml # smoke-test-samples/common/pom.xml # smoke-test-samples/pom.xml # smoke-test-samples/pure-java/pom.xml # smoke-test-samples/spring-boot-plain/pom.xml
2 parents 8078fec + 4bb1eed commit 5ff7980

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/sonar.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
java-version: 17
2626
cache: 'maven'
2727
- name: Cache SonarCloud packages
28-
uses: actions/cache@v2.1.7
28+
uses: actions/cache@v3
2929
with:
3030
path: ~/.sonar/cache
3131
key: ${{ runner.os }}-sonar

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/ControllerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,14 @@ void crdShouldNotBeCheckedForCustomResourcesIfDisabled() {
4545
}
4646
}
4747

48+
4849
@Test
4950
void usesFinalizerIfThereIfReconcilerImplementsCleaner() {
5051
Reconciler reconciler = mock(Reconciler.class, withSettings().extraInterfaces(Cleaner.class));
5152
when(configuration.getResourceClass()).thenReturn(TestCustomResource.class);
5253

5354
final var controller = new Controller<Secret>(reconciler,
54-
configuration, MockKubernetesClient.client(TestCustomResource.class));
55+
configuration, MockKubernetesClient.client(TestCustomResource.class));
5556

5657
assertThat(controller.useFinalizer()).isTrue();
5758
}

0 commit comments

Comments
 (0)