Skip to content
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

Jump to bottom

rename integration config watcher integration test #1489

Merged
merged 13 commits into from
Oct 26, 2023
Merged

rename integration config watcher integration test #1489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
913143c
started work
wind57 Oct 22, 2023
4d1ad87
refactored one IT
wind57 Oct 22, 2023
957bc7d
refactored one IT
wind57 Oct 23, 2023
a786c6f
remove
wind57 Oct 23, 2023
e1f8e0a
istio refactor
wind57 Oct 24, 2023
ed92643
trigger
wind57 Oct 24, 2023
caf8167
first
wind57 Oct 24, 2023
7fae05d
merge 3.0.x
wind57 Oct 24, 2023
681ed34
fix build failure
wind57 Oct 25, 2023
80d0e57
Merge branch 'fabric8-it-part-16' into fabric8-it-part-17
wind57 Oct 25, 2023
e92361b
naming convention
wind57 Oct 25, 2023
577730a
renames
wind57 Oct 25, 2023
c05c44d
merge 3.0.x
wind57 Oct 26, 2023
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
3 changes: 2 additions & 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 @@ -74,7 +74,8 @@
<!-- at the moment we have no integration test for the fabric8 client, only k8s native client -->
<module>spring-cloud-kubernetes-k8s-client-loadbalancer</module>

<module>spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps</module>
<!-- config watcher reload, using kafka and configmap -->
<module>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</module>
<module>spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps</module>
</modules>
</project>
4 changes: 2 additions & 2 deletions ...iguration-watcher-configmap-app-a/pom.xml → ...ltiple-apps/kafka-configmap-app-a/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
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-client-configmap-event-reload-multiple-apps</artifactId>
<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>3.0.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>

<artifactId>spring-cloud-kubernetes-client-configuration-watcher-configmap-app-a</artifactId>
<artifactId>kafka-configmap-app-a</artifactId>

<dependencies>
<dependency>
Expand Down
0 ...ion/watcher/appA/AppATestApplication.java → ...ion/watcher/appA/AppATestApplication.java
View file
Open in desktop
File renamed without changes.
0 ...app-a/src/main/resources/application.yaml → ...app-a/src/main/resources/application.yaml
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...iguration-watcher-configmap-app-b/pom.xml → ...ltiple-apps/kafka-configmap-app-b/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +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-client-configmap-event-reload-multiple-apps</artifactId>
<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>3.0.5-SNAPSHOT</version>
<relativePath>../../spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps</relativePath>
<relativePath>../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>

<artifactId>spring-cloud-kubernetes-client-configuration-watcher-configmap-app-b</artifactId>
<artifactId>kafka-configmap-app-b</artifactId>

<dependencies>
<dependency>
Expand Down
0 ...ion/watcher/appB/AppBTestApplication.java → ...ion/watcher/appB/AppBTestApplication.java
View file
Open in desktop
File renamed without changes.
0 ...app-b/src/main/resources/application.yaml → ...app-b/src/main/resources/application.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ration-watcher-configmap-test-app/pom.xml → ...ple-apps/kafka-configmap-test-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
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-client-configmap-event-reload-multiple-apps</artifactId>
<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>3.0.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>

<artifactId>spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app</artifactId>
<artifactId>kafka-configmap-test-app</artifactId>

<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions ...s/ConfigurationWatcherMultipleAppsIT.java → ...s/ConfigurationWatcherMultipleAppsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
*/
class ConfigurationWatcherMultipleAppsIT {

private static final String CONFIG_WATCHER_APP_A_IMAGE = "spring-cloud-kubernetes-client-configuration-watcher-configmap-app-a";
private static final String CONFIG_WATCHER_APP_A_IMAGE = "kafka-configmap-app-a";

private static final String CONFIG_WATCHER_APP_B_IMAGE = "spring-cloud-kubernetes-client-configuration-watcher-configmap-app-b";
private static final String CONFIG_WATCHER_APP_B_IMAGE = "kafka-configmap-app-b";

private static final String SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME = "spring-cloud-kubernetes-configuration-watcher";

Expand Down
2 changes: 1 addition & 1 deletion ...est/resources/app-a/app-a-deployment.yaml → ...est/resources/app-a/app-a-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: app-a
image: docker.io/springcloud/spring-cloud-kubernetes-client-configuration-watcher-configmap-app-a
image: docker.io/springcloud/kafka-configmap-app-a
imagePullPolicy: IfNotPresent
env:
- name: SPRING_PROFILES_ACTIVE
Expand Down
0 ...c/test/resources/app-a/app-a-service.yaml → ...c/test/resources/app-a/app-a-service.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...est/resources/app-b/app-b-deployment.yaml → ...est/resources/app-b/app-b-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: app-b
image: docker.io/springcloud/spring-cloud-kubernetes-client-configuration-watcher-configmap-app-b
image: docker.io/springcloud/kafka-configmap-app-b
imagePullPolicy: IfNotPresent
env:
- name: SPRING_PROFILES_ACTIVE
Expand Down
0 ...c/test/resources/app-b/app-b-service.yaml → ...c/test/resources/app-b/app-b-service.yaml
View file
Open in desktop
File renamed without changes.
0 ...uration-watcher-bus-kafka-deployment.yaml → ...uration-watcher-bus-kafka-deployment.yaml
View file
Open in desktop
File renamed without changes.
0 ...rnetes-configuration-watcher-service.yaml → ...rnetes-configuration-watcher-service.yaml
View file
Open in desktop
File renamed without changes.
0 ...ration-watcher-multiple-apps-ingress.yaml → ...ration-watcher-multiple-apps-ingress.yaml
View file
Open in desktop
File renamed without changes.
0 ...t-app/src/test/resources/logback-test.xml → ...t-app/src/test/resources/logback-test.xml
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...figmap-event-reload-multiple-apps/pom.xml → ...ka-configmap-reload-multiple-apps/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<version>3.0.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps</artifactId>
<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
<packaging>pom</packaging>

<modules>
<module>spring-cloud-kubernetes-client-configuration-watcher-configmap-app-a</module>
<module>spring-cloud-kubernetes-client-configuration-watcher-configmap-app-b</module>
<module>spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app</module>
<module>kafka-configmap-app-a</module>
<module>kafka-configmap-app-b</module>
<module>kafka-configmap-test-app</module>
</modules>

</project>
Loading