Skip to content

Commit ad6a0fe

Browse files
ryanjbaxterryanjbaxter
committed
Merge branch '3.0.x'
2 parents c7d86d1 + 30bf3b7 commit ad6a0fe

File tree

18 files changed

+19
-16
lines changed

18 files changed

+19
-16
lines changed

‎spring-cloud-kubernetes-integration-tests/pom.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@
7676

7777
<!-- config watcher reload, using kafka and configmap -->
7878
<module>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</module>
79-
<module>spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps</module>
79+
80+
<!-- config watcher reload, using rabbitmq and secret -->
81+
<module>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</module>
82+
8083
</modules>
8184
</project>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/pom.xml renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
12-
<artifactId>spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps</artifactId>
12+
<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
1313
<packaging>pom</packaging>
1414

1515
<modules>
16-
<module>spring-cloud-kubernetes-client-configuration-watcher-secrets-app-a</module>
17-
<module>spring-cloud-kubernetes-client-configuration-watcher-secrets-app-b</module>
18-
<module>spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app</module>
16+
<module>rabbitmq-secret-app-a</module>
17+
<module>rabbitmq-secret-app-b</module>
18+
<module>rabbitmq-secret-test-app</module>
1919
</modules>
2020

2121
</project>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-app-a/pom.xml renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
6-
<artifactId>spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps</artifactId>
6+
<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
77
<groupId>org.springframework.cloud</groupId>
88
<version>3.1.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>jar</packaging>
1212

13-
<artifactId>spring-cloud-kubernetes-client-configuration-watcher-secrets-app-a</artifactId>
13+
<artifactId>rabbitmq-secret-app-a</artifactId>
1414

1515
<dependencies>
1616
<dependency>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-app-a/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/appA/AppATestApplication.java renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/appA/AppATestApplication.java

File renamed without changes.

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-app-a/src/main/resources/application.yaml renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/src/main/resources/application.yaml

File renamed without changes.

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-app-b/pom.xml renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
6-
<artifactId>spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps</artifactId>
6+
<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
77
<groupId>org.springframework.cloud</groupId>
88
<version>3.1.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>jar</packaging>
1212

13-
<artifactId>spring-cloud-kubernetes-client-configuration-watcher-secrets-app-b</artifactId>
13+
<artifactId>rabbitmq-secret-app-b</artifactId>
1414

1515
<dependencies>
1616
<dependency>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-app-b/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/appB/AppBTestApplication.java renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/appB/AppBTestApplication.java

File renamed without changes.

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-app-b/src/main/resources/application.yaml renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/src/main/resources/application.yaml

File renamed without changes.

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app/pom.xml renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
6-
<artifactId>spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps</artifactId>
6+
<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
77
<groupId>org.springframework.cloud</groupId>
88
<version>3.1.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>jar</packaging>
1212

13-
<artifactId>spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app</artifactId>
13+
<artifactId>rabbitmq-secret-test-app</artifactId>
1414

1515
<dependencies>
1616
<dependency>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
*/
5050
class ConfigurationWatcherMultipleAppIT {
5151

52-
private static final String CONFIG_WATCHER_APP_A_IMAGE = "spring-cloud-kubernetes-client-configuration-watcher-secrets-app-a";
52+
private static final String CONFIG_WATCHER_APP_A_IMAGE = "rabbitmq-secret-app-a";
5353

54-
private static final String CONFIG_WATCHER_APP_B_IMAGE = "spring-cloud-kubernetes-client-configuration-watcher-secrets-app-b";
54+
private static final String CONFIG_WATCHER_APP_B_IMAGE = "rabbitmq-secret-app-b";
5555

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

0 commit comments

Comments
 (0)