From df6fd5c5f46a035f4de2bfeac2693a425af5bb98 Mon Sep 17 00:00:00 2001 From: erabii Date: Mon, 9 Oct 2023 22:04:39 +0300 Subject: [PATCH] Fabric8 it part 8 (#1475) --- spring-cloud-kubernetes-integration-tests/pom.xml | 9 +++++---- .../src/test/resources/app/watcher-service.yaml | 14 -------------- .../pom.xml | 2 +- .../k8s/client/catalog/watcher}/Application.java | 2 +- .../watcher}/EndpointNameAndNamespaceService.java | 2 +- .../client/catalog/watcher}/HeartBeatListener.java | 2 +- .../catalog/watcher}/HeartbeatController.java | 2 +- .../watcher}/KubernetesClientCatalogWatchIT.java | 14 +++++++------- ...rnetesClientCatalogWatchNamespacesDelegate.java | 12 +++++------- .../KubernetesClientCatalogWatchUtils.java | 10 +++++----- .../src/test/resources/app/watcher-deployment.yaml | 10 +++++----- .../src/test/resources/app/watcher-ingress.yaml | 4 ++-- .../src/test/resources/app/watcher-service.yaml | 14 ++++++++++++++ .../src/test/resources/logback-test.xml | 0 14 files changed, 48 insertions(+), 49 deletions(-) delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/app/watcher-service.yaml rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-catalog-watcher => spring-cloud-kubernetes-k8s-client-catalog-watcher}/pom.xml (97%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog => spring-cloud-kubernetes-k8s-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher}/Application.java (93%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog => spring-cloud-kubernetes-k8s-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher}/EndpointNameAndNamespaceService.java (94%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog => spring-cloud-kubernetes-k8s-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher}/HeartBeatListener.java (95%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog => spring-cloud-kubernetes-k8s-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher}/HeartbeatController.java (94%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog => spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher}/KubernetesClientCatalogWatchIT.java (93%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog => spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher}/KubernetesClientCatalogWatchNamespacesDelegate.java (94%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog => spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher}/KubernetesClientCatalogWatchUtils.java (91%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-catalog-watcher => spring-cloud-kubernetes-k8s-client-catalog-watcher}/src/test/resources/app/watcher-deployment.yaml (69%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-catalog-watcher => spring-cloud-kubernetes-k8s-client-catalog-watcher}/src/test/resources/app/watcher-ingress.yaml (64%) create mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/app/watcher-service.yaml rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-catalog-watcher => spring-cloud-kubernetes-k8s-client-catalog-watcher}/src/test/resources/logback-test.xml (100%) diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index 1a9189e176..d1b2bf62f4 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -48,9 +48,13 @@ - spring-cloud-kubernetes-fabric8-istio-it + spring-cloud-kubernetes-fabric8-client-catalog-watcher + spring-cloud-kubernetes-k8s-client-catalog-watcher + spring-cloud-kubernetes-fabric8-client-discovery spring-cloud-kubernetes-fabric8-client-reload + spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap + spring-cloud-kubernetes-fabric8-istio-it spring-cloud-kubernetes-discoveryclient-it spring-cloud-kubernetes-client-loadbalancer-it @@ -58,9 +62,6 @@ spring-cloud-kubernetes-client-event-and-polling-reload spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps - spring-cloud-kubernetes-fabric8-client-catalog-watcher - spring-cloud-kubernetes-client-catalog-watcher spring-cloud-kubernetes-client-discovery-it - spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/app/watcher-service.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/app/watcher-service.yaml deleted file mode 100644 index 53ea6aec71..0000000000 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/app/watcher-service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: spring-cloud-kubernetes-client-catalog-watcher-service - name: spring-cloud-kubernetes-client-catalog-watcher-service -spec: - ports: - - name: http - port: 8080 - targetPort: 8080 - selector: - app: spring-cloud-kubernetes-client-catalog-watcher - type: ClusterIP diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml similarity index 97% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml index 38f4e18e73..118b25ce5c 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - spring-cloud-kubernetes-client-catalog-watcher + spring-cloud-kubernetes-k8s-client-catalog-watcher diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/Application.java b/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 similarity index 93% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/Application.java rename 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 index d896ecb20a..bd8fdf5f1e 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/Application.java +++ b/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 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.catalog; +package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/EndpointNameAndNamespaceService.java b/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 similarity index 94% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/EndpointNameAndNamespaceService.java rename 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 index 7f0c9cf750..7ee940e908 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/EndpointNameAndNamespaceService.java +++ b/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 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.catalog; +package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher; import java.util.List; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/HeartBeatListener.java b/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 similarity index 95% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/HeartBeatListener.java rename 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 index 88ef4e734d..ad1910846a 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/HeartBeatListener.java +++ b/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 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.catalog; +package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher; import java.util.List; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/HeartbeatController.java b/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 similarity index 94% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/HeartbeatController.java rename 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 index 6b6a1a0178..7a738a2eb2 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/client/catalog/HeartbeatController.java +++ b/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 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.catalog; +package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher; import java.util.List; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog/KubernetesClientCatalogWatchIT.java b/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 similarity index 93% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog/KubernetesClientCatalogWatchIT.java rename 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 index 4918f807a0..9677c27395 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog/KubernetesClientCatalogWatchIT.java +++ b/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 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.catalog; +package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher; import java.time.Duration; import java.util.List; @@ -48,10 +48,10 @@ import org.springframework.web.reactive.function.client.WebClient; import static org.awaitility.Awaitility.await; -import static org.springframework.cloud.kubernetes.client.catalog.KubernetesClientCatalogWatchUtils.patchForEndpointSlices; -import static org.springframework.cloud.kubernetes.client.catalog.KubernetesClientCatalogWatchUtils.patchForEndpointSlicesNamespaces; -import static org.springframework.cloud.kubernetes.client.catalog.KubernetesClientCatalogWatchUtils.patchForEndpointsNamespaces; import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.waitForLogStatement; +import static org.springframework.cloud.kubernetes.k8s.client.catalog.watcher.KubernetesClientCatalogWatchUtils.patchForEndpointSlices; +import static org.springframework.cloud.kubernetes.k8s.client.catalog.watcher.KubernetesClientCatalogWatchUtils.patchForEndpointSlicesNamespaces; +import static org.springframework.cloud.kubernetes.k8s.client.catalog.watcher.KubernetesClientCatalogWatchUtils.patchForEndpointsNamespaces; /** * @author wind57 @@ -59,7 +59,7 @@ @TestMethodOrder(MethodOrderer.OrderAnnotation.class) class KubernetesClientCatalogWatchIT { - private static final String APP_NAME = "spring-cloud-kubernetes-client-catalog-watcher"; + private static final String APP_NAME = "spring-cloud-kubernetes-k8s-client-catalog-watcher"; private static final String NAMESPACE = "default"; @@ -129,12 +129,12 @@ void testCatalogWatchWithEndpointsNamespaces() { util.busybox(NAMESPACE_A, Phase.CREATE); util.busybox(NAMESPACE_B, Phase.CREATE); patchForEndpointsNamespaces(APP_NAME, NAMESPACE, DOCKER_IMAGE); - KubernetesClientCatalogWatchNamespacesDelegate.testCatalogWatchWithEndpointsNamespaces(); + KubernetesClientCatalogWatchNamespacesDelegate.testCatalogWatchWithEndpointsNamespaces(APP_NAME); util.busybox(NAMESPACE_A, Phase.CREATE); util.busybox(NAMESPACE_B, Phase.CREATE); patchForEndpointSlicesNamespaces(APP_NAME, NAMESPACE, DOCKER_IMAGE); - KubernetesClientCatalogWatchNamespacesDelegate.testCatalogWatchWithEndpointSlicesNamespaces(); + KubernetesClientCatalogWatchNamespacesDelegate.testCatalogWatchWithEndpointSlicesNamespaces(APP_NAME); } /** diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog/KubernetesClientCatalogWatchNamespacesDelegate.java b/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 similarity index 94% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog/KubernetesClientCatalogWatchNamespacesDelegate.java rename 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 index 30ba34b249..66283f7199 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog/KubernetesClientCatalogWatchNamespacesDelegate.java +++ b/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 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.catalog; +package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher; import java.time.Duration; import java.util.Arrays; @@ -47,8 +47,6 @@ private KubernetesClientCatalogWatchNamespacesDelegate() { } - private static final String APP_NAME = "spring-cloud-kubernetes-client-catalog-watcher"; - private static final String NAMESPACE_A = "namespacea"; private static final String NAMESPACE_B = "namespaceb"; @@ -67,13 +65,13 @@ private KubernetesClientCatalogWatchNamespacesDelegate() { * - assert that we receive only spring-cloud-kubernetes-client-catalog-watcher pod * */ - static void testCatalogWatchWithEndpointsNamespaces() { - waitForLogStatement("stateGenerator is of type: KubernetesEndpointsCatalogWatch", K3S, APP_NAME); + static void testCatalogWatchWithEndpointsNamespaces(String deploymentName) { + waitForLogStatement("stateGenerator is of type: KubernetesEndpointsCatalogWatch", K3S, deploymentName); testForNamespacesFilter(); } - static void testCatalogWatchWithEndpointSlicesNamespaces() { - waitForLogStatement("stateGenerator is of type: KubernetesEndpointSlicesCatalogWatch", K3S, APP_NAME); + static void testCatalogWatchWithEndpointSlicesNamespaces(String deploymentName) { + waitForLogStatement("stateGenerator is of type: KubernetesEndpointSlicesCatalogWatch", K3S, deploymentName); testForNamespacesFilter(); } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog/KubernetesClientCatalogWatchUtils.java b/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 similarity index 91% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog/KubernetesClientCatalogWatchUtils.java rename 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 index 02fd587271..083b302495 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog/KubernetesClientCatalogWatchUtils.java +++ b/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 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.catalog; +package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher; import java.util.Map; @@ -26,7 +26,7 @@ final class KubernetesClientCatalogWatchUtils { private static final Map POD_LABELS = Map.of("app", - "spring-cloud-kubernetes-client-catalog-watcher"); + "spring-cloud-kubernetes-k8s-client-catalog-watcher"); private KubernetesClientCatalogWatchUtils() { @@ -38,7 +38,7 @@ private KubernetesClientCatalogWatchUtils() { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-catalog-watcher", + "name": "spring-cloud-kubernetes-k8s-client-catalog-watcher", "image": "image_name_here", "env": [ { @@ -63,7 +63,7 @@ private KubernetesClientCatalogWatchUtils() { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-catalog-watcher", + "name": "spring-cloud-kubernetes-k8s-client-catalog-watcher", "image": "image_name_here", "env": [ { @@ -96,7 +96,7 @@ private KubernetesClientCatalogWatchUtils() { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-catalog-watcher", + "name": "spring-cloud-kubernetes-k8s-client-catalog-watcher", "image": "image_name_here", "env": [ { diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/app/watcher-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/app/watcher-deployment.yaml similarity index 69% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/app/watcher-deployment.yaml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/app/watcher-deployment.yaml index e0b9b534ae..04bed12ef2 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/app/watcher-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/app/watcher-deployment.yaml @@ -1,20 +1,20 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: spring-cloud-kubernetes-client-catalog-watcher + name: spring-cloud-kubernetes-k8s-client-catalog-watcher spec: selector: matchLabels: - app: spring-cloud-kubernetes-client-catalog-watcher + app: spring-cloud-kubernetes-k8s-client-catalog-watcher template: metadata: labels: - app: spring-cloud-kubernetes-client-catalog-watcher + app: spring-cloud-kubernetes-k8s-client-catalog-watcher spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - - name: spring-cloud-kubernetes-client-catalog-watcher - image: docker.io/springcloud/spring-cloud-kubernetes-client-catalog-watcher + - name: spring-cloud-kubernetes-k8s-client-catalog-watcher + image: docker.io/springcloud/spring-cloud-kubernetes-k8s-client-catalog-watcher imagePullPolicy: IfNotPresent readinessProbe: httpGet: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/app/watcher-ingress.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/app/watcher-ingress.yaml similarity index 64% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/app/watcher-ingress.yaml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/app/watcher-ingress.yaml index cd01c1c29a..f3abc4061e 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/app/watcher-ingress.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/app/watcher-ingress.yaml @@ -1,7 +1,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: spring-cloud-kubernetes-client-catalog-watcher-ingress + name: spring-cloud-kubernetes-k8s-client-catalog-watcher-ingress namespace: default spec: rules: @@ -11,6 +11,6 @@ spec: pathType: Prefix backend: service: - name: spring-cloud-kubernetes-client-catalog-watcher-service + name: spring-cloud-kubernetes-k8s-client-catalog-watcher-service port: number: 8080 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/app/watcher-service.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/app/watcher-service.yaml new file mode 100644 index 0000000000..884fc5aca5 --- /dev/null +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/app/watcher-service.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: spring-cloud-kubernetes-k8s-client-catalog-watcher-service + name: spring-cloud-kubernetes-k8s-client-catalog-watcher-service +spec: + ports: + - name: http + port: 8080 + targetPort: 8080 + selector: + app: spring-cloud-kubernetes-k8s-client-catalog-watcher + type: ClusterIP diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/logback-test.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/logback-test.xml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/logback-test.xml