From ca5380453ec1b90ff5aa0373b4b1c2c4efdd55c5 Mon Sep 17 00:00:00 2001 From: Haytham Mohamed Date: Thu, 16 Jul 2020 11:50:47 -0500 Subject: [PATCH] upgrade k8s fabric8 client to 4.10.3 --- spring-cloud-kubernetes-dependencies/pom.xml | 2 +- .../KubernetesDiscoveryClientTest.java | 24 +++++++++---------- ...ubernetesReactiveDiscoveryClientTests.java | 16 ++++++------- .../kubernetes/ribbon/RibbonFallbackTest.java | 2 +- .../cloud/kubernetes/ribbon/RibbonTest.java | 24 +++++++++---------- 5 files changed, 33 insertions(+), 35 deletions(-) diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml index 9a89aca7..1642c08d 100644 --- a/spring-cloud-kubernetes-dependencies/pom.xml +++ b/spring-cloud-kubernetes-dependencies/pom.xml @@ -34,7 +34,7 @@ 1.4.0.Final 1.15.2 - 4.4.1 + 4.10.3 1.0.0 0.1.2 3.12.0 diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTest.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTest.java index fe05ee20..85a77231 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTest.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTest.java @@ -69,8 +69,8 @@ public class KubernetesDiscoveryClientTest { Endpoints endPoint = new EndpointsBuilder().withNewMetadata().withName("endpoint") .withNamespace("test").withLabels(labels).endMetadata().addNewSubset() .addNewAddress().withIp("ip1").withNewTargetRef().withUid("10") - .endTargetRef().endAddress().addNewPort("http", 80, "TCP").endSubset() - .build(); + .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") + .endSubset().build(); List endpointsList = new ArrayList<>(); endpointsList.add(endPoint); @@ -121,8 +121,8 @@ public class KubernetesDiscoveryClientTest { .withName("endpoint").withNamespace("test").withLabels(labels) .endMetadata().addNewSubset().addNewAddress().withIp("ip1") .withNewTargetRef().withUid("20").endTargetRef().endAddress() - .addNewPort("mgmt", 900, "TCP").addNewPort("http", 80, "TCP").endSubset() - .build(); + .addNewPort("mgmt", "mgmt_tcp", 900, "TCP") + .addNewPort("http", "http_tcp", 80, "TCP").endSubset().build(); List endpointsList = new ArrayList<>(); endpointsList.add(endPoint1); @@ -146,7 +146,7 @@ public class KubernetesDiscoveryClientTest { .andReturn(200, service).always(); final KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); - properties.setPrimaryPortName("http"); + properties.setPrimaryPortName("http_tcp"); final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, KubernetesClient::services, @@ -168,8 +168,8 @@ public class KubernetesDiscoveryClientTest { Endpoints endPoint = new EndpointsBuilder().withNewMetadata().withName("endpoint") .withNamespace("test").withLabels(labels).endMetadata().addNewSubset() .addNewAddress().withIp("ip1").withNewTargetRef().withUid("30") - .endTargetRef().endAddress().addNewPort("http", 80, "TCP").endSubset() - .build(); + .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") + .endSubset().build(); List endpointsList = new ArrayList<>(); endpointsList.add(endPoint); @@ -204,7 +204,7 @@ public class KubernetesDiscoveryClientTest { .addNewAddress().withIp("ip1").withNewTargetRef().withUid("40") .endTargetRef().endAddress().addNewAddress().withIp("ip2") .withNewTargetRef().withUid("50").endTargetRef().endAddress() - .addNewPort("https", 443, "TCP").endSubset().build(); + .addNewPort("https", "https_tcp", 443, "TCP").endSubset().build(); List endpointsList = new ArrayList<>(); endpointsList.add(endPoint); @@ -306,14 +306,14 @@ public class KubernetesDiscoveryClientTest { Endpoints endPoints1 = new EndpointsBuilder().withNewMetadata() .withName("endpoint").withNamespace("test").endMetadata().addNewSubset() .addNewAddress().withIp("ip1").withNewTargetRef().withUid("60") - .endTargetRef().endAddress().addNewPort("http", 80, "TCP").endSubset() - .build(); + .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") + .endSubset().build(); Endpoints endpoints2 = new EndpointsBuilder().withNewMetadata() .withName("endpoint").withNamespace("test2").endMetadata().addNewSubset() .addNewAddress().withIp("ip2").withNewTargetRef().withUid("70") - .endTargetRef().endAddress().addNewPort("http", 80, "TCP").endSubset() - .build(); + .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") + .endSubset().build(); List endpointsList = new ArrayList<>(); endpointsList.add(endPoints1); diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientTests.java index fa35fa23..a09e7cad 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientTests.java @@ -160,8 +160,8 @@ class KubernetesReactiveDiscoveryClientTests { Endpoints endPoints = new EndpointsBuilder().withNewMetadata() .withName("endpoint").withNamespace("test").endMetadata().addNewSubset() .addNewAddress().withIp("ip1").withNewTargetRef().withUid("uid1") - .endTargetRef().endAddress().addNewPort("http", 80, "TCP").endSubset() - .build(); + .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") + .endSubset().build(); kubernetesServer.expect().get() .withPath("/api/v1/namespaces/test/endpoints/existing-service") @@ -204,8 +204,8 @@ class KubernetesReactiveDiscoveryClientTests { Endpoints endPoints = new EndpointsBuilder().withNewMetadata() .withName("endpoint").withNamespace("test").endMetadata().addNewSubset() .addNewAddress().withIp("ip1").withNewTargetRef().withUid("uid1") - .endTargetRef().endAddress().addNewPort("http", 80, "TCP").endSubset() - .build(); + .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") + .endSubset().build(); kubernetesServer.expect().get() .withPath("/api/v1/namespaces/test/endpoints/existing-service") @@ -251,8 +251,8 @@ class KubernetesReactiveDiscoveryClientTests { Endpoints endPoints = new EndpointsBuilder().withNewMetadata() .withName("endpoint").withNamespace("test").endMetadata().addNewSubset() .addNewAddress().withIp("ip1").withNewTargetRef().withUid("uid1") - .endTargetRef().endAddress().addNewPort("http", 80, "TCP") - .addNewPort("https", 443, "TCP").endSubset().build(); + .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") + .addNewPort("https", "https_tcp", 443, "TCP").endSubset().build(); kubernetesServer.expect().get() .withPath("/api/v1/namespaces/test/endpoints/existing-service") @@ -296,8 +296,8 @@ class KubernetesReactiveDiscoveryClientTests { Endpoints endpoints = new EndpointsBuilder().withNewMetadata() .withName("endpoint").withNamespace("test").endMetadata().addNewSubset() .addNewAddress().withIp("ip1").withNewTargetRef().withUid("uid1") - .endTargetRef().endAddress().addNewPort("http", 80, "TCP") - .addNewPort("https", 443, "TCP").endSubset().build(); + .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") + .addNewPort("https", "https_tcp", 443, "TCP").endSubset().build(); EndpointsList endpointsList = new EndpointsList(); endpointsList.setItems(singletonList(endpoints)); diff --git a/spring-cloud-kubernetes-ribbon/src/test/java/org/springframework/cloud/kubernetes/ribbon/RibbonFallbackTest.java b/spring-cloud-kubernetes-ribbon/src/test/java/org/springframework/cloud/kubernetes/ribbon/RibbonFallbackTest.java index 6422d641..bb14424b 100644 --- a/spring-cloud-kubernetes-ribbon/src/test/java/org/springframework/cloud/kubernetes/ribbon/RibbonFallbackTest.java +++ b/spring-cloud-kubernetes-ribbon/src/test/java/org/springframework/cloud/kubernetes/ribbon/RibbonFallbackTest.java @@ -100,7 +100,7 @@ public class RibbonFallbackTest { .addNewAddress() .withIp(mockServer.getHostName()) .endAddress() - .addNewPort("http", mockServer.getPort(), "http") + .addNewPort("http", "http_tcp",mockServer.getPort(), "http") .endSubset() .build(); // @formatter:on diff --git a/spring-cloud-kubernetes-ribbon/src/test/java/org/springframework/cloud/kubernetes/ribbon/RibbonTest.java b/spring-cloud-kubernetes-ribbon/src/test/java/org/springframework/cloud/kubernetes/ribbon/RibbonTest.java index 08514363..a6413a01 100644 --- a/spring-cloud-kubernetes-ribbon/src/test/java/org/springframework/cloud/kubernetes/ribbon/RibbonTest.java +++ b/spring-cloud-kubernetes-ribbon/src/test/java/org/springframework/cloud/kubernetes/ribbon/RibbonTest.java @@ -79,19 +79,17 @@ public class RibbonTest { // Configured server.expect().get().withPath("/api/v1/namespaces/testns/endpoints/testapp") - .andReturn(200, - new EndpointsBuilder().withNewMetadata().withName("testapp-a") - .endMetadata().addNewSubset().addNewAddress() - .withIp(mockEndpointA.getMockServer().getHostName()) - .endAddress() - .addNewPort("http", - mockEndpointA.getMockServer().getPort(), "http") - .endSubset().addNewSubset().addNewAddress() - .withIp(mockEndpointB.getMockServer().getHostName()) - .endAddress() - .addNewPort("http", - mockEndpointB.getMockServer().getPort(), "http") - .endSubset().build()) + .andReturn(200, new EndpointsBuilder().withNewMetadata() + .withName("testapp-a").endMetadata().addNewSubset() + .addNewAddress() + .withIp(mockEndpointA.getMockServer().getHostName()).endAddress() + .addNewPort("http", "http_tcp", + mockEndpointA.getMockServer().getPort(), "http") + .endSubset().addNewSubset().addNewAddress() + .withIp(mockEndpointB.getMockServer().getHostName()).endAddress() + .addNewPort("http", "http_tcp", + mockEndpointB.getMockServer().getPort(), "http") + .endSubset().build()) .always(); mockEndpointA.expect().get().withPath("/greeting").andReturn(200, "Hello from A")