Merge branch '3.0.x'
This commit is contained in:
Ryan Baxter
@@ -76,6 +76,9 @@
|
||||
|
||||
<!-- 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>
|
||||
|
||||
<!-- config watcher reload, using rabbitmq and secret -->
|
||||
<module>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</module>
|
||||
|
||||
</modules>
|
||||
</project>
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps</artifactId>
|
||||
<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>spring-cloud-kubernetes-client-configuration-watcher-secrets-app-a</module>
|
||||
<module>spring-cloud-kubernetes-client-configuration-watcher-secrets-app-b</module>
|
||||
<module>spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app</module>
|
||||
<module>rabbitmq-secret-app-a</module>
|
||||
<module>rabbitmq-secret-app-b</module>
|
||||
<module>rabbitmq-secret-test-app</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
@@ -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-secrets-event-reload-multiple-apps</artifactId>
|
||||
<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<version>3.1.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<artifactId>spring-cloud-kubernetes-client-configuration-watcher-secrets-app-a</artifactId>
|
||||
<artifactId>rabbitmq-secret-app-a</artifactId>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
@@ -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-secrets-event-reload-multiple-apps</artifactId>
|
||||
<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<version>3.1.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<artifactId>spring-cloud-kubernetes-client-configuration-watcher-secrets-app-b</artifactId>
|
||||
<artifactId>rabbitmq-secret-app-b</artifactId>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
@@ -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-secrets-event-reload-multiple-apps</artifactId>
|
||||
<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<version>3.1.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<artifactId>spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app</artifactId>
|
||||
<artifactId>rabbitmq-secret-test-app</artifactId>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
@@ -49,9 +49,9 @@ import static org.awaitility.Awaitility.await;
|
||||
*/
|
||||
class ConfigurationWatcherMultipleAppIT {
|
||||
|
||||
private static final String CONFIG_WATCHER_APP_A_IMAGE = "spring-cloud-kubernetes-client-configuration-watcher-secrets-app-a";
|
||||
private static final String CONFIG_WATCHER_APP_A_IMAGE = "rabbitmq-secret-app-a";
|
||||
|
||||
private static final String CONFIG_WATCHER_APP_B_IMAGE = "spring-cloud-kubernetes-client-configuration-watcher-secrets-app-b";
|
||||
private static final String CONFIG_WATCHER_APP_B_IMAGE = "rabbitmq-secret-app-b";
|
||||
|
||||
private static final String SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME = "spring-cloud-kubernetes-configuration-watcher";
|
||||
|
||||
@@ -13,7 +13,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: app-a
|
||||
image: docker.io/springcloud/spring-cloud-kubernetes-client-configuration-watcher-secrets-app-a
|
||||
image: docker.io/springcloud/rabbitmq-secret-app-a
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
- name: SPRING_PROFILES_ACTIVE
|
||||
@@ -13,7 +13,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: app-b
|
||||
image: docker.io/springcloud/spring-cloud-kubernetes-client-configuration-watcher-secrets-app-b
|
||||
image: docker.io/springcloud/rabbitmq-secret-app-b
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
- name: SPRING_PROFILES_ACTIVE
|
||||
@@ -24,7 +24,7 @@ spec:
|
||||
- name: SPRING_CLOUD_BUS_DESTINATION
|
||||
value: multiple-apps
|
||||
- name: SPRING_CLOUD_KUBERNETES_CONFIGURATION_WATCHER_REFRESHDELAY
|
||||
value: 1
|
||||
value: "1"
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
port: 8888
|
||||
Reference in New Issue
Block a user