Merge branch '3.0.x'
This commit is contained in:
Ryan Baxter
@@ -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>
|
||||
|
||||
@@ -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.1.0-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>
|
||||
@@ -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.1.0-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>
|
||||
@@ -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.1.0-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>
|
||||
@@ -49,9 +49,9 @@ import static org.awaitility.Awaitility.await;
|
||||
*/
|
||||
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";
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -8,13 +8,13 @@
|
||||
<version>3.1.0-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>
|
||||
Reference in New Issue
Block a user