Skip to content

refactor kafka event bus integration test #1879

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 9 commits into from
Mar 8, 2025
Merged

refactor kafka event bus integration test #1879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
980d181
dirty
wind57 Feb 21, 2025
6b0760b
Merge branch '3.1.x' into refactor_k8s_kafka
wind57 Feb 23, 2025
8efdb65
Merge branch '3.1.x' into refactor_k8s_kafka
wind57 Feb 23, 2025
08382a2
more changes
wind57 Feb 24, 2025
5ae2d4e
more changes
wind57 Feb 24, 2025
b3ffc94
more changes
wind57 Feb 25, 2025
7971f2d
Merge branch '3.1.x' into refactor_k8s_kafka
wind57 Feb 25, 2025
e41ca23
Merge branch '3.1.x' into refactor_k8s_kafka
wind57 Mar 7, 2025
f5e3a5d
fix
wind57 Mar 7, 2025
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
2 changes: 1 addition & 1 deletion spring-cloud-kubernetes-integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<module>spring-cloud-kubernetes-k8s-client-configuration-watcher</module>

<!-- config watcher reload, using kafka and configmap -->
<module>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</module>
<module>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload</module>

<!-- config watcher reload, using rabbitmq and secret -->
<module>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</module>
Expand Down
57 changes: 0 additions & 57 deletions .../org/springframework/cloud/kubernetes/configuration/watcher/appA/AppATestApplication.java
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions ...-configmap-reload-multiple-apps/kafka-configmap-app-a/src/main/resources/application.yaml
View file
Open in desktop

This file was deleted.

69 changes: 0 additions & 69 deletions ...bernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions ...oad-multiple-apps/kafka-configmap-test-app/src/test/resources/app-a/app-a-deployment.yaml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions ...reload-multiple-apps/kafka-configmap-test-app/src/test/resources/app-a/app-a-service.yaml
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ...esources/ingress/spring-cloud-kubernetes-configuration-watcher-multiple-apps-ingress.yaml
View file
Open in desktop

This file was deleted.

20 changes: 3 additions & 17 deletions ...ltiple-apps/kafka-configmap-app-a/pom.xml → ...figmap-reload/kafka-configmap-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>3.1.6-SNAPSHOT</version>
<relativePath>../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>

<artifactId>kafka-configmap-app-a</artifactId>
<artifactId>kafka-configmap-app</artifactId>

<dependencies>
<dependency>
Expand All @@ -25,21 +26,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</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>
6 changes: 3 additions & 3 deletions ...ion/watcher/appB/AppBTestApplication.java → ...tion/watcher/appB/AppTestApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@
*/
@SpringBootApplication
@RestController
public class AppBTestApplication implements ApplicationListener<RefreshRemoteApplicationEvent> {
public class AppTestApplication implements ApplicationListener<RefreshRemoteApplicationEvent> {

private final Log LOG = LogFactory.getLog(getClass());

private boolean value = false;

public static void main(String[] args) {
SpringApplication.run(AppBTestApplication.class, args);
SpringApplication.run(AppTestApplication.class, args);
}

@GetMapping("/app-b")
@GetMapping("/app")
public boolean index() {
LOG.info("Current value: " + value);
return value;
Expand Down
9 changes: 3 additions & 6 deletions ...app-b/src/main/resources/application.yaml → ...p-app/src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
#logging:
# level:
# org.springframework: DEBUG
#
spring:
application:
name: spring-cloud-kubernetes-client-configuration-watcher-configmap-app-b
name: non-app
cloud:
bus:
refresh:
enabled: false
enabled: true
destination: multiple-apps
destination: app
id: app
stream:
default-binder: kafka
management:
Expand Down
28 changes: 14 additions & 14 deletions ...ltiple-apps/kafka-configmap-app-b/pom.xml → ...p-reload/kafka-configmap-test-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,40 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>3.1.6-SNAPSHOT</version>
<relativePath>../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>

<artifactId>kafka-configmap-app-b</artifactId>
<artifactId>kafka-configmap-test-app</artifactId>

<properties>
<spring-boot.repackage.skip>true</spring-boot.repackage.skip>
<spring-boot.build-image.skip>true</spring-boot.build-image.skip>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bus-kafka</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-kubernetes-test-support</artifactId>
</dependency>

</dependencies>

<build>
<resources>
<resource>
<directory>../src/main/resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
<directory>../../src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
Expand Down
Loading
Loading