SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Ryan Baxter
2025-02-09 20:27:53 -05:00
parent f73181bd3e 7eef4904fd
commit 1151ff95bf
4 changed files with 1 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderInitiatorTest.java
View File

@@ -18,7 +18,6 @@ package org.springframework.cloud.kubernetes.fabric8.leader;
import java.time.Duration;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -77,14 +76,6 @@ class Fabric8LeaderInitiatorTest {
assertThat(leaderInitiator.isRunning()).isTrue();
verify(mockFabric8LeaderRecordWatcher).start();
verify(mockFabric8PodReadinessWatcher).start();
boolean[] updateCalled = new boolean[1];
Mockito.doAnswer(x -> {
updateCalled[0] = true;
return null;
}).when(mockFabric8LeadershipController).update();
Awaitility.await().atMost(Duration.ofSeconds(3)).until(() -> updateCalled[0]);
verify(mockFabric8LeadershipController, atLeastOnce()).update();
}

12
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
View File

@@ -36,16 +36,4 @@
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>../src/main/resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
</project>

12
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
View File

@@ -44,17 +44,5 @@
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>../src/main/resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
</project>

5
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
View File

@@ -31,16 +31,13 @@
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>../src/main/resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>