Skip to content

Commit c7d86d1

Browse files
ryanjbaxterryanjbaxter
committed
Merge branch '3.0.x'
2 parents 35907d8 + a5ec620 commit c7d86d1

File tree

18 files changed

+17
-16
lines changed

18 files changed

+17
-16
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
<!-- at the moment we have no integration test for the fabric8 client, only k8s native client -->
7575
<module>spring-cloud-kubernetes-k8s-client-loadbalancer</module>
7676

77-
<module>spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps</module>
77+
<!-- config watcher reload, using kafka and configmap -->
78+
<module>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</module>
7879
<module>spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps</module>
7980
</modules>
8081
</project>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-app-a/pom.xml renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-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-configmap-event-reload-multiple-apps</artifactId>
6+
<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-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-configmap-app-a</artifactId>
13+
<artifactId>kafka-configmap-app-a</artifactId>
1414

1515
<dependencies>
1616
<dependency>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-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-kafka-configmap-reload-multiple-apps/kafka-configmap-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-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-app-a/src/main/resources/application.yaml renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/src/main/resources/application.yaml

File renamed without changes.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
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-configmap-event-reload-multiple-apps</artifactId>
6+
<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
77
<groupId>org.springframework.cloud</groupId>
88
<version>3.1.0-SNAPSHOT</version>
9-
<relativePath>../../spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps</relativePath>
9+
<relativePath>../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>
1212
<packaging>jar</packaging>
1313

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

1616
<dependencies>
1717
<dependency>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-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-kafka-configmap-reload-multiple-apps/kafka-configmap-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-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-app-b/src/main/resources/application.yaml renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/src/main/resources/application.yaml

File renamed without changes.

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/pom.xml renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-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-configmap-event-reload-multiple-apps</artifactId>
6+
<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-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-configmap-test-app</artifactId>
13+
<artifactId>kafka-configmap-test-app</artifactId>
1414

1515
<dependencies>
1616
<dependency>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java

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

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

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

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

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/src/test/resources/app-a/app-a-deployment.yaml renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/resources/app-a/app-a-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
spec:
1414
containers:
1515
- name: app-a
16-
image: docker.io/springcloud/spring-cloud-kubernetes-client-configuration-watcher-configmap-app-a
16+
image: docker.io/springcloud/kafka-configmap-app-a
1717
imagePullPolicy: IfNotPresent
1818
env:
1919
- name: SPRING_PROFILES_ACTIVE

0 commit comments

Comments
 (0)