From add26d32d80ee3627e8f300c0a633e0e6a8f7876 Mon Sep 17 00:00:00 2001 From: erabii Date: Wed, 25 Oct 2023 21:06:39 +0300 Subject: [PATCH] k8s client load balancer name convention applied (#1488) --- .../pom.xml | 4 ++- ...rnetes-client-loadbalancer-it-service.yaml | 14 --------- .../pom.xml | 2 +- ...ernetesClientLoadBalancerApplication.java} | 8 ++--- .../src/main/resources/application.yaml | 0 .../client/loadbalancer}/LoadBalancerIT.java | 30 ++++++++----------- .../src/test/resources/logback-test.xml | 0 ...s-k8s-client-loadbalancer-deployment.yaml} | 10 +++---- ...etes-k8s-client-loadbalancer-ingress.yaml} | 2 +- ...netes-k8s-client-loadbalancer-service.yaml | 14 +++++++++ 10 files changed, 40 insertions(+), 44 deletions(-) delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-it-service.yaml rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-loadbalancer-it => spring-cloud-kubernetes-k8s-client-loadbalancer}/pom.xml (97%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-loadbalancer-it/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/KubernetesClientLoadBalancerApplicationIt.java => spring-cloud-kubernetes-k8s-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/KubernetesClientLoadBalancerApplication.java} (88%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-loadbalancer-it => spring-cloud-kubernetes-k8s-client-loadbalancer}/src/main/resources/application.yaml (100%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it => spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer}/LoadBalancerIT.java (83%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-loadbalancer-it => spring-cloud-kubernetes-k8s-client-loadbalancer}/src/test/resources/logback-test.xml (100%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-pod-it-deployment.yaml => spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/resources/spring-cloud-kubernetes-k8s-client-loadbalancer-deployment.yaml} (65%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-it-ingress.yaml => spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/resources/spring-cloud-kubernetes-k8s-client-loadbalancer-ingress.yaml} (81%) create mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/resources/spring-cloud-kubernetes-k8s-client-loadbalancer-service.yaml diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index d205b56d..7c83755e 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -71,7 +71,9 @@ spring-cloud-kubernetes-k8s-client-configuration-watcher - spring-cloud-kubernetes-client-loadbalancer-it + + spring-cloud-kubernetes-k8s-client-loadbalancer + spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-it-service.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-it-service.yaml deleted file mode 100644 index a2ee8e36..00000000 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-it-service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: spring-cloud-kubernetes-client-loadbalancer-it - name: spring-cloud-kubernetes-client-loadbalancer-it -spec: - ports: - - name: http - port: 8080 - targetPort: 8080 - selector: - app: spring-cloud-kubernetes-client-loadbalancer-it - type: ClusterIP diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/pom.xml similarity index 97% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/pom.xml index 61e6ba12..3c4b20db 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - spring-cloud-kubernetes-client-loadbalancer-it + spring-cloud-kubernetes-k8s-client-loadbalancer diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/KubernetesClientLoadBalancerApplicationIt.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/KubernetesClientLoadBalancerApplication.java similarity index 88% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/KubernetesClientLoadBalancerApplicationIt.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/KubernetesClientLoadBalancerApplication.java index f9cdee80..15983231 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/KubernetesClientLoadBalancerApplicationIt.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/KubernetesClientLoadBalancerApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.loadbalancer.it; +package org.springframework.cloud.kubernetes.k8s.client.loadbalancer; import java.util.List; import java.util.Map; @@ -38,18 +38,18 @@ import org.springframework.web.reactive.function.client.WebClient; @SpringBootApplication @RestController -public class KubernetesClientLoadBalancerApplicationIt { +public class KubernetesClientLoadBalancerApplication { private static final String URL = "http://service-wiremock/__admin/mappings"; private final DiscoveryClient discoveryClient; - public KubernetesClientLoadBalancerApplicationIt(DiscoveryClient discoveryClien) { + public KubernetesClientLoadBalancerApplication(DiscoveryClient discoveryClien) { this.discoveryClient = discoveryClien; } public static void main(String[] args) { - SpringApplication.run(KubernetesClientLoadBalancerApplicationIt.class, args); + SpringApplication.run(KubernetesClientLoadBalancerApplication.class, args); } @Bean diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/main/resources/application.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/main/resources/application.yaml similarity index 100% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/main/resources/application.yaml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/main/resources/application.yaml diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java similarity index 83% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java index 909a078d..e07081ad 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java @@ -14,11 +14,9 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.loadbalancer.it; +package org.springframework.cloud.kubernetes.k8s.client.loadbalancer; -import java.time.Duration; import java.util.Map; -import java.util.Objects; import io.kubernetes.client.openapi.models.V1Deployment; import io.kubernetes.client.openapi.models.V1Ingress; @@ -34,8 +32,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.testcontainers.k3s.K3sContainer; import reactor.netty.http.client.HttpClient; -import reactor.util.retry.Retry; -import reactor.util.retry.RetryBackoffSpec; import org.springframework.boot.test.json.BasicJsonTester; import org.springframework.cloud.kubernetes.integration.tests.commons.Commons; @@ -61,7 +57,7 @@ class LoadBalancerIT { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-loadbalancer-it", + "name": "spring-cloud-kubernetes-k8s-client-loadbalancer", "env": [ { "name": "SPRING_CLOUD_KUBERNETES_LOADBALANCER_MODE", @@ -76,11 +72,12 @@ class LoadBalancerIT { """; private static final Map POD_LABELS = Map.of("app", - "spring-cloud-kubernetes-client-loadbalancer-it"); + "spring-cloud-kubernetes-k8s-client-loadbalancer"); private static final String SERVICE_URL = "http://localhost:80/loadbalancer-it/service"; - private static final String SPRING_CLOUD_K8S_LOADBALANCER_APP_NAME = "spring-cloud-kubernetes-client-loadbalancer-it"; + private static final String SPRING_CLOUD_K8S_LOADBALANCER_APP_NAME = + "spring-cloud-kubernetes-k8s-client-loadbalancer"; private static final String NAMESPACE = "default"; @@ -124,7 +121,7 @@ class LoadBalancerIT { @Test @Order(2) void testLoadBalancerServiceMode() { - patchForServiceMode("spring-cloud-kubernetes-client-loadbalancer-it-deployment", NAMESPACE); + patchForServiceMode(); testLoadBalancer(); } @@ -141,9 +138,9 @@ class LoadBalancerIT { private static void loadbalancerIt(Phase phase) { V1Deployment deployment = (V1Deployment) util - .yaml("spring-cloud-kubernetes-client-loadbalancer-pod-it-deployment.yaml"); - V1Service service = (V1Service) util.yaml("spring-cloud-kubernetes-client-loadbalancer-it-service.yaml"); - V1Ingress ingress = (V1Ingress) util.yaml("spring-cloud-kubernetes-client-loadbalancer-it-ingress.yaml"); + .yaml("spring-cloud-kubernetes-k8s-client-loadbalancer-deployment.yaml"); + V1Service service = (V1Service) util.yaml("spring-cloud-kubernetes-k8s-client-loadbalancer-service.yaml"); + V1Ingress ingress = (V1Ingress) util.yaml("spring-cloud-kubernetes-k8s-client-loadbalancer-ingress.yaml"); if (phase.equals(Phase.CREATE)) { util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); @@ -157,12 +154,9 @@ class LoadBalancerIT { return WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.create())); } - private RetryBackoffSpec retrySpec() { - return Retry.fixedDelay(15, Duration.ofSeconds(1)).filter(Objects::nonNull); - } - - private static void patchForServiceMode(String deploymentName, String namespace) { - patchWithMerge(deploymentName, namespace, BODY_FOR_MERGE, POD_LABELS); + private static void patchForServiceMode() { + patchWithMerge("spring-cloud-kubernetes-k8s-client-loadbalancer", LoadBalancerIT.NAMESPACE, + BODY_FOR_MERGE, POD_LABELS); } } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/logback-test.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/logback-test.xml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/resources/logback-test.xml diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-pod-it-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/resources/spring-cloud-kubernetes-k8s-client-loadbalancer-deployment.yaml similarity index 65% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-pod-it-deployment.yaml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/resources/spring-cloud-kubernetes-k8s-client-loadbalancer-deployment.yaml index 8b1401e6..a0aab26b 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-pod-it-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/resources/spring-cloud-kubernetes-k8s-client-loadbalancer-deployment.yaml @@ -1,23 +1,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: spring-cloud-kubernetes-client-loadbalancer-it-deployment + name: spring-cloud-kubernetes-k8s-client-loadbalancer spec: selector: matchLabels: - app: spring-cloud-kubernetes-client-loadbalancer-it + app: spring-cloud-kubernetes-k8s-client-loadbalancer template: metadata: labels: - app: spring-cloud-kubernetes-client-loadbalancer-it + app: spring-cloud-kubernetes-k8s-client-loadbalancer spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - - name: spring-cloud-kubernetes-client-loadbalancer-it + - name: spring-cloud-kubernetes-k8s-client-loadbalancer env: - name: SPRING_CLOUD_KUBERNETES_LOADBALANCER_MODE value: POD - image: docker.io/springcloud/spring-cloud-kubernetes-client-loadbalancer-it + image: docker.io/springcloud/spring-cloud-kubernetes-k8s-client-loadbalancer imagePullPolicy: IfNotPresent readinessProbe: httpGet: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-it-ingress.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/resources/spring-cloud-kubernetes-k8s-client-loadbalancer-ingress.yaml similarity index 81% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-it-ingress.yaml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/resources/spring-cloud-kubernetes-k8s-client-loadbalancer-ingress.yaml index 8e44f4e6..35c5d8da 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-it-ingress.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/resources/spring-cloud-kubernetes-k8s-client-loadbalancer-ingress.yaml @@ -11,7 +11,7 @@ spec: pathType: Prefix backend: service: - name: spring-cloud-kubernetes-client-loadbalancer-it + name: spring-cloud-kubernetes-k8s-client-loadbalancer port: number: 8080 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/resources/spring-cloud-kubernetes-k8s-client-loadbalancer-service.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/resources/spring-cloud-kubernetes-k8s-client-loadbalancer-service.yaml new file mode 100644 index 00000000..6fe86a0a --- /dev/null +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/resources/spring-cloud-kubernetes-k8s-client-loadbalancer-service.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: spring-cloud-kubernetes-k8s-client-loadbalancer + name: spring-cloud-kubernetes-k8s-client-loadbalancer +spec: + ports: + - name: http + port: 8080 + targetPort: 8080 + selector: + app: spring-cloud-kubernetes-k8s-client-loadbalancer + type: ClusterIP