Skip to content

Commit df6fd5c

Browse files
wind57wind57
authored
Fabric8 it part 8 (#1475)
1 parent 2597509 commit df6fd5c

File tree

14 files changed

+48
-49
lines changed

14 files changed

+48
-49
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,20 @@
4848
</dependencyManagement>
4949

5050
<modules>
51-
<module>spring-cloud-kubernetes-fabric8-istio-it</module>
51+
<module>spring-cloud-kubernetes-fabric8-client-catalog-watcher</module>
52+
<module>spring-cloud-kubernetes-k8s-client-catalog-watcher</module>
53+
5254
<module>spring-cloud-kubernetes-fabric8-client-discovery</module>
5355
<module>spring-cloud-kubernetes-fabric8-client-reload</module>
56+
<module>spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap</module>
57+
<module>spring-cloud-kubernetes-fabric8-istio-it</module>
5458

5559
<module>spring-cloud-kubernetes-discoveryclient-it</module>
5660
<module>spring-cloud-kubernetes-client-loadbalancer-it</module>
5761
<module>spring-cloud-kubernetes-configuration-watcher-it</module>
5862
<module>spring-cloud-kubernetes-client-event-and-polling-reload</module>
5963
<module>spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps</module>
6064
<module>spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps</module>
61-
<module>spring-cloud-kubernetes-fabric8-client-catalog-watcher</module>
62-
<module>spring-cloud-kubernetes-client-catalog-watcher</module>
6365
<module>spring-cloud-kubernetes-client-discovery-it</module>
64-
<module>spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap</module>
6566
</modules>
6667
</project>

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/app/watcher-service.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml renamed to ‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<artifactId>spring-cloud-kubernetes-client-catalog-watcher</artifactId>
12+
<artifactId>spring-cloud-kubernetes-k8s-client-catalog-watcher</artifactId>
1313

1414
<dependencies>
1515
<dependency>

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/Application.java renamed to ‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/Application.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.cloud.kubernetes.client.catalog;
17+
package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher;
1818

1919
import org.springframework.boot.SpringApplication;
2020
import org.springframework.boot.autoconfigure.SpringBootApplication;

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/EndpointNameAndNamespaceService.java renamed to ‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/EndpointNameAndNamespaceService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.cloud.kubernetes.client.catalog;
17+
package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher;
1818

1919
import java.util.List;
2020

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/HeartBeatListener.java renamed to ‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/HeartBeatListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.cloud.kubernetes.client.catalog;
17+
package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher;
1818

1919
import java.util.List;
2020

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/HeartbeatController.java renamed to ‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/HeartbeatController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.cloud.kubernetes.client.catalog;
17+
package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher;
1818

1919
import java.util.List;
2020

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog/KubernetesClientCatalogWatchIT.java renamed to ‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchIT.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.cloud.kubernetes.client.catalog;
17+
package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher;
1818

1919
import java.time.Duration;
2020
import java.util.List;
@@ -48,18 +48,18 @@
4848
import org.springframework.web.reactive.function.client.WebClient;
4949

5050
import static org.awaitility.Awaitility.await;
51-
import static org.springframework.cloud.kubernetes.client.catalog.KubernetesClientCatalogWatchUtils.patchForEndpointSlices;
52-
import static org.springframework.cloud.kubernetes.client.catalog.KubernetesClientCatalogWatchUtils.patchForEndpointSlicesNamespaces;
53-
import static org.springframework.cloud.kubernetes.client.catalog.KubernetesClientCatalogWatchUtils.patchForEndpointsNamespaces;
5451
import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.waitForLogStatement;
52+
import static org.springframework.cloud.kubernetes.k8s.client.catalog.watcher.KubernetesClientCatalogWatchUtils.patchForEndpointSlices;
53+
import static org.springframework.cloud.kubernetes.k8s.client.catalog.watcher.KubernetesClientCatalogWatchUtils.patchForEndpointSlicesNamespaces;
54+
import static org.springframework.cloud.kubernetes.k8s.client.catalog.watcher.KubernetesClientCatalogWatchUtils.patchForEndpointsNamespaces;
5555

5656
/**
5757
* @author wind57
5858
*/
5959
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
6060
class KubernetesClientCatalogWatchIT {
6161

62-
private static final String APP_NAME = "spring-cloud-kubernetes-client-catalog-watcher";
62+
private static final String APP_NAME = "spring-cloud-kubernetes-k8s-client-catalog-watcher";
6363

6464
private static final String NAMESPACE = "default";
6565

@@ -129,12 +129,12 @@ void testCatalogWatchWithEndpointsNamespaces() {
129129
util.busybox(NAMESPACE_A, Phase.CREATE);
130130
util.busybox(NAMESPACE_B, Phase.CREATE);
131131
patchForEndpointsNamespaces(APP_NAME, NAMESPACE, DOCKER_IMAGE);
132-
KubernetesClientCatalogWatchNamespacesDelegate.testCatalogWatchWithEndpointsNamespaces();
132+
KubernetesClientCatalogWatchNamespacesDelegate.testCatalogWatchWithEndpointsNamespaces(APP_NAME);
133133

134134
util.busybox(NAMESPACE_A, Phase.CREATE);
135135
util.busybox(NAMESPACE_B, Phase.CREATE);
136136
patchForEndpointSlicesNamespaces(APP_NAME, NAMESPACE, DOCKER_IMAGE);
137-
KubernetesClientCatalogWatchNamespacesDelegate.testCatalogWatchWithEndpointSlicesNamespaces();
137+
KubernetesClientCatalogWatchNamespacesDelegate.testCatalogWatchWithEndpointSlicesNamespaces(APP_NAME);
138138
}
139139

140140
/**

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog/KubernetesClientCatalogWatchNamespacesDelegate.java renamed to ‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchNamespacesDelegate.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.cloud.kubernetes.client.catalog;
17+
package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher;
1818

1919
import java.time.Duration;
2020
import java.util.Arrays;
@@ -47,8 +47,6 @@ private KubernetesClientCatalogWatchNamespacesDelegate() {
4747

4848
}
4949

50-
private static final String APP_NAME = "spring-cloud-kubernetes-client-catalog-watcher";
51-
5250
private static final String NAMESPACE_A = "namespacea";
5351

5452
private static final String NAMESPACE_B = "namespaceb";
@@ -67,13 +65,13 @@ private KubernetesClientCatalogWatchNamespacesDelegate() {
6765
* - assert that we receive only spring-cloud-kubernetes-client-catalog-watcher pod
6866
* </pre>
6967
*/
70-
static void testCatalogWatchWithEndpointsNamespaces() {
71-
waitForLogStatement("stateGenerator is of type: KubernetesEndpointsCatalogWatch", K3S, APP_NAME);
68+
static void testCatalogWatchWithEndpointsNamespaces(String deploymentName) {
69+
waitForLogStatement("stateGenerator is of type: KubernetesEndpointsCatalogWatch", K3S, deploymentName);
7270
testForNamespacesFilter();
7371
}
7472

75-
static void testCatalogWatchWithEndpointSlicesNamespaces() {
76-
waitForLogStatement("stateGenerator is of type: KubernetesEndpointSlicesCatalogWatch", K3S, APP_NAME);
73+
static void testCatalogWatchWithEndpointSlicesNamespaces(String deploymentName) {
74+
waitForLogStatement("stateGenerator is of type: KubernetesEndpointSlicesCatalogWatch", K3S, deploymentName);
7775
testForNamespacesFilter();
7876
}
7977

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog/KubernetesClientCatalogWatchUtils.java renamed to ‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchUtils.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.cloud.kubernetes.client.catalog;
17+
package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher;
1818

1919
import java.util.Map;
2020

@@ -26,7 +26,7 @@
2626
final class KubernetesClientCatalogWatchUtils {
2727

2828
private static final Map<String, String> POD_LABELS = Map.of("app",
29-
"spring-cloud-kubernetes-client-catalog-watcher");
29+
"spring-cloud-kubernetes-k8s-client-catalog-watcher");
3030

3131
private KubernetesClientCatalogWatchUtils() {
3232

@@ -38,7 +38,7 @@ private KubernetesClientCatalogWatchUtils() {
3838
"template": {
3939
"spec": {
4040
"containers": [{
41-
"name": "spring-cloud-kubernetes-client-catalog-watcher",
41+
"name": "spring-cloud-kubernetes-k8s-client-catalog-watcher",
4242
"image": "image_name_here",
4343
"env": [
4444
{
@@ -63,7 +63,7 @@ private KubernetesClientCatalogWatchUtils() {
6363
"template": {
6464
"spec": {
6565
"containers": [{
66-
"name": "spring-cloud-kubernetes-client-catalog-watcher",
66+
"name": "spring-cloud-kubernetes-k8s-client-catalog-watcher",
6767
"image": "image_name_here",
6868
"env": [
6969
{
@@ -96,7 +96,7 @@ private KubernetesClientCatalogWatchUtils() {
9696
"template": {
9797
"spec": {
9898
"containers": [{
99-
"name": "spring-cloud-kubernetes-client-catalog-watcher",
99+
"name": "spring-cloud-kubernetes-k8s-client-catalog-watcher",
100100
"image": "image_name_here",
101101
"env": [
102102
{

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/app/watcher-deployment.yaml renamed to ‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/app/watcher-deployment.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: spring-cloud-kubernetes-client-catalog-watcher
4+
name: spring-cloud-kubernetes-k8s-client-catalog-watcher
55
spec:
66
selector:
77
matchLabels:
8-
app: spring-cloud-kubernetes-client-catalog-watcher
8+
app: spring-cloud-kubernetes-k8s-client-catalog-watcher
99
template:
1010
metadata:
1111
labels:
12-
app: spring-cloud-kubernetes-client-catalog-watcher
12+
app: spring-cloud-kubernetes-k8s-client-catalog-watcher
1313
spec:
1414
serviceAccountName: spring-cloud-kubernetes-serviceaccount
1515
containers:
16-
- name: spring-cloud-kubernetes-client-catalog-watcher
17-
image: docker.io/springcloud/spring-cloud-kubernetes-client-catalog-watcher
16+
- name: spring-cloud-kubernetes-k8s-client-catalog-watcher
17+
image: docker.io/springcloud/spring-cloud-kubernetes-k8s-client-catalog-watcher
1818
imagePullPolicy: IfNotPresent
1919
readinessProbe:
2020
httpGet:

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/app/watcher-ingress.yaml renamed to ‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/app/watcher-ingress.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
4-
name: spring-cloud-kubernetes-client-catalog-watcher-ingress
4+
name: spring-cloud-kubernetes-k8s-client-catalog-watcher-ingress
55
namespace: default
66
spec:
77
rules:
@@ -11,6 +11,6 @@ spec:
1111
pathType: Prefix
1212
backend:
1313
service:
14-
name: spring-cloud-kubernetes-client-catalog-watcher-service
14+
name: spring-cloud-kubernetes-k8s-client-catalog-watcher-service
1515
port:
1616
number: 8080

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/app/watcher-service.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
labels:
5+
app: spring-cloud-kubernetes-k8s-client-catalog-watcher-service
6+
name: spring-cloud-kubernetes-k8s-client-catalog-watcher-service
7+
spec:
8+
ports:
9+
- name: http
10+
port: 8080
11+
targetPort: 8080
12+
selector:
13+
app: spring-cloud-kubernetes-k8s-client-catalog-watcher
14+
type: ClusterIP

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/logback-test.xml renamed to ‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/logback-test.xml

File renamed without changes.

0 commit comments

Comments
 (0)