diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerDiscoveryClientTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerDiscoveryClientTests.java index 3ed55db506..60bff465c9 100644 --- a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerDiscoveryClientTests.java +++ b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerDiscoveryClientTests.java @@ -111,7 +111,7 @@ void testServiceWithUnsetPortNames() { assertThat(discoveryClient.getInstances("test-svc-1").toArray()) .containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "1.1.1.1", 80, Map.of("port.", "80", "k8s_namespace", "namespace1", "type", "ClusterIP"), false, - "namespace1", null)); + "namespace1", null, Map.of())); } @Test @@ -161,7 +161,7 @@ void testDiscoveryInstancesWithServiceLabels() { new DefaultKubernetesServiceInstance( null, "test-svc-3", "2.2.2.2", 8080, Map.of("spring", "true", "port.", "8080", "k8s", "true", "k8s_namespace", "namespace1", "type", "ClusterIP"), - false, "namespace1", null)); + false, "namespace1", null, Map.of())); } @Test @@ -214,7 +214,7 @@ void testDiscoveryGetInstanceAllNamespaceShouldWork() { assertThat(discoveryClient.getInstances("test-svc-1")) .containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "2.2.2.2", 8080, Map.of("port.", "8080", "k8s_namespace", "namespace1", "type", "ClusterIP"), false, - "namespace1", null)); + "namespace1", null, Map.of())); } @Test @@ -229,7 +229,7 @@ void testDiscoveryGetInstanceOneNamespaceShouldWork() { assertThat(discoveryClient.getInstances("test-svc-1")) .containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "2.2.2.2", 8080, Map.of("port.", "8080", "k8s_namespace", "namespace1", "type", "ClusterIP"), false, - "namespace1", null)); + "namespace1", null, Map.of())); } @Test @@ -260,7 +260,7 @@ void testDiscoveryGetInstanceWithNotReadyAddressesIncludedShouldWork() { assertThat(discoveryClient.getInstances("test-svc-1")) .containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "2.2.2.2", 8080, Map.of("port.", "8080", "k8s_namespace", "namespace1", "type", "ClusterIP"), false, - "namespace1", null)); + "namespace1", null, Map.of())); } @Test @@ -286,7 +286,7 @@ void instanceWithoutPortsWillNotBeSkipped() { assertThat(discoveryClient.getInstances("test-svc-1")) .containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "1.1.1.1", 0, - Map.of("k8s_namespace", "namespace1", "type", "ClusterIP"), false, "namespace1", null)); + Map.of("k8s_namespace", "namespace1", "type", "ClusterIP"), false, "namespace1", null, Map.of())); } @Test @@ -298,10 +298,10 @@ void instanceWithMultiplePortsAndPrimaryPortNameConfiguredWithLabelShouldWork() List.of(SHARED_INFORMER_FACTORY), List.of(serviceLister), List.of(endpointsLister), null, null, NOT_ALL_NAMESPACES, CORE_V1_API, x -> true); - assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new DefaultKubernetesServiceInstance( - null, "test-svc-1", "1.1.1.1", 443, Map.of("port.http", "80", "primary-port-name", "https", - "port.https", "443", "k8s_namespace", "namespace1", "type", "ClusterIP"), - true, "namespace1", null)); + assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new DefaultKubernetesServiceInstance(null, + "test-svc-1", "1.1.1.1", 443, Map.of("port.http", "80", "primary-port-name", "https", "port.https", + "443", "k8s_namespace", "namespace1", "type", "ClusterIP"), + true, "namespace1", null, Map.of())); } @Test @@ -314,11 +314,10 @@ void instanceWithMultiplePortsAndMisconfiguredPrimaryPortNameInLabelShouldReturn List.of(SHARED_INFORMER_FACTORY), List.of(serviceLister), List.of(endpointsLister), null, null, NOT_ALL_NAMESPACES, CORE_V1_API, x -> true); - assertThat(discoveryClient.getInstances("test-svc-1")) - .containsOnly(new DefaultKubernetesServiceInstance( - null, "test-svc-1", "1.1.1.1", 80, Map.of("port.tcp1", "80", "primary-port-name", "oops", - "port.tcp2", "443", "k8s_namespace", "namespace1", "type", "ClusterIP"), - false, "namespace1", null)); + assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new DefaultKubernetesServiceInstance( + null, "test-svc-1", "1.1.1.1", 80, Map.of("port.tcp1", "80", "primary-port-name", "oops", "port.tcp2", + "443", "k8s_namespace", "namespace1", "type", "ClusterIP"), + false, "namespace1", null, Map.of())); } @Test @@ -333,7 +332,7 @@ void instanceWithMultiplePortsAndGenericPrimaryPortNameConfiguredShouldWork() { assertThat(discoveryClient.getInstances("test-svc-1")) .containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "1.1.1.1", 443, Map.of("port.http", "80", "port.https", "443", "k8s_namespace", "namespace1", "type", "ClusterIP"), - true, "namespace1", null)); + true, "namespace1", null, Map.of())); } @Test @@ -349,7 +348,7 @@ void instanceWithMultiplePortsAndMisconfiguredGenericPrimaryPortNameShouldReturn assertThat(discoveryClient.getInstances("test-svc-1")) .containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "1.1.1.1", 80, Map.of("port.tcp1", "80", "port.tcp2", "443", "k8s_namespace", "namespace1", "type", "ClusterIP"), - false, "namespace1", null)); + false, "namespace1", null, Map.of())); } @Test @@ -364,7 +363,7 @@ void instanceWithMultiplePortsAndWithoutPrimaryPortNameSpecifiedShouldFallBackTo assertThat(discoveryClient.getInstances("test-svc-1")) .containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "1.1.1.1", 443, Map.of("port.http", "80", "port.https", "443", "k8s_namespace", "namespace1", "type", "ClusterIP"), - true, "namespace1", null)); + true, "namespace1", null, Map.of())); } @Test @@ -379,7 +378,7 @@ void instanceWithMultiplePortsAndWithoutPrimaryPortNameSpecifiedOrHttpsPortShoul assertThat(discoveryClient.getInstances("test-svc-1")) .containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "1.1.1.1", 80, Map.of("port.http", "80", "port.tcp", "443", "k8s_namespace", "namespace1", "type", "ClusterIP"), - false, "namespace1", null)); + false, "namespace1", null, Map.of())); } @Test @@ -395,7 +394,7 @@ void instanceWithMultiplePortsAndWithoutAnyConfigurationShouldPickTheFirstPort() assertThat(discoveryClient.getInstances("test-svc-1")) .containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "1.1.1.1", 80, Map.of("port.tcp1", "80", "port.tcp2", "443", "k8s_namespace", "namespace1", "type", "ClusterIP"), - false, "namespace1", null)); + false, "namespace1", null, Map.of())); } @Test @@ -410,10 +409,10 @@ void getInstancesShouldReturnInstancesWithTheSameServiceIdFromNamespaces() { assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly( new DefaultKubernetesServiceInstance(null, "test-svc-1", "2.2.2.2", 8080, Map.of("port.", "8080", "k8s_namespace", "namespace1", "type", "ClusterIP"), false, - "namespace1", null), + "namespace1", null, Map.of()), new DefaultKubernetesServiceInstance(null, "test-svc-1", "2.2.2.2", 8080, Map.of("port.", "8080", "k8s_namespace", "namespace2", "type", "ClusterIP"), false, - "namespace2", null)); + "namespace2", null, Map.of())); } @Test diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerReactiveDiscoveryClientTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerReactiveDiscoveryClientTests.java index 6a214ee166..1e308c5907 100644 --- a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerReactiveDiscoveryClientTests.java +++ b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerReactiveDiscoveryClientTests.java @@ -137,7 +137,7 @@ void testDiscoveryGetInstanceAllNamespaceShouldWork() { StepVerifier.create(discoveryClient.getInstances("test-svc-1")) .expectNext(new DefaultKubernetesServiceInstance(null, "test-svc-1", "2.2.2.2", 8080, Map.of("type", "ClusterIP", "port.", "8080", "k8s_namespace", "namespace1"), false, - "namespace1", null)) + "namespace1", null, Map.of())) .expectComplete() .verify(); @@ -159,7 +159,7 @@ void testDiscoveryGetInstanceOneNamespaceShouldWork() { StepVerifier.create(discoveryClient.getInstances("test-svc-1")) .expectNext(new DefaultKubernetesServiceInstance(null, "test-svc-1", "2.2.2.2", 8080, Map.of("type", "ClusterIP", "port.", "8080", "k8s_namespace", "namespace1"), false, - "namespace1", null)) + "namespace1", null, Map.of())) .expectComplete() .verify(); diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapper.java b/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapper.java index cbbcb7f3e1..8cf3871a6b 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapper.java +++ b/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapper.java @@ -116,7 +116,7 @@ public KubernetesServiceInstance map(V1Service service) { boolean secure = secure(port, service); return new DefaultKubernetesServiceInstance(metadata.getUid(), metadata.getName(), host, port.getPort(), - serviceMetadata(service), secure); + serviceMetadata(service), secure, null, null, Map.of()); } private Map serviceMetadata(V1Service service) { diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapperTests.java b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapperTests.java index e8eafab2b0..41ea9ada81 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapperTests.java +++ b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapperTests.java @@ -59,7 +59,7 @@ void singlePortNonSecure() { Map metadata = Map.of("org.springframework.cloud", "true", "beta", "true", "k8s_namespace", "default", "type", "V1Service"); DefaultKubernetesServiceInstance result = new DefaultKubernetesServiceInstance("0", "database", - "database.default.svc.cluster.local", 80, metadata, false); + "database.default.svc.cluster.local", 80, metadata, false, null, null, Map.of()); assertThat(serviceInstance).isEqualTo(result); } @@ -79,7 +79,7 @@ void singlePortSecure() { Map metadata = Map.of("org.springframework.cloud", "true", "beta", "true", "secured", "true", "k8s_namespace", "default", "type", "V1Service"); DefaultKubernetesServiceInstance result = new DefaultKubernetesServiceInstance("0", "database", - "database.default.svc.cluster.local", 80, metadata, true); + "database.default.svc.cluster.local", 80, metadata, true, null, null, Map.of()); assertThat(serviceInstance).isEqualTo(result); } @@ -100,7 +100,7 @@ void multiplePortsSecure() { "default", "type", "V1Service"); KubernetesServiceInstance serviceInstance = mapper.map(service); DefaultKubernetesServiceInstance result = new DefaultKubernetesServiceInstance("0", "database", - "database.default.svc.cluster.local", 443, metadata, true); + "database.default.svc.cluster.local", 443, metadata, true, null, null, Map.of()); assertThat(serviceInstance).isEqualTo(result); } diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java index 00a830991e..d6ba209ec9 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java +++ b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java @@ -150,7 +150,7 @@ void singleNamespaceTest(CapturedOutput output) { Map metadata = Map.of("org.springframework.cloud", "true", "beta", "true", "k8s_namespace", "default", "type", "V1Service"); DefaultKubernetesServiceInstance serviceA = new DefaultKubernetesServiceInstance("0", "service-a", - "service-a.default.svc.cluster.local", 80, metadata, false); + "service-a.default.svc.cluster.local", 80, metadata, false, null, null, Map.of()); List services = new ArrayList<>(); services.add(serviceA); @@ -218,9 +218,10 @@ void allNamespacesTest(CapturedOutput output) { Map metadata = Map.of("org.springframework.cloud", "true", "beta", "true", "k8s_namespace", "default", "type", "V1Service"); DefaultKubernetesServiceInstance serviceADefaultNamespace = new DefaultKubernetesServiceInstance("0", - "service-a", "service-a.default.svc.cluster.local", 80, metadata, false); + "service-a", "service-a.default.svc.cluster.local", 80, metadata, false, null, null, Map.of()); DefaultKubernetesServiceInstance serviceATestNamespace = new DefaultKubernetesServiceInstance("1", "service-a", - "service-a.test.svc.cluster.local", 80, Map.of("k8s_namespace", "test", "type", "V1Service"), false); + "service-a.test.svc.cluster.local", 80, Map.of("k8s_namespace", "test", "type", "V1Service"), false, + null, null, Map.of()); List services = new ArrayList<>(); services.add(serviceADefaultNamespace); services.add(serviceATestNamespace); @@ -263,9 +264,10 @@ void selectiveNamespacesTest(CapturedOutput output) { Map metadata = Map.of("org.springframework.cloud", "true", "beta", "true", "k8s_namespace", "default", "type", "V1Service"); DefaultKubernetesServiceInstance serviceADefaultNamespace = new DefaultKubernetesServiceInstance("0", - "service-a", "service-a.default.svc.cluster.local", 80, metadata, false); + "service-a", "service-a.default.svc.cluster.local", 80, metadata, false, null, null, Map.of()); DefaultKubernetesServiceInstance serviceATestNamespace = new DefaultKubernetesServiceInstance("1", "service-a", - "service-a.test.svc.cluster.local", 80, Map.of("k8s_namespace", "test", "type", "V1Service"), false); + "service-a.test.svc.cluster.local", 80, Map.of("k8s_namespace", "test", "type", "V1Service"), false, + null, null, Map.of()); List services = new ArrayList<>(); services.add(serviceADefaultNamespace); services.add(serviceATestNamespace); diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/DefaultKubernetesServiceInstance.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/DefaultKubernetesServiceInstance.java index d1ff834ff8..1e4af72222 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/DefaultKubernetesServiceInstance.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/DefaultKubernetesServiceInstance.java @@ -38,24 +38,6 @@ public record DefaultKubernetesServiceInstance(String instanceId, String service Map metadata, boolean secure, String namespace, String cluster, Map> podMetadata) implements KubernetesServiceInstance { - /** - * @param instanceId the id of the instance. - * @param serviceId the id of the service. - * @param host the address where the service instance can be found. - * @param port the port on which the service is running. - * @param metadata a map containing metadata. - * @param secure indicates whether the connection needs to be secure. - */ - public DefaultKubernetesServiceInstance(String instanceId, String serviceId, String host, int port, - Map metadata, boolean secure) { - this(instanceId, serviceId, host, port, metadata, secure, null, null, Map.of()); - } - - public DefaultKubernetesServiceInstance(String instanceId, String serviceId, String host, int port, - Map metadata, boolean secure, String namespace, String cluster) { - this(instanceId, serviceId, host, port, metadata, secure, namespace, cluster, Map.of()); - } - @Override public String getInstanceId() { return this.instanceId; diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesServiceInstanceTests.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesServiceInstanceTests.java index be13be952b..5958becad1 100644 --- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesServiceInstanceTests.java +++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesServiceInstanceTests.java @@ -32,7 +32,7 @@ class KubernetesServiceInstanceTests { @Test void testFirstConstructor() { DefaultKubernetesServiceInstance instance = new DefaultKubernetesServiceInstance("instanceId", "serviceId", - "host", 8080, Map.of("k8s_namespace", "spring-k8s"), true); + "host", 8080, Map.of("k8s_namespace", "spring-k8s"), true, null, null, Map.of()); assertThat(instance.getInstanceId()).isEqualTo("instanceId"); assertThat(instance.getServiceId()).isEqualTo("serviceId"); @@ -50,7 +50,7 @@ void testFirstConstructor() { @Test void testSecondConstructor() { DefaultKubernetesServiceInstance instance = new DefaultKubernetesServiceInstance("instanceId", "serviceId", - "host", 8080, Map.of("a", "b"), true, "spring-k8s", "cluster"); + "host", 8080, Map.of("a", "b"), true, "spring-k8s", "cluster", Map.of()); assertThat(instance.getInstanceId()).isEqualTo("instanceId"); assertThat(instance.getServiceId()).isEqualTo("serviceId"); @@ -97,7 +97,7 @@ void schemeIsHttps() { private DefaultKubernetesServiceInstance assertServiceInstance(boolean secure) { DefaultKubernetesServiceInstance instance = new DefaultKubernetesServiceInstance("123", "myservice", "1.2.3.4", - 8080, Collections.emptyMap(), secure); + 8080, Collections.emptyMap(), secure, null, null, Map.of()); assertThat(instance.getInstanceId()).isEqualTo("123"); assertThat(instance.getServiceId()).isEqualTo("myservice"); diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedConfigMapWatchChangeDetectorTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedConfigMapWatchChangeDetectorTests.java index 65c0f1464a..103838f4e3 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedConfigMapWatchChangeDetectorTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedConfigMapWatchChangeDetectorTests.java @@ -225,7 +225,7 @@ threadPoolTaskExecutor, new HttpRefreshTrigger(reactiveDiscoveryClient, fooEndpointPort.setPort(port); List instances = new ArrayList<>(); DefaultKubernetesServiceInstance fooServiceInstance = new DefaultKubernetesServiceInstance("foo", "foo", - fooEndpointAddress.getIp(), fooEndpointPort.getPort(), metadata, false); + fooEndpointAddress.getIp(), fooEndpointPort.getPort(), metadata, false, null, null, Map.of()); instances.add(fooServiceInstance); return instances; } @@ -240,7 +240,7 @@ private void stubReactiveCall() { List instances = new ArrayList<>(); DefaultKubernetesServiceInstance fooServiceInstance = new DefaultKubernetesServiceInstance("foo", "foo", - fooEndpointAddress.getIp(), fooEndpointPort.getPort(), new HashMap<>(), false); + fooEndpointAddress.getIp(), fooEndpointPort.getPort(), new HashMap<>(), false, null, null, Map.of()); instances.add(fooServiceInstance); when(reactiveDiscoveryClient.getInstances(eq("foo"))).thenReturn(Flux.fromIterable(instances)); } diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedSecretsWatchChangeDetectorTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedSecretsWatchChangeDetectorTests.java index 04555826cb..fdc1430f9a 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedSecretsWatchChangeDetectorTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedSecretsWatchChangeDetectorTests.java @@ -204,7 +204,7 @@ void triggerSecretRefreshWithAnnotationActuatorPath(String endpoint, RefreshStra fooEndpointPort.setPort(WIRE_MOCK_SERVER.port()); List instances = new ArrayList<>(); DefaultKubernetesServiceInstance fooServiceInstance = new DefaultKubernetesServiceInstance("foo", "foo", - fooEndpointAddress.getIp(), fooEndpointPort.getPort(), metadata, false); + fooEndpointAddress.getIp(), fooEndpointPort.getPort(), metadata, false, null, null, Map.of()); instances.add(fooServiceInstance); when(reactiveDiscoveryClient.getInstances(eq("foo"))).thenReturn(Flux.fromIterable(instances)); V1Secret secret = new V1Secret(); @@ -227,7 +227,7 @@ private void stubReactiveCall() { fooEndpointPort.setPort(WIRE_MOCK_SERVER.port()); List instances = new ArrayList<>(); DefaultKubernetesServiceInstance fooServiceInstance = new DefaultKubernetesServiceInstance("foo", "foo", - fooEndpointAddress.getIp(), fooEndpointPort.getPort(), new HashMap<>(), false); + fooEndpointAddress.getIp(), fooEndpointPort.getPort(), new HashMap<>(), false, null, null, Map.of()); instances.add(fooServiceInstance); when(reactiveDiscoveryClient.getInstances(eq("foo"))).thenReturn(Flux.fromIterable(instances)); } diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerControllerTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerControllerTests.java index d94e0c698e..78cc4f8129 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerControllerTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerControllerTests.java @@ -41,19 +41,19 @@ class DiscoveryServerControllerTests { private static final DefaultKubernetesServiceInstance SERVICE_A_INSTANCE_1 = new DefaultKubernetesServiceInstance( - "serviceAInstance1", "serviceAInstance1", "2.2.2.2", 8080, Map.of(), false, "namespace1", null); + "serviceAInstance1", "serviceAInstance1", "2.2.2.2", 8080, Map.of(), false, "namespace1", null, Map.of()); private static final DefaultKubernetesServiceInstance SERVICE_A_INSTANCE_2 = new DefaultKubernetesServiceInstance( - "serviceAInstance2", "serviceAInstance2", "2.2.2.2", 8080, Map.of(), false, "namespace1", null); + "serviceAInstance2", "serviceAInstance2", "2.2.2.2", 8080, Map.of(), false, "namespace1", null, Map.of()); private static final DefaultKubernetesServiceInstance SERVICE_A_INSTANCE_3 = new DefaultKubernetesServiceInstance( - "serviceAInstance3", "serviceAInstance3", "2.2.2.2", 8080, Map.of(), false, "namespace2", null); + "serviceAInstance3", "serviceAInstance3", "2.2.2.2", 8080, Map.of(), false, "namespace2", null, Map.of()); private static final DefaultKubernetesServiceInstance SERVICE_B_INSTANCE_1 = new DefaultKubernetesServiceInstance( - "serviceBInstance1", "serviceBInstance1", "2.2.2.2", 8080, Map.of(), false, "namespace1", null); + "serviceBInstance1", "serviceBInstance1", "2.2.2.2", 8080, Map.of(), false, "namespace1", null, Map.of()); private static final DefaultKubernetesServiceInstance SERVICE_C_INSTANCE_1 = new DefaultKubernetesServiceInstance( - "serviceCInstance1", "serviceCInstance1", "2.2.2.2", 8080, Map.of(), false, "namespace2", null); + "serviceCInstance1", "serviceCInstance1", "2.2.2.2", 8080, Map.of(), false, "namespace2", null, Map.of()); private static Service serviceA; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsEndpointTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsEndpointTests.java index 97015d44ce..c9cfd49a89 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsEndpointTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsEndpointTests.java @@ -107,14 +107,14 @@ void apps() { TEST_SERVICE_A.getMetadata().getName(), TEST_ENDPOINTS_A.getSubsets().get(0).getAddresses().get(0).getIp(), TEST_ENDPOINTS_A.getSubsets().get(0).getPorts().get(0).getPort(), metadataA, false, - TEST_SERVICE_A.getMetadata().getNamespace(), null); + TEST_SERVICE_A.getMetadata().getNamespace(), null, Map.of()); DefaultKubernetesServiceInstance kubernetesServiceInstance2 = new DefaultKubernetesServiceInstance( TEST_ENDPOINTS_B.getSubsets().get(0).getAddresses().get(0).getTargetRef().getUid(), TEST_SERVICE_B.getMetadata().getName(), TEST_ENDPOINTS_B.getSubsets().get(0).getAddresses().get(0).getIp(), TEST_ENDPOINTS_B.getSubsets().get(0).getPorts().get(0).getPort(), metadataB, false, - TEST_SERVICE_B.getMetadata().getNamespace(), null); + TEST_SERVICE_B.getMetadata().getNamespace(), null, Map.of()); webTestClient.get() .uri("/apps") diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsNameEndpointTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsNameEndpointTests.java index 57e823ee30..7ac0ee2559 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsNameEndpointTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsNameEndpointTests.java @@ -95,7 +95,7 @@ void appsName() { TEST_ENDPOINTS.getSubsets().get(0).getAddresses().get(0).getTargetRef().getUid(), TEST_SERVICE.getMetadata().getName(), TEST_ENDPOINTS.getSubsets().get(0).getAddresses().get(0).getIp(), TEST_ENDPOINTS.getSubsets().get(0).getPorts().get(0).getPort(), metadata, false, - TEST_SERVICE.getMetadata().getNamespace(), null); + TEST_SERVICE.getMetadata().getNamespace(), null, Map.of()); webTestClient.get() .uri("/apps/test-svc-3") diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTests.java index 7c8e71b4c5..19033e9d7f 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTests.java @@ -95,7 +95,7 @@ void instance() { TEST_ENDPOINTS.getSubsets().get(0).getAddresses().get(0).getTargetRef().getUid(), TEST_SERVICE.getMetadata().getName(), TEST_ENDPOINTS.getSubsets().get(0).getAddresses().get(0).getIp(), TEST_ENDPOINTS.getSubsets().get(0).getPorts().get(0).getPort(), metadata, false, - TEST_SERVICE.getMetadata().getNamespace(), null); + TEST_SERVICE.getMetadata().getNamespace(), null, Map.of()); webTestClient.get() .uri("/apps/test-svc-3/uid2") .exchange() diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceInstanceMapper.java b/spring-cloud-kubernetes-fabric8-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceInstanceMapper.java index a79ad01876..f04e655c07 100644 --- a/spring-cloud-kubernetes-fabric8-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceInstanceMapper.java +++ b/spring-cloud-kubernetes-fabric8-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceInstanceMapper.java @@ -115,7 +115,7 @@ public KubernetesServiceInstance map(Service service) { boolean secure = secure(port, service); return new DefaultKubernetesServiceInstance(metadata.getUid(), metadata.getName(), host, port.getPort(), - serviceMetadata(service), secure); + serviceMetadata(service), secure, null, null, Map.of()); } Map serviceMetadata(Service service) { diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceListSupplierTests.java b/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceListSupplierTests.java index a896e323ea..bec5dce4be 100644 --- a/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceListSupplierTests.java +++ b/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceListSupplierTests.java @@ -69,7 +69,7 @@ class Fabric8ServiceListSupplierTests { @Test void testPositiveMatch() { when(mapper.map(any(Service.class))) - .thenReturn(new DefaultKubernetesServiceInstance("", "", "", 0, null, false)); + .thenReturn(new DefaultKubernetesServiceInstance("", "", "", 0, null, false, null, null, Map.of())); when(this.client.getNamespace()).thenReturn("test"); when(this.client.services()).thenReturn(this.serviceOperation); when(this.serviceOperation.inNamespace("test")).thenReturn(namespaceOperation); @@ -84,7 +84,7 @@ void testPositiveMatch() { @Test void testPositiveMatchAllNamespaces() { when(mapper.map(any(Service.class))) - .thenReturn(new DefaultKubernetesServiceInstance("", "", "", 0, null, false)); + .thenReturn(new DefaultKubernetesServiceInstance("", "", "", 0, null, false, null, null, Map.of())); when(this.client.services()).thenReturn(this.serviceOperation); when(this.serviceOperation.inAnyNamespace()).thenReturn(this.multiDeletable); when(this.multiDeletable.withField("metadata.name", "test-service")).thenReturn(this.multiDeletable);