diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientFilterMetadataTest.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientFilterMetadataTest.java index e508488e5..8d636760e 100644 --- a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientFilterMetadataTest.java +++ b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientFilterMetadataTest.java @@ -78,7 +78,7 @@ void testAllExtraMetadataDisabled() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, null, false, null, false, null); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -97,7 +97,7 @@ void testLabelsEnabled() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(true, null, false, null, false, null); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -117,7 +117,7 @@ void testLabelsEnabledWithPrefix() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(true, "l_", false, null, false, null); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -137,7 +137,7 @@ void testAnnotationsEnabled() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, null, true, null, false, null); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -157,7 +157,7 @@ void testAnnotationsEnabledWithPrefix() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, null, true, "a_", false, null); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -177,7 +177,7 @@ void testPortsEnabled() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, null, false, null, true, null); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -197,7 +197,7 @@ void testPortsEnabledWithPrefix() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, null, false, null, true, "p_"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -217,7 +217,7 @@ void testLabelsAndAnnotationsAndPortsEnabledWithPrefix() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(true, "l_", true, "a_", true, "p_"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientFilterTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientFilterTests.java index 617970ea1..49462f4e0 100644 --- a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientFilterTests.java +++ b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientFilterTests.java @@ -43,7 +43,7 @@ void testEmptyExpression(CapturedOutput output) { String spelFilter = null; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, false, Set.of(), true, 60L, - false, spelFilter, Set.of(), Map.of(), null, null, 0, false); + false, spelFilter, Set.of(), Map.of(), null, null, 0, false, false, null); Predicate predicate = KubernetesDiscoveryClientUtils.filter(properties); Assertions.assertNotNull(predicate); @@ -55,7 +55,7 @@ void testExpressionPresent(CapturedOutput output) { String spelFilter = "some"; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, false, Set.of(), true, 60L, - false, spelFilter, Set.of(), Map.of(), null, null, 0, false); + false, spelFilter, Set.of(), Map.of(), null, null, 0, false, false, null); Predicate predicate = KubernetesDiscoveryClientUtils.filter(properties); Assertions.assertNotNull(predicate); @@ -68,7 +68,7 @@ void testTwoServicesBothMatch() { #root.metadata.namespace matches "^.+A$" """; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, false, Set.of(), true, 60L, - false, spelFilter, Set.of(), Map.of(), null, null, 0, false); + false, spelFilter, Set.of(), Map.of(), null, null, 0, false, false, null); V1Service a = new V1ServiceBuilder().withNewMetadata().withNamespace("namespace-A").withName("a").and().build(); @@ -90,7 +90,7 @@ void testTwoServicesNoneMatch() { #root.metadata.namespace matches "^.+A$" """; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, false, Set.of(), true, 60L, - false, spelFilter, Set.of(), Map.of(), null, null, 0, false); + false, spelFilter, Set.of(), Map.of(), null, null, 0, false, false, null); V1Service a = new V1ServiceBuilder().withNewMetadata().withNamespace("namespace-B").withName("a").and().build(); @@ -111,7 +111,7 @@ void testTwoServicesOneMatch() { #root.metadata.namespace matches "^.+A$" """; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, false, Set.of(), true, 60L, - false, spelFilter, Set.of(), Map.of(), null, null, 0, false); + false, spelFilter, Set.of(), Map.of(), null, null, 0, false, false, null); V1Service a = new V1ServiceBuilder().withNewMetadata().withNamespace("namespace-B").withName("a").and().build(); diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientServiceWithoutPortNameTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientServiceWithoutPortNameTests.java index 2766663b8..8f94b7a7f 100644 --- a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientServiceWithoutPortNameTests.java +++ b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientServiceWithoutPortNameTests.java @@ -89,7 +89,7 @@ void testDiscoveryWithoutAServicePortName() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(NAMESPACE), true, 60, false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + true, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientTests.java index 9ea92ffcd..8990e5899 100644 --- a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientTests.java +++ b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientTests.java @@ -90,7 +90,7 @@ void getInstancesShouldBeAbleToHandleEndpointsSingleAddress() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, null, false, null, false, null); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -120,7 +120,8 @@ void getInstancesShouldBeAbleToHandleEndpointsSingleAddressAndMultiplePorts() { setup(serviceId, serviceType, namespace, labels, ips, uuids, names, protocols, ports, appProtocols); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(), labels, "http_tcp", KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + false, null, Set.of(), labels, "http_tcp", KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, + false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -154,7 +155,7 @@ void getInstancesShouldBeAbleToHandleEndpointsMultipleAddresses() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, null, false, null, true, "port."); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(443, 8443), labels, null, metadata, 0, true); + false, null, Set.of(443, 8443), labels, null, metadata, 0, true, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -190,7 +191,8 @@ void getInstancesShouldBeAbleToHandleEndpointsFromMultipleNamespaces() { setup(serviceId, serviceType, namespace, labels, ips, uuids, names, protocols, ports, appProtocols); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, false, + null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -230,7 +232,8 @@ void instanceWithoutSubsetsShouldBeSkipped() { servicesCache.add(service); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, false, + null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -255,8 +258,8 @@ void getInstancesShouldBeAbleToHandleEndpointsSingleAddressAndMultiplePortsUsing setup(serviceId, serviceType, namespace, labels, ips, uuids, names, protocols, ports, appProtocols); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, + false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -287,8 +290,8 @@ void instanceWithMultiplePortsAndMisconfiguredPrimaryPortNameInLabelWithoutFallb setup(serviceId, serviceType, namespace, labels, ips, uuids, names, protocols, ports, appProtocols); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, + false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -319,7 +322,7 @@ void instanceWithMultiplePortsAndMisconfiguredGenericPrimaryPortNameWithoutFallb KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, false, null, Set.of(443, 8443), Map.of(), "oops", KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + true, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -349,8 +352,8 @@ void instanceWithMultiplePortsAndWithoutPrimaryPortNameSpecifiedShouldFallBackTo setup(serviceId, serviceType, namespace, labels, ips, uuids, names, protocols, ports, appProtocols); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, + false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); @@ -412,7 +415,8 @@ void instanceWithMultiplePortsAndWithoutPrimaryPortNameSpecifiedShouldLogWarning setup(serviceId, serviceType, namespace, labels, ips, uuids, names, protocols, ports, appProtocols); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - true, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + true, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, + false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister, endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties); diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientUtilsTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientUtilsTests.java index 19e0a15e6..c1e4ff198 100644 --- a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientUtilsTests.java +++ b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientUtilsTests.java @@ -68,7 +68,7 @@ void testEmptyServiceLabelsFromProperties(CapturedOutput output) { void testEmptyServiceLabelsFromService(CapturedOutput output) { Map propertiesLabels = Map.of("key", "value"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), propertiesLabels, "", null, 0, false); + true, "", Set.of(), propertiesLabels, "", null, 0, false, false, null); V1Service service = new V1ServiceBuilder().withMetadata(new V1ObjectMeta().name("my-service")).build(); boolean result = matchesServiceLabels(service, properties); @@ -89,7 +89,7 @@ void testOne(CapturedOutput output) { Map propertiesLabels = Map.of("a", "b"); Map serviceLabels = Map.of("a", "b"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), propertiesLabels, "", null, 0, false); + true, "", Set.of(), propertiesLabels, "", null, 0, false, false, null); V1Service service = new V1ServiceBuilder() .withMetadata(new V1ObjectMeta().labels(serviceLabels).name("my-service")) .build(); @@ -113,7 +113,7 @@ void testTwo(CapturedOutput output) { Map propertiesLabels = ordered(Map.of("a", "b", "c", "d")); Map serviceLabels = Map.of("a", "b"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), propertiesLabels, "", null, 0, false); + true, "", Set.of(), propertiesLabels, "", null, 0, false, false, null); V1Service service = new V1ServiceBuilder() .withMetadata(new V1ObjectMeta().labels(serviceLabels).name("my-service")) .build(); @@ -137,7 +137,7 @@ void testThree(CapturedOutput output) { Map propertiesLabels = ordered(Map.of("a", "b", "c", "d")); Map serviceLabels = ordered(Map.of("a", "b", "c", "d")); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), propertiesLabels, "", null, 0, false); + true, "", Set.of(), propertiesLabels, "", null, 0, false, false, null); V1Service service = new V1ServiceBuilder() .withMetadata(new V1ObjectMeta().labels(serviceLabels).name("my-service")) .build(); @@ -161,7 +161,7 @@ void testFour(CapturedOutput output) { Map propertiesLabels = Map.of("a", "b"); Map serviceLabels = ordered(Map.of("a", "b", "c", "d")); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), propertiesLabels, "", null, 0, false); + true, "", Set.of(), propertiesLabels, "", null, 0, false, false, null); V1Service service = new V1ServiceBuilder() .withMetadata(new V1ObjectMeta().labels(serviceLabels).name("my-service")) .build(); @@ -244,7 +244,7 @@ void endpointSubsetPortsDataSinglePortNoName() { void testEmptyAddresses() { boolean includeNotReadyAddresses = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false, false); + includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false, false, null); V1EndpointSubset endpointSubset = new V1EndpointSubsetBuilder().build(); List addresses = KubernetesDiscoveryClientUtils.addresses(endpointSubset, properties); Assertions.assertEquals(addresses.size(), 0); @@ -260,7 +260,7 @@ void testEmptyAddresses() { void testReadyAddressesOnly() { boolean includeNotReadyAddresses = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false); + includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false, false, null); V1EndpointSubset endpointSubset = new V1EndpointSubsetBuilder() .withAddresses(new V1EndpointAddressBuilder().withHostname("one").build(), new V1EndpointAddressBuilder().withHostname("two").build()) @@ -279,7 +279,7 @@ void testReadyAddressesOnly() { void testReadyAddressesTakenNotReadyAddressesNotTaken() { boolean includeNotReadyAddresses = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false, false); + includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false, false, null); V1EndpointSubset endpointSubset = new V1EndpointSubsetBuilder() .withAddresses(new V1EndpointAddressBuilder().withHostname("one").build(), new V1EndpointAddressBuilder().withHostname("two").build()) @@ -301,7 +301,7 @@ void testReadyAddressesTakenNotReadyAddressesNotTaken() { void testBothAddressesTaken() { boolean includeNotReadyAddresses = true; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false); + includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false, false, null); V1EndpointSubset endpointSubset = new V1EndpointSubsetBuilder() .withAddresses(new V1EndpointAddressBuilder().withHostname("one").build(), new V1EndpointAddressBuilder().withHostname("two").build()) diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientTests.java index 0eefaeed8..26437a329 100644 --- a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientTests.java +++ b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientTests.java @@ -243,7 +243,7 @@ void testDiscoveryGetInstanceWithNotReadyAddressesIncludedShouldWork() { KubernetesDiscoveryProperties kubernetesDiscoveryProperties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, true, null, Set.of(), Map.of(), null, - KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient( SHARED_INFORMER_FACTORY, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties); @@ -408,7 +408,8 @@ void testBothServicesMatchesFilter() { #root.metadata.namespace matches "^.+1$" """; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, false, Set.of(), true, 60L, - false, spelFilter, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false); + false, spelFilter, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, + false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient( SHARED_INFORMER_FACTORY, serviceLister, endpointsLister, null, null, properties); @@ -431,7 +432,8 @@ void testOneServiceMatchesFilter() { // without filter, both match String spelFilter = ""; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, false, Set.of(), true, 60L, - false, spelFilter, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false); + false, spelFilter, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, + false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient( SHARED_INFORMER_FACTORY, serviceLister, endpointsLister, null, null, properties); @@ -452,7 +454,7 @@ void testOneServiceMatchesFilter() { #root.metadata.namespace matches "^.+1$" """; properties = new KubernetesDiscoveryProperties(false, false, Set.of(), true, 60L, false, spelFilter, Set.of(), - Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false); + Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false, null); discoveryClient = new KubernetesInformerDiscoveryClient(SHARED_INFORMER_FACTORY, serviceLister, endpointsLister, null, null, properties); @@ -481,7 +483,7 @@ void testServicesWithDifferentMetadataLabels() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, true, Set.of(), true, 60L, false, null, Set.of(), Map.of("shape", "round"), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, - 0, false); + 0, false, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient( SHARED_INFORMER_FACTORY, serviceLister, endpointsLister, null, null, properties); @@ -504,7 +506,7 @@ void testServicesWithSameMetadataLabels() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, true, Set.of(), true, 60L, false, null, Set.of(), Map.of("shape", "round"), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, - 0, false); + 0, false, false, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient( SHARED_INFORMER_FACTORY, serviceLister, endpointsLister, null, null, properties); @@ -539,7 +541,7 @@ void testExternalNameService() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(true, "labels-prefix-", true, "annotations-prefix-", true, "ports-prefix"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of("a", "b"), true, - 60L, false, "", Set.of(), Map.of(), "", metadata, 0, false, true); + 60L, false, "", Set.of(), Map.of(), "", metadata, 0, false, true, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient( SHARED_INFORMER_FACTORY, serviceLister, endpointsLister, null, null, properties); @@ -596,7 +598,7 @@ void testPodMetadata() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(true, "labels-prefix-", true, "annotations-prefix-", true, "ports-prefix", true, true); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of("a", "b"), - true, 60L, false, "", Set.of(), Map.of(), "", metadata, 0, false, true); + true, 60L, false, "", Set.of(), Map.of(), "", metadata, 0, false, true, null); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient( SHARED_INFORMER_FACTORY, serviceLister, endpointsLister, null, null, properties); @@ -687,7 +689,7 @@ private static V1Endpoints endpointsMultiplePortsWithoutSupportedPortNames() { private static KubernetesDiscoveryProperties properties(boolean allNamespaces, Map labels) { return new KubernetesDiscoveryProperties(false, allNamespaces, Set.of(), true, 60, false, null, Set.of(), - labels, null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + labels, null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, false, null); } } diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/catalog/KubernetesClientCatalogWatchEndpointSlicesSupportTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/catalog/KubernetesClientCatalogWatchEndpointSlicesSupportTests.java index ae3715891..d78651250 100644 --- a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/catalog/KubernetesClientCatalogWatchEndpointSlicesSupportTests.java +++ b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/catalog/KubernetesClientCatalogWatchEndpointSlicesSupportTests.java @@ -88,7 +88,7 @@ public void afterEach() { void testEndpointSlicesEnabledButNotSupported() { boolean useEndpointSlices = true; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, "", Set.of(), Map.of(), "", null, 0, useEndpointSlices); + false, "", Set.of(), Map.of(), "", null, 0, useEndpointSlices, false, null); V1APIResourceList list = new V1APIResourceListBuilder().addToResources(new V1APIResource()).build(); stubFor(get("/apis/discovery.k8s.io/v1") @@ -110,7 +110,7 @@ void testEndpointSlicesEnabledButNotSupported() { void testEndpointSlicesEnabledButNotSupportedViaApiVersions() { boolean useEndpointSlices = true; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, "", Set.of(), Map.of(), "", null, 0, useEndpointSlices); + false, "", Set.of(), Map.of(), "", null, 0, useEndpointSlices, false, null); V1APIResourceList list = new V1APIResourceListBuilder() .addToResources(new V1APIResourceBuilder().withName("not-the-one").build()) @@ -131,7 +131,7 @@ void testEndpointSlicesEnabledButNotSupportedViaApiVersions() { void testEndpointsSupport() { boolean useEndpointSlices = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, "", Set.of(), Map.of(), "", null, 0, useEndpointSlices); + false, "", Set.of(), Map.of(), "", null, 0, useEndpointSlices, false, null); KubernetesCatalogWatch watch = new KubernetesCatalogWatch(null, apiClient, properties, NAMESPACE_PROVIDER); Assertions.assertEquals(KubernetesEndpointsCatalogWatch.class, watch.stateGenerator().getClass()); @@ -145,7 +145,7 @@ void testEndpointsSupport() { void testEndpointSlicesSupport() { boolean useEndpointSlices = true; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, "", Set.of(), Map.of(), "", null, 0, useEndpointSlices); + false, "", Set.of(), Map.of(), "", null, 0, useEndpointSlices, false, null); V1APIResourceList list = new V1APIResourceListBuilder() .addToResources(new V1APIResourceBuilder().withName("endpointslices").withKind(ENDPOINT_SLICE).build()) diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/catalog/KubernetesEndpointsAndEndpointSlicesTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/catalog/KubernetesEndpointsAndEndpointSlicesTests.java index 0fa40fd93..458e5aecd 100644 --- a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/catalog/KubernetesEndpointsAndEndpointSlicesTests.java +++ b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/catalog/KubernetesEndpointsAndEndpointSlicesTests.java @@ -109,7 +109,7 @@ KubernetesCatalogWatch createWatcherInAllNamespacesWithLabels(Map n boolean allNamespaces = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60, false, "", Set.of(), labels, "", null, 0, false); + true, 60, false, "", Set.of(), labels, "", null, 0, false, false, null); KubernetesCatalogWatch watch = new KubernetesCatalogWatch(coreV1Api, apiClient, properties, NAMESPACE_PROVIDER); if (endpointSlices) { @@ -149,7 +149,7 @@ KubernetesCatalogWatch createWatcherInSpecificNamespaceWithLabels(String namespa boolean allNamespaces = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, Set.of(), - true, 60, false, "", Set.of(), labels, "", null, 0, endpointSlices); + true, 60, false, "", Set.of(), labels, "", null, 0, endpointSlices, false, null); KubernetesCatalogWatch watch = new KubernetesCatalogWatch(coreV1Api, apiClient, properties, NAMESPACE_PROVIDER); if (endpointSlices) { diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientTests.java index a41a38920..3f66a7bdd 100644 --- a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientTests.java +++ b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientTests.java @@ -89,7 +89,7 @@ void testDiscoveryGetServicesAllNamespaceShouldWork() { Lister endpointsLister = setupEndpointsLister(""); KubernetesDiscoveryProperties kubernetesDiscoveryProperties = new KubernetesDiscoveryProperties(true, true, - Set.of(), true, 60, false, null, Set.of(), Map.of(), null, null, 0, false); + Set.of(), true, 60, false, null, Set.of(), Map.of(), null, null, 0, false, false, null); KubernetesInformerReactiveDiscoveryClient discoveryClient = new KubernetesInformerReactiveDiscoveryClient( new KubernetesInformerDiscoveryClient(sharedInformerFactory, serviceLister, endpointsLister, null, null, @@ -125,7 +125,7 @@ void testDiscoveryGetInstanceAllNamespaceShouldWork() { KubernetesDiscoveryProperties kubernetesDiscoveryProperties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, - KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false); + KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false, null); KubernetesInformerReactiveDiscoveryClient discoveryClient = new KubernetesInformerReactiveDiscoveryClient( new KubernetesInformerDiscoveryClient(sharedInformerFactory, serviceLister, endpointsLister, null, null, @@ -147,7 +147,7 @@ void testDiscoveryGetInstanceOneNamespaceShouldWork() { KubernetesDiscoveryProperties kubernetesDiscoveryProperties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, - KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false); + KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false, null); KubernetesInformerReactiveDiscoveryClient discoveryClient = new KubernetesInformerReactiveDiscoveryClient( new KubernetesInformerDiscoveryClient(sharedInformerFactory, serviceLister, endpointsLister, null, null, @@ -183,7 +183,7 @@ void testAllNamespacesTwoServicesPresent() { Lister serviceLister = new Lister<>(serviceCache).namespace(NAMESPACE_ALL); KubernetesDiscoveryProperties kubernetesDiscoveryProperties = new KubernetesDiscoveryProperties(true, - allNamespaces, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, null, 0, false); + allNamespaces, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, null, 0, false, false, null); KubernetesInformerReactiveDiscoveryClient discoveryClient = new KubernetesInformerReactiveDiscoveryClient( new KubernetesInformerDiscoveryClient(sharedInformerFactory, serviceLister, endpointsLister, null, null, @@ -217,7 +217,7 @@ void testSingleNamespaceTwoServicesPresent() { Lister serviceLister = new Lister<>(serviceCache).namespace("namespace-a"); KubernetesDiscoveryProperties kubernetesDiscoveryProperties = new KubernetesDiscoveryProperties(true, - allNamespaces, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, null, 0, false); + allNamespaces, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, null, 0, false, false, null); KubernetesInformerReactiveDiscoveryClient discoveryClient = new KubernetesInformerReactiveDiscoveryClient( new KubernetesInformerDiscoveryClient(sharedInformerFactory, serviceLister, endpointsLister, null, null, @@ -267,7 +267,7 @@ void testAllNamespacesTwoEndpointsPresent() { KubernetesDiscoveryProperties kubernetesDiscoveryProperties = new KubernetesDiscoveryProperties(true, allNamespaces, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, - KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false); + KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false, null); KubernetesInformerReactiveDiscoveryClient discoveryClient = new KubernetesInformerReactiveDiscoveryClient( new KubernetesInformerDiscoveryClient(sharedInformerFactory, serviceLister, endpointsLister, null, null, @@ -318,7 +318,7 @@ void testAllSingleTwoEndpointsPresent() { KubernetesDiscoveryProperties kubernetesDiscoveryProperties = new KubernetesDiscoveryProperties(true, allNamespaces, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, - KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false); + KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false, null); KubernetesInformerReactiveDiscoveryClient discoveryClient = new KubernetesInformerReactiveDiscoveryClient( new KubernetesInformerDiscoveryClient(sharedInformerFactory, serviceLister, endpointsLister, null, null, 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 423ce00f0..d435407cf 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 @@ -137,7 +137,7 @@ void singleNamespaceTest(CapturedOutput output) { Set selectiveNamespaces = Set.of(); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(true, allNamespaces, selectiveNamespaces, true, 60, false, null, Set.of(443, 8443, 12345), Map.of(), null, - KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, false, null); KubernetesClientServicesListSupplier listSupplier = new KubernetesClientServicesListSupplier(env, mapper, discoveryProperties, coreV1Api, kubernetesNamespaceProvider); @@ -174,7 +174,7 @@ void singleNamespaceNoServicePresentTest(CapturedOutput output) { Set selectiveNamespaces = Set.of(); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(true, allNamespaces, selectiveNamespaces, true, 60, false, null, Set.of(443, 8443, 12345), Map.of(), null, - KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, false, null); KubernetesClientServicesListSupplier listSupplier = new KubernetesClientServicesListSupplier(env, mapper, discoveryProperties, coreV1Api, kubernetesNamespaceProvider); @@ -201,7 +201,7 @@ void allNamespacesTest(CapturedOutput output) { Set selectiveNamespaces = Set.of(); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(true, allNamespaces, selectiveNamespaces, true, 60, false, null, Set.of(443, 8443, 12345), Map.of(), null, - KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, false, null); CoreV1Api coreV1Api = new CoreV1Api(); KubernetesClientServiceInstanceMapper mapper = new KubernetesClientServiceInstanceMapper( @@ -238,7 +238,7 @@ void selectiveNamespacesTest(CapturedOutput output) { Set selectiveNamespaces = Set.of("default", "test", "no-service"); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(true, allNamespaces, selectiveNamespaces, true, 60, false, null, Set.of(443, 8443, 12345), Map.of(), null, - KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, false, null); CoreV1Api coreV1Api = new CoreV1Api(); KubernetesClientServiceInstanceMapper mapper = new KubernetesClientServiceInstanceMapper( diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesDiscoveryProperties.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesDiscoveryProperties.java index a07f367ae..4112dc81a 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesDiscoveryProperties.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesDiscoveryProperties.java @@ -74,29 +74,6 @@ public record KubernetesDiscoveryProperties( } - public KubernetesDiscoveryProperties(@DefaultValue("true") boolean enabled, boolean allNamespaces, - @DefaultValue Set namespaces, @DefaultValue("true") boolean waitCacheReady, - @DefaultValue("60") long cacheLoadingTimeoutSeconds, boolean includeNotReadyAddresses, String filter, - @DefaultValue({ "443", "8443" }) Set knownSecurePorts, - @DefaultValue Map serviceLabels, String primaryPortName, @DefaultValue Metadata metadata, - @DefaultValue("" + DEFAULT_ORDER) int order, boolean useEndpointSlices) { - this(enabled, allNamespaces, namespaces, waitCacheReady, cacheLoadingTimeoutSeconds, includeNotReadyAddresses, - filter, knownSecurePorts, serviceLabels, primaryPortName, metadata, order, useEndpointSlices, false, - null); - } - - public KubernetesDiscoveryProperties(@DefaultValue("true") boolean enabled, boolean allNamespaces, - @DefaultValue Set namespaces, @DefaultValue("true") boolean waitCacheReady, - @DefaultValue("60") long cacheLoadingTimeoutSeconds, boolean includeNotReadyAddresses, String filter, - @DefaultValue({ "443", "8443" }) Set knownSecurePorts, - @DefaultValue Map serviceLabels, String primaryPortName, @DefaultValue Metadata metadata, - @DefaultValue("" + DEFAULT_ORDER) int order, boolean useEndpointSlices, - boolean includeExternalNameServices) { - this(enabled, allNamespaces, namespaces, waitCacheReady, cacheLoadingTimeoutSeconds, includeNotReadyAddresses, - filter, knownSecurePorts, serviceLabels, primaryPortName, metadata, order, useEndpointSlices, - includeExternalNameServices, null); - } - /** * Default instance. */ diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/DiscoveryClientUtilsTests.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/DiscoveryClientUtilsTests.java index 4b02c4230..c049d3e0d 100644 --- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/DiscoveryClientUtilsTests.java +++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/DiscoveryClientUtilsTests.java @@ -66,7 +66,7 @@ void testServiceMetadataEmpty() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(addLabels, labelsPrefix, addAnnotations, annotationsPrefix, addPorts, portsPrefix); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), "", metadata, 0, false, false); + true, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); ServiceMetadata serviceMetadata = new ServiceMetadata("my-service", namespace, "ClusterIP", serviceLabels, serviceAnnotations); @@ -98,7 +98,7 @@ void testServiceMetadataNotEmptyNotTaken() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(addLabels, labelsPrefix, addAnnotations, annotationsPrefix, addPorts, portsPrefix); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), "", metadata, 0, false, false); + true, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); ServiceMetadata serviceMetadata = new ServiceMetadata("my-service", namespace, "ClusterIP", serviceLabels, serviceAnnotations); @@ -130,7 +130,7 @@ void testServiceMetadataAddLabelsNoPrefix(CapturedOutput output) { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(addLabels, labelsPrefix, addAnnotations, annotationsPrefix, addPorts, portsPrefix); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), "", metadata, 0, false, false); + true, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); ServiceMetadata serviceMetadata = new ServiceMetadata("my-service", namespace, "ClusterIP", serviceLabels, serviceAnnotations); @@ -166,7 +166,7 @@ void testServiceMetadataAddLabelsWithPrefix(CapturedOutput output) { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(addLabels, labelsPrefix, addAnnotations, annotationsPrefix, addPorts, portsPrefix); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), "", metadata, 0, false, false); + true, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); ServiceMetadata serviceMetadata = new ServiceMetadata("my-service", namespace, "ClusterIP", serviceLabels, serviceAnnotations); @@ -204,7 +204,7 @@ void testServiceMetadataAddAnnotationsNoPrefix(CapturedOutput output) { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(addLabels, labelsPrefix, addAnnotations, annotationsPrefix, addPorts, portsPrefix); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), "", metadata, 0, false, false); + true, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); ServiceMetadata serviceMetadata = new ServiceMetadata("my-service", namespace, "ClusterIP", serviceLabels, serviceAnnotations); @@ -239,7 +239,7 @@ void testServiceMetadataAddAnnotationsWithPrefix(CapturedOutput output) { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(addLabels, labelsPrefix, addAnnotations, annotationsPrefix, addPorts, portsPrefix); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), "", metadata, 0, false, false); + true, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); ServiceMetadata serviceMetadata = new ServiceMetadata("my-service", namespace, "ClusterIP", serviceLabels, serviceAnnotations); @@ -277,7 +277,7 @@ void testServiceMetadataAddLabelsAndAnnotationsWithPrefix(CapturedOutput output) KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(addLabels, labelsPrefix, addAnnotations, annotationsPrefix, addPorts, portsPrefix); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), "", metadata, 0, false, false); + true, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); ServiceMetadata serviceMetadata = new ServiceMetadata("my-service", namespace, "ClusterIP", serviceLabels, serviceAnnotations); @@ -325,7 +325,7 @@ void testServiceMetadataAddPortsWithoutPrefix(CapturedOutput output) { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(addLabels, labelsPrefix, addAnnotations, annotationsPrefix, addPorts, portsPrefix); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), "", metadata, 0, false, false); + true, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); ServiceMetadata serviceMetadata = new ServiceMetadata("my-service", namespace, "ClusterIP", serviceLabels, serviceAnnotations); @@ -359,7 +359,7 @@ void testServiceMetadataAddPortsWithPrefix(CapturedOutput output) { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(addLabels, labelsPrefix, addAnnotations, annotationsPrefix, addPorts, portsPrefix); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), "", metadata, 0, false, false); + true, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); ServiceMetadata serviceMetadata = new ServiceMetadata("my-service", namespace, "ClusterIP", serviceLabels, serviceAnnotations); @@ -405,7 +405,7 @@ void testPrimaryPortNameNotFound(CapturedOutput output) { void testPrimaryPortNameFoundInProperties(CapturedOutput output) { String primaryPortName = "https"; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), primaryPortName, null, 0, false); + true, "", Set.of(), Map.of(), primaryPortName, null, 0, false, false, null); Map serviceLabels = Map.of(); @@ -447,7 +447,7 @@ void testPrimaryPortNameFoundInBothPropertiesAndLabels(CapturedOutput output) { String primaryPortName = "https"; Map serviceLabels = Map.of(PRIMARY_PORT_NAME_LABEL_KEY, "http"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), primaryPortName, null, 0, false); + true, "", Set.of(), Map.of(), primaryPortName, null, 0, false, false, null); String result = primaryPortName(properties, serviceLabels, "abc"); Assertions.assertNotNull(result); @@ -545,7 +545,7 @@ void testEndpointsPortPrimaryPortNameIsPresentButNotFound(CapturedOutput output) String serviceId = "spring-k8s"; String primaryPortName = "three"; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), primaryPortName, null, 0, false); + true, "", Set.of(), Map.of(), primaryPortName, null, 0, false, false, null); LinkedHashMap endpointsPorts = new LinkedHashMap<>(); endpointsPorts.put("one", 8080); @@ -583,7 +583,7 @@ void testEndpointsPortPrimaryPortNameFound(CapturedOutput output) { String serviceId = "spring-k8s"; String primaryPortName = "two"; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), primaryPortName, null, 0, false); + true, "", Set.of(), Map.of(), primaryPortName, null, 0, false, false, null); LinkedHashMap endpointsPorts = new LinkedHashMap<>(); endpointsPorts.put("one", 8080); @@ -614,7 +614,7 @@ void testEndpointsPortPrimaryPortHttps(CapturedOutput output) { String serviceId = "spring-k8s"; String primaryPortName = "three"; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), primaryPortName, null, 0, false, false); + true, "", Set.of(), Map.of(), primaryPortName, null, 0, false, false, null); LinkedHashMap endpointsPorts = new LinkedHashMap<>(); endpointsPorts.put("one", 8080); @@ -647,7 +647,7 @@ void testEndpointsPortPrimaryPortHttp(CapturedOutput output) { String serviceId = "spring-k8s"; String primaryPortName = "three"; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - true, "", Set.of(), Map.of(), primaryPortName, null, 0, false); + true, "", Set.of(), Map.of(), primaryPortName, null, 0, false, false, null); LinkedHashMap endpointsPorts = new LinkedHashMap<>(); endpointsPorts.put("one", 8080); @@ -672,7 +672,8 @@ void testEndpointsPortPrimaryPortHttp(CapturedOutput output) { @Test void testServiceInstance() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - false, "", Set.of(), Map.of(), "", KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false); + false, "", Set.of(), Map.of(), "", KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false, + null); ServicePortSecureResolver resolver = new ServicePortSecureResolver(properties); ServicePortNameAndNumber portData = new ServicePortNameAndNumber(8080, "http"); @@ -700,7 +701,8 @@ void testServiceInstance() { void testExternalNameServiceInstance() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - false, "", Set.of(), Map.of(), "", KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false); + false, "", Set.of(), Map.of(), "", KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false, + null); ServicePortNameAndNumber portData = new ServicePortNameAndNumber(-1, "http"); ServiceMetadata forServiceInstance = new ServiceMetadata("my-service", "k8s", "ClusterIP", Map.of(), Map.of()); @@ -736,7 +738,7 @@ void testPodMetadataExternalName() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, "", false, "", false, "", addLabels, addAnnotations); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - false, "", Set.of(), Map.of(), "", metadata, 0, false, false); + false, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); Function podLabelsAndMetadata = x -> null; Map> result = podMetadata(podName, serviceMetadata, properties, @@ -757,7 +759,7 @@ void testPodMetadataNotExternalNameLabelsNorAnnotationsIncluded() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, "", false, "", false, "", addLabels, addAnnotations); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - false, "", Set.of(), Map.of(), "", metadata, 0, false, false); + false, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); Function podLabelsAndMetadata = x -> null; Map> result = podMetadata(podName, serviceMetadata, properties, @@ -783,7 +785,7 @@ void testPodMetadataNotExternalNameLabelsAndAnnotationsIncludedPodNameNull() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, "", false, "", false, "", addLabels, addAnnotations); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - false, "", Set.of(), Map.of(), "", metadata, 0, false, false); + false, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); Function podLabelsAndMetadata = x -> null; Map> result = podMetadata(podName, serviceMetadata, properties, @@ -810,7 +812,7 @@ void testPodMetadataOnlyLabelsRequestedButAreEmpty(CapturedOutput output) { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, "", false, "", false, "", addLabels, addAnnotations); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - false, "", Set.of(), Map.of(), "", metadata, 0, false, false); + false, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); PodLabelsAndAnnotations both = new PodLabelsAndAnnotations(Map.of(), Map.of("c", "d")); Function podLabelsAndMetadata = x -> both; @@ -841,7 +843,7 @@ void testPodMetadataOnlyLabelsRequestedAndAreNotEmpty(CapturedOutput output) { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, "", false, "", false, "", addLabels, addAnnotations); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - false, "", Set.of(), Map.of(), "", metadata, 0, false, false); + false, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); PodLabelsAndAnnotations both = new PodLabelsAndAnnotations(Map.of("a", "b"), Map.of("c", "d")); Function podLabelsAndMetadata = x -> both; @@ -873,7 +875,7 @@ void testPodMetadataOnlyAnnotationsRequestedButAreEmpty(CapturedOutput output) { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, "", false, "", false, "", addLabels, addAnnotations); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - false, "", Set.of(), Map.of(), "", metadata, 0, false, false); + false, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); PodLabelsAndAnnotations both = new PodLabelsAndAnnotations(Map.of("a", "b"), Map.of()); Function podLabelsAndMetadata = x -> both; @@ -904,7 +906,7 @@ void testPodMetadataOnlyAnnotationsRequestedAndAreNotEmpty(CapturedOutput output KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, "", false, "", false, "", addLabels, addAnnotations); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - false, "", Set.of(), Map.of(), "", metadata, 0, false, false); + false, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); PodLabelsAndAnnotations both = new PodLabelsAndAnnotations(Map.of("a", "b"), Map.of("c", "d")); Function podLabelsAndMetadata = x -> both; @@ -936,7 +938,7 @@ void testPodMetadataBothLabelsAndAnnotations(CapturedOutput output) { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, "", false, "", false, "", addLabels, addAnnotations); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - false, "", Set.of(), Map.of(), "", metadata, 0, false, false); + false, "", Set.of(), Map.of(), "", metadata, 0, false, false, null); PodLabelsAndAnnotations both = new PodLabelsAndAnnotations(Map.of("a", "b"), Map.of("c", "d")); Function podLabelsAndMetadata = x -> both; diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/ServicePortSecureResolverTest.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/ServicePortSecureResolverTest.java index 6a38edab0..73ddd9cfe 100644 --- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/ServicePortSecureResolverTest.java +++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/ServicePortSecureResolverTest.java @@ -56,7 +56,7 @@ class ServicePortSecureResolverTest { void testPortNumbersOnly() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, false, null, Set.of(443, 8443, 12345), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, - 0, true); + 0, true, false, null); ServicePortSecureResolver secureResolver = new ServicePortSecureResolver(properties); @@ -88,7 +88,7 @@ void testLabelsAndAnnotations() { void testNoneConditionsMet(CapturedOutput output) { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, false, null, Set.of(443, 8443, 12345), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, - 0, true); + 0, true, false, null); ServicePortSecureResolver secureResolver = new ServicePortSecureResolver(properties); ServicePortNameAndNumber portData = new ServicePortNameAndNumber(8080, "http"); Input input = new Input(portData, "dummy", Map.of(), Map.of()); @@ -101,8 +101,8 @@ void testNoneConditionsMet(CapturedOutput output) { @Test void securedLabelPresentWrongValue(CapturedOutput output) { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, + false, null); ServicePortSecureResolver secureResolver = new ServicePortSecureResolver(properties); ServicePortNameAndNumber portData = new ServicePortNameAndNumber(8080, "http"); Input input = new Input(portData, "dummy", Map.of("secured", "right"), Map.of()); @@ -115,8 +115,8 @@ void securedLabelPresentWrongValue(CapturedOutput output) { @Test void securedLabelPresentCorrectValue(CapturedOutput output) { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, + false, null); ServicePortSecureResolver secureResolver = new ServicePortSecureResolver(properties); ServicePortNameAndNumber portData = new ServicePortNameAndNumber(8080, "http"); Input input = new Input(portData, "dummy", Map.of("secured", "true"), Map.of()); @@ -130,8 +130,8 @@ void securedLabelPresentCorrectValue(CapturedOutput output) { @Test void securedAnnotationPresentWrongValue(CapturedOutput output) { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, + false, null); ServicePortSecureResolver secureResolver = new ServicePortSecureResolver(properties); ServicePortNameAndNumber portData = new ServicePortNameAndNumber(8080, "http"); Input input = new Input(portData, "dummy", Map.of(), Map.of("secured", "right")); @@ -144,8 +144,8 @@ void securedAnnotationPresentWrongValue(CapturedOutput output) { @Test void securedAnnotationPresentCorrectValue(CapturedOutput output) { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, + false, null); ServicePortSecureResolver secureResolver = new ServicePortSecureResolver(properties); ServicePortNameAndNumber portData = new ServicePortNameAndNumber(8080, "http"); Input input = new Input(portData, "dummy", Map.of(), Map.of("secured", "true")); @@ -159,7 +159,8 @@ void securedAnnotationPresentCorrectValue(CapturedOutput output) { @Test void knownPortsMatches(CapturedOutput output) { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(8080), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + false, null, Set.of(8080), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, + false, null); ServicePortSecureResolver secureResolver = new ServicePortSecureResolver(properties); ServicePortNameAndNumber portData = new ServicePortNameAndNumber(8080, "http"); Input input = new Input(portData, "dummy", Map.of(), Map.of()); @@ -173,7 +174,8 @@ void knownPortsMatches(CapturedOutput output) { @Test void noConditionsMatchButPortIsHttps(CapturedOutput output) { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(8081), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + false, null, Set.of(8081), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, + false, null); ServicePortSecureResolver secureResolver = new ServicePortSecureResolver(properties); ServicePortNameAndNumber portData = new ServicePortNameAndNumber(8080, "https"); Input input = new Input(portData, "dummy", Map.of(), Map.of()); diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryServicesAdapterTests.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryServicesAdapterTests.java index 9ed841106..88b19b038 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryServicesAdapterTests.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryServicesAdapterTests.java @@ -79,7 +79,7 @@ void testAllNamespacesWithoutLabelsWithoutFilter() { MockEnvironment environment = new MockEnvironment(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, allNamespaces, Set.of(), - true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false); + true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false, false, null); Fabric8DiscoveryServicesAdapter adapter = new Fabric8DiscoveryServicesAdapter( new KubernetesDiscoveryClientAutoConfiguration().servicesFunction(properties, environment), properties, @@ -117,7 +117,7 @@ void testAllNamespacesWithLabelsWithoutFilter() { MockEnvironment environment = new MockEnvironment(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, allNamespaces, Set.of(), - true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false); + true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false, false, null); Fabric8DiscoveryServicesAdapter adapter = new Fabric8DiscoveryServicesAdapter( new KubernetesDiscoveryClientAutoConfiguration().servicesFunction(properties, environment), properties, @@ -156,7 +156,7 @@ void testAllNamespacesWithoutLabelsWithNamespaceFilter() { MockEnvironment environment = new MockEnvironment(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, allNamespaces, Set.of(), - true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false); + true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false, false, null); Fabric8DiscoveryServicesAdapter adapter = new Fabric8DiscoveryServicesAdapter( new KubernetesDiscoveryClientAutoConfiguration().servicesFunction(properties, environment), properties, @@ -196,7 +196,7 @@ void testAllNamespacesWithoutLabelsWithNamespacesFilter() { MockEnvironment environment = new MockEnvironment(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, allNamespaces, Set.of(), - true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false); + true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false, false, null); Fabric8DiscoveryServicesAdapter adapter = new Fabric8DiscoveryServicesAdapter( new KubernetesDiscoveryClientAutoConfiguration().servicesFunction(properties, environment), properties, @@ -235,7 +235,7 @@ void testSpecificNamespaceWithoutLabelsWithoutFilter() { MockEnvironment environment = new MockEnvironment(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, allNamespaces, Set.of(), - true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false); + true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false, false, null); Fabric8DiscoveryServicesAdapter adapter = new Fabric8DiscoveryServicesAdapter( new KubernetesDiscoveryClientAutoConfiguration().servicesFunction(properties, environment), properties, @@ -277,7 +277,7 @@ void testSpecificNamespaceWithLabelsWithoutFilter() { MockEnvironment environment = new MockEnvironment(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, allNamespaces, Set.of(), - true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false); + true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false, false, null); Fabric8DiscoveryServicesAdapter adapter = new Fabric8DiscoveryServicesAdapter( new KubernetesDiscoveryClientAutoConfiguration().servicesFunction(properties, environment), properties, @@ -324,7 +324,7 @@ void testSpecificNamespaceWithoutLabelsWithFilter() { MockEnvironment environment = new MockEnvironment(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, allNamespaces, Set.of(), - true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false); + true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false, false, null); Fabric8DiscoveryServicesAdapter adapter = new Fabric8DiscoveryServicesAdapter( new KubernetesDiscoveryClientAutoConfiguration().servicesFunction(properties, environment), properties, @@ -369,7 +369,7 @@ void testSomeNamespacesWithoutLabelsWithoutFilter() { MockEnvironment environment = new MockEnvironment(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, allNamespaces, - someNamespaces, true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false); + someNamespaces, true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false, false, null); Fabric8DiscoveryServicesAdapter adapter = new Fabric8DiscoveryServicesAdapter( new KubernetesDiscoveryClientAutoConfiguration().servicesFunction(properties, environment), properties, @@ -412,7 +412,7 @@ void testSomeNamespacesWithLabelsWithoutFilter() { MockEnvironment environment = new MockEnvironment(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, allNamespaces, - someNamespaces, true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false); + someNamespaces, true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false, false, null); Fabric8DiscoveryServicesAdapter adapter = new Fabric8DiscoveryServicesAdapter( new KubernetesDiscoveryClientAutoConfiguration().servicesFunction(properties, environment), properties, @@ -454,7 +454,7 @@ void testSomeNamespacesWithLabelsWithFilter() { MockEnvironment environment = new MockEnvironment(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, allNamespaces, - someNamespaces, true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false); + someNamespaces, true, 60L, false, spelFilter, Set.of(), labels, null, null, 0, false, false, null); Fabric8DiscoveryServicesAdapter adapter = new Fabric8DiscoveryServicesAdapter( new KubernetesDiscoveryClientAutoConfiguration().servicesFunction(properties, environment), properties, diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8EndpointsAndEndpointSlicesTests.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8EndpointsAndEndpointSlicesTests.java index 4f4a55144..1335e55ec 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8EndpointsAndEndpointSlicesTests.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8EndpointsAndEndpointSlicesTests.java @@ -240,7 +240,7 @@ KubernetesCatalogWatch createWatcherInAllNamespacesWithLabels(Map n // all-namespaces = false KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, namespaces, true, 60, - false, "", Set.of(), labels, "", null, 0, false); + false, "", Set.of(), labels, "", null, 0, false, false, null); KubernetesCatalogWatch watch = new KubernetesCatalogWatch(mockClient(), properties, NAMESPACE_PROVIDER); if (endpointSlices) { diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesCatalogWatchEndpointSlicesSupportTests.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesCatalogWatchEndpointSlicesSupportTests.java index 3a965e963..0cd813d2d 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesCatalogWatchEndpointSlicesSupportTests.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesCatalogWatchEndpointSlicesSupportTests.java @@ -63,7 +63,7 @@ void beforeEach() { @Test void testEndpointSlicesEnabledButNotSupportedViaApiGroups() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, "", Set.of(), Map.of(), "", null, 0, true); + false, "", Set.of(), Map.of(), "", null, 0, true, false, null); APIGroupList groupList = new APIGroupListBuilder().build(); mockServer.expect().withPath("/apis").andReturn(200, groupList).always(); @@ -83,7 +83,7 @@ void testEndpointSlicesEnabledButNotSupportedViaApiGroups() { @Test void testEndpointSlicesEnabledButNotSupportedViaApiVersions() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, "", Set.of(), Map.of(), "", null, 0, true); + false, "", Set.of(), Map.of(), "", null, 0, true, false, null); GroupVersionForDiscovery forDiscovery = new GroupVersionForDiscoveryBuilder() .withGroupVersion("discovery.k8s.io/v1") @@ -107,7 +107,7 @@ void testEndpointSlicesEnabledButNotSupportedViaApiVersions() { @Test void testEndpointsSupport() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, "", Set.of(), Map.of(), "", null, 0, false); + false, "", Set.of(), Map.of(), "", null, 0, false, false, null); KubernetesCatalogWatch watch = new KubernetesCatalogWatch(mockClient, properties, NAMESPACE_PROVIDER); Assertions.assertEquals(Fabric8EndpointsCatalogWatch.class, watch.stateGenerator().getClass()); @@ -120,7 +120,7 @@ void testEndpointsSupport() { @Test void testEndpointSlicesSupport() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, "", Set.of(), Map.of(), "", null, 0, true); + false, "", Set.of(), Map.of(), "", null, 0, true, false, null); KubernetesCatalogWatch watch = new KubernetesCatalogWatch(mockClient, properties, NAMESPACE_PROVIDER); GroupVersionForDiscovery forDiscovery = new GroupVersionForDiscoveryBuilder() diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientServiceWithoutPortNameTests.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientServiceWithoutPortNameTests.java index 38424e88d..fd603b664 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientServiceWithoutPortNameTests.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientServiceWithoutPortNameTests.java @@ -68,7 +68,7 @@ void testDiscoveryWithoutAServicePortName() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(NAMESPACE), true, 60, false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + true, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, a -> null); List serviceInstances = discoveryClient.getInstances("no-port-name-service"); diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTest.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTest.java index 1c6cdf14a..eb9c27606 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTest.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTest.java @@ -145,7 +145,7 @@ void getInstancesShouldBeAbleToHandleEndpointsSingleAddressAndMultiplePorts() { mockClient.services().inNamespace("test").resource(service).create(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(), labels, "http_tcp", Metadata.DEFAULT, 0, true); + false, null, Set.of(), labels, "http_tcp", Metadata.DEFAULT, 0, true, false, null); DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, KubernetesClient::services, null, new ServicePortSecureResolver(properties)); @@ -232,7 +232,8 @@ void getEndPointsListTestAllNamespaces() { mockClient.services().inNamespace(namespace2).resource(service2).create(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false); + false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false, + null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, KubernetesClient::services, x -> true, new ServicePortSecureResolver(properties)); @@ -290,7 +291,7 @@ void getEndPointsListShouldHandleNamespaces() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(namespace1, namespace3), true, 60, false, null, Set.of(), Map.of(), null, - KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false); + KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, KubernetesClient::services, null, new ServicePortSecureResolver(properties)); @@ -342,7 +343,7 @@ void getInstancesShouldBeAbleToHandleEndpointsMultipleAddresses() { Metadata metadata = new Metadata(false, null, false, null, true, "port."); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(443, 8443), labels, null, metadata, 0, true); + false, null, Set.of(443, 8443), labels, null, metadata, 0, true, false, null); DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, KubernetesClient::services, null, new ServicePortSecureResolver(properties)); @@ -455,7 +456,7 @@ void getServicesShouldReturnServicesInNamespaces() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(nameSpace1, nameSpace2), true, 60, false, null, Set.of(), Map.of(), null, - KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false); + KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false, null); DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, KubernetesClient::services, null, new ServicePortSecureResolver(properties)); @@ -520,7 +521,7 @@ void getInstancesShouldBeAbleToHandleEndpointsFromMultipleNamespaces() { mockClient.services().inNamespace("test2").resource(service2).create(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, Metadata.DEFAULT, 0, true); + false, null, Set.of(), Map.of(), null, Metadata.DEFAULT, 0, true, false, null); DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, KubernetesClient::services, null, new ServicePortSecureResolver(properties)); @@ -597,7 +598,7 @@ void getInstancesShouldBeAbleToHandleEndpointsSingleAddressAndMultiplePortsUsing mockClient.services().inNamespace("test").resource(service).create(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(443, 8443), Map.of(), null, Metadata.DEFAULT, 0, true); + false, null, Set.of(443, 8443), Map.of(), null, Metadata.DEFAULT, 0, true, false, null); DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, KubernetesClient::services, null, new ServicePortSecureResolver(properties)); @@ -650,7 +651,7 @@ void instanceWithMultiplePortsAndMisconfiguredPrimaryPortNameInLabelWithoutFallb mockClient.services().inNamespace("test").resource(service).create(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(443, 8443), Map.of(), null, Metadata.DEFAULT, 0, true); + false, null, Set.of(443, 8443), Map.of(), null, Metadata.DEFAULT, 0, true, false, null); DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, KubernetesClient::services, null, new ServicePortSecureResolver(properties)); @@ -702,7 +703,7 @@ void instanceWithMultiplePortsAndMisconfiguredGenericPrimaryPortNameWithoutFallb mockClient.services().inNamespace("test").resource(service).create(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(443, 8443), Map.of(), "oops", Metadata.DEFAULT, 0, true); + false, null, Set.of(443, 8443), Map.of(), "oops", Metadata.DEFAULT, 0, true, false, null); DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, KubernetesClient::services, null, new ServicePortSecureResolver(properties)); @@ -752,7 +753,7 @@ void instanceWithMultiplePortsAndWithoutPrimaryPortNameSpecifiedShouldFallBackTo mockClient.services().inNamespace("test").resource(service).create(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(443, 8443), Map.of(), null, Metadata.DEFAULT, 0, true); + false, null, Set.of(443, 8443), Map.of(), null, Metadata.DEFAULT, 0, true, false, null); DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, KubernetesClient::services, null, new ServicePortSecureResolver(properties)); @@ -853,7 +854,7 @@ void instanceWithMultiplePortsAndWithoutPrimaryPortNameSpecifiedShouldLogWarning mockClient.services().inNamespace("test").resource(service).create(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - true, null, Set.of(443, 8443), Map.of(), null, Metadata.DEFAULT, 0, true); + true, null, Set.of(443, 8443), Map.of(), null, Metadata.DEFAULT, 0, true, false, null); DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, KubernetesClient::services, null, new ServicePortSecureResolver(properties)); diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTests.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTests.java index 41aee5673..bf09a2311 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTests.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTests.java @@ -73,7 +73,7 @@ void testAllNamespacesEmpty(CapturedOutput output) { Set namespaces = Set.of(); Map serviceLabels = Map.of(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("serviceId"); @@ -99,7 +99,7 @@ void testAllNamespacesSingleEndpointsMatchExactLabels(CapturedOutput output) { Set namespaces = Set.of(); Map serviceLabels = Map.of("color", "blue"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("blue-service"); @@ -125,7 +125,7 @@ void testAllNamespacesSingleEndpointsMatchPartialLabels(CapturedOutput output) { Set namespaces = Set.of(); Map serviceLabels = Map.of("color", "blue"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("blue-service"); @@ -150,7 +150,7 @@ void testAllNamespacesSingleEndpointsNameMatchesLabelsDont(CapturedOutput output Set namespaces = Set.of(); Map serviceLabels = Map.of("color", "blue"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("blue-service"); @@ -179,7 +179,7 @@ void testAllNamespacesTwoEndpointsOneMatches(CapturedOutput output) { Set namespaces = Set.of(); Map serviceLabels = Map.of("color", "blue"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("service-one"); @@ -208,7 +208,7 @@ void testAllNamespacesTwoEndpointsInDifferentNamespaces(CapturedOutput output) { Set namespaces = Set.of(); Map serviceLabels = Map.of("color", "blue"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("service-one"); @@ -232,7 +232,7 @@ void testClientNamespaceEmpty(CapturedOutput output) { Set namespaces = Set.of(); Map serviceLabels = Map.of(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("serviceId"); @@ -258,7 +258,7 @@ void testClientNamespaceSingleEndpointsMatchExactLabels(CapturedOutput output) { Set namespaces = Set.of(); Map serviceLabels = Map.of("color", "blue"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("blue-service"); @@ -284,7 +284,7 @@ void testClientNamespaceSingleEndpointsMatchPartialLabels(CapturedOutput output) Set namespaces = Set.of(); Map serviceLabels = Map.of("color", "blue"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("blue-service"); @@ -309,7 +309,7 @@ void testClientNamespaceSingleEndpointsNameMatchesLabelsDont(CapturedOutput outp Set namespaces = Set.of(); Map serviceLabels = Map.of("color", "blue"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("blue-service"); @@ -338,7 +338,7 @@ void testClientNamespaceTwoEndpointsOneMatches(CapturedOutput output) { Set namespaces = Set.of(); Map serviceLabels = Map.of("color", "blue"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("service-one"); @@ -367,7 +367,7 @@ void testClientNamespaceTwoEndpointsInDifferentNamespaces(CapturedOutput output) Set namespaces = Set.of(); Map serviceLabels = Map.of("color", "blue"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("service-one"); @@ -391,7 +391,7 @@ void testSelectiveNamespacesEmpty(CapturedOutput output) { Set namespaces = Set.of("test"); Map serviceLabels = Map.of(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("serviceId"); @@ -417,7 +417,7 @@ void testSelectiveNamespacesSingleEndpointsMatchExactLabels(CapturedOutput outpu Set namespaces = Set.of("test"); Map serviceLabels = Map.of("color", "blue"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, x -> true, null); @@ -448,7 +448,7 @@ void testSelectiveNamespacesMultipleNamespacesSingleMatch(CapturedOutput output) Set namespaces = Set.of("a"); Map serviceLabels = Map.of("color", "blue"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("blue-service"); @@ -481,7 +481,7 @@ void testSelectiveNamespacesMultipleNamespacesAllMatch(CapturedOutput output) { String namespacesAsString = namespaces.toString(); Map serviceLabels = Map.of("color", "blue"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, namespaces, - true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false); + true, 60L, false, "", Set.of(), serviceLabels, "", null, 0, false, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getEndPointsList("blue-service"); @@ -517,7 +517,8 @@ void testGetServicesWithExternalNameService() { // last argument is irrelevant, as getServices does not care about that flag KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of("a", "b"), true, - 60L, false, "", Set.of(), Map.of(), "", KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false); + 60L, false, "", Set.of(), Map.of(), "", KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false, + null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getServices(); @@ -541,7 +542,7 @@ void testExternalNameService() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(true, "labels-prefix-", true, "annotations-prefix-", true, "ports-prefix"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of("a", "b"), true, - 60L, false, "", Set.of(), Map.of(), "", metadata, 0, false, true); + 60L, false, "", Set.of(), Map.of(), "", metadata, 0, false, true, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getInstances("blue-service"); @@ -591,7 +592,7 @@ void testPodMetadata() { KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(true, "labels-prefix-", true, "annotations-prefix-", true, "ports-prefix", true, true); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of("a", "b"), true, - 60L, false, "", Set.of(), Map.of(), "", metadata, 0, false, true); + 60L, false, "", Set.of(), Map.of(), "", metadata, 0, false, true, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null); List result = discoveryClient.getInstances("blue-service"); diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientUtilsFilterTests.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientUtilsFilterTests.java index d8f2796e1..3bcb4e317 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientUtilsFilterTests.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientUtilsFilterTests.java @@ -44,7 +44,7 @@ class Fabric8KubernetesDiscoveryClientUtilsFilterTests { private static KubernetesClient client; private static final KubernetesDiscoveryProperties PROPERTIES = new KubernetesDiscoveryProperties(true, true, - Set.of(), false, 60L, false, "some", Set.of(), Map.of(), "", null, 0, false); + Set.of(), false, 60L, false, "some", Set.of(), Map.of(), "", null, 0, false, false, null); @AfterEach void afterEach() { diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientUtilsTests.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientUtilsTests.java index 30e0ae52b..a658f9dd2 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientUtilsTests.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientUtilsTests.java @@ -64,7 +64,7 @@ void afterEach() { void testServicesAllNamespacesNoFilters() { boolean allNamespaces = true; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, Set.of(), - true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false); + true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false, false, null); service("serviceA", "A", Map.of()); service("serviceB", "B", Map.of()); @@ -86,7 +86,7 @@ void testServicesAllNamespacesNoFilters() { void testServicesAllNamespacesNameFilter() { boolean allNamespaces = true; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, Set.of(), - true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false); + true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false, false, null); service("serviceA", "A", Map.of()); service("serviceB", "B", Map.of()); @@ -108,7 +108,7 @@ void testServicesAllNamespacesNameFilter() { void testServicesAllNamespacesPredicateFilter() { boolean allNamespaces = true; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, Set.of(), - true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false); + true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false, false, null); service("serviceA", "A", Map.of("letter", "a")); service("serviceB", "B", Map.of("letter", "b")); @@ -132,7 +132,7 @@ void testServicesAllNamespacesPredicateFilter() { void testServicesSelectiveNamespacesNoFilters() { boolean allNamespaces = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, - Set.of("A", "B"), true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false); + Set.of("A", "B"), true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false, false, null); service("serviceA", "A", Map.of()); service("serviceB", "B", Map.of()); service("serviceC", "C", Map.of()); @@ -157,7 +157,7 @@ void testServicesSelectiveNamespacesNoFilters() { void testServicesSelectiveNamespacesNameFilter() { boolean allNamespaces = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, - Set.of("A", "B"), true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false); + Set.of("A", "B"), true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false, false, null); service("serviceA", "A", Map.of()); service("serviceB", "B", Map.of()); service("serviceC", "C", Map.of()); @@ -182,7 +182,7 @@ void testServicesSelectiveNamespacesNameFilter() { void testServicesSelectiveNamespacesPredicateFilter() { boolean allNamespaces = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, - Set.of("A", "B"), true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false); + Set.of("A", "B"), true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false, false, null); service("serviceA", "A", Map.of("letter", "a")); service("serviceB", "B", Map.of("letter", "b")); service("serviceC", "C", Map.of("letter", "c")); @@ -208,7 +208,7 @@ void testServicesSelectiveNamespacesPredicateFilter() { void testServicesNamespaceProviderNoFilters() { boolean allNamespaces = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, Set.of(), - true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false); + true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false, false, null); service("serviceA", "A", Map.of()); service("serviceB", "B", Map.of()); service("serviceC", "C", Map.of()); @@ -233,7 +233,7 @@ void testServicesNamespaceProviderNoFilters() { void testServicesNamespaceProviderNameFilter() { boolean allNamespaces = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, Set.of(), - true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false); + true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false, false, null); service("serviceA", "A", Map.of()); service("serviceB", "A", Map.of()); @@ -257,7 +257,7 @@ void testServicesNamespaceProviderNameFilter() { void testServicesNamespaceProviderPredicateFilter() { boolean allNamespaces = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, Set.of(), - true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false); + true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false, false, null); service("serviceA", "A", Map.of("letter", "a")); service("serviceB", "A", Map.of("letter", "b")); @@ -279,7 +279,7 @@ void testExternalName() { boolean allNamespaces = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, allNamespaces, Set.of(), - true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false); + true, 60L, false, "", Set.of(), Map.of(), "", null, 0, false, false, null); List result = services(properties, client, namespaceProvider("test"), x -> x.getSpec().getType().equals("ExternalName"), Map.of(), "fabric8-discovery"); diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesCatalogWatchTest.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesCatalogWatchTest.java index aebc17707..f376182b5 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesCatalogWatchTest.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesCatalogWatchTest.java @@ -403,7 +403,7 @@ private void createInAllNamespaceWatcher() { // all-namespaces = true KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, "", Set.of(), Map.of(), "", null, 0, false); + false, "", Set.of(), Map.of(), "", null, 0, false, false, null); kubernetesCatalogWatch = new KubernetesCatalogWatch(CLIENT, properties, namespaceProvider); kubernetesCatalogWatch.setApplicationEventPublisher(APPLICATION_EVENT_PUBLISHER); @@ -422,7 +422,7 @@ private void createInSpecificNamespaceWatcher() { // all-namespaces = false KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, "", Set.of(), Map.of(), "", null, 0, false); + false, "", Set.of(), Map.of(), "", null, 0, false, false, null); kubernetesCatalogWatch = new KubernetesCatalogWatch(CLIENT, properties, namespaceProvider); kubernetesCatalogWatch.setApplicationEventPublisher(APPLICATION_EVENT_PUBLISHER); diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterMetadataTest.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterMetadataTest.java index ad8d2c84b..57f530791 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterMetadataTest.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterMetadataTest.java @@ -83,7 +83,7 @@ void testAllExtraMetadataDisabled() { Metadata metadata = new Metadata(false, null, false, null, false, null); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(CLIENT, properties, a -> null); discoveryClient.setEnvironment(withClientNamespace()); @@ -102,7 +102,7 @@ void testLabelsEnabled() { Metadata metadata = new Metadata(true, null, false, null, false, null); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(CLIENT, properties, a -> null); discoveryClient.setEnvironment(withClientNamespace()); @@ -122,7 +122,7 @@ void testLabelsEnabledWithPrefix() { Metadata metadata = new Metadata(true, "l_", false, null, false, null); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(CLIENT, properties, a -> null); discoveryClient.setEnvironment(withClientNamespace()); @@ -142,7 +142,7 @@ void testAnnotationsEnabled() { Metadata metadata = new Metadata(false, null, true, null, false, null); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(CLIENT, properties, a -> null); discoveryClient.setEnvironment(withClientNamespace()); @@ -162,7 +162,7 @@ void testAnnotationsEnabledWithPrefix() { Metadata metadata = new Metadata(false, null, true, "a_", false, null); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(CLIENT, properties, a -> null); discoveryClient.setEnvironment(withClientNamespace()); @@ -182,7 +182,7 @@ void testPortsEnabled() { Metadata metadata = new Metadata(false, null, false, null, true, null); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(CLIENT, properties, a -> null); discoveryClient.setEnvironment(withClientNamespace()); @@ -202,7 +202,7 @@ void testPortsEnabledWithPrefix() { Metadata metadata = new Metadata(false, null, false, null, true, "p_"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(CLIENT, properties, a -> null); discoveryClient.setEnvironment(withClientNamespace()); @@ -222,7 +222,7 @@ void testLabelsAndAnnotationsAndPortsEnabledWithPrefix() { Metadata metadata = new Metadata(true, "l_", true, "a_", true, "p_"); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, null, Set.of(), Map.of(), null, metadata, 0, true); + false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null); KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(CLIENT, properties, a -> null); discoveryClient.setEnvironment(withClientNamespace()); diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterTest.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterTest.java index a004aabdb..1a2719860 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterTest.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterTest.java @@ -64,7 +64,7 @@ void testFilteredServices() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, false, "metadata.additionalProperties['spring-boot']", Set.of(), Map.of(), null, - KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, false, null); KubernetesDiscoveryClient client = new KubernetesDiscoveryClient(this.kubernetesClient, properties, this.kubernetesClientServicesFunction); @@ -92,7 +92,7 @@ void testFilteredServicesByPrefix() { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, false, "metadata.name.startsWith('service')", Set.of(), Map.of(), null, - KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, false, null); KubernetesDiscoveryClient client = new KubernetesDiscoveryClient(this.kubernetesClient, properties, this.kubernetesClientServicesFunction); @@ -112,7 +112,8 @@ void testNoExpression() { when(this.kubernetesClient.services()).thenReturn(this.serviceOperation); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, - false, "", Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true); + false, "", Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, false, + null); KubernetesDiscoveryClient client = new KubernetesDiscoveryClient(this.kubernetesClient, properties, this.kubernetesClientServicesFunction); diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientUtilsTests.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientUtilsTests.java index b84acb9b6..b386e2e06 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientUtilsTests.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientUtilsTests.java @@ -44,7 +44,7 @@ class KubernetesDiscoveryClientUtilsTests { void testEmptyAddresses() { boolean includeNotReadyAddresses = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false, false); + includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false, false, null); EndpointSubset endpointSubset = new EndpointSubsetBuilder().build(); List addresses = Fabric8KubernetesDiscoveryClientUtils.addresses(endpointSubset, properties); Assertions.assertEquals(addresses.size(), 0); @@ -60,7 +60,7 @@ void testEmptyAddresses() { void testReadyAddressesOnly() { boolean includeNotReadyAddresses = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false); + includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false, false, null); EndpointSubset endpointSubset = new EndpointSubsetBuilder() .withAddresses(new EndpointAddressBuilder().withHostname("one").build(), new EndpointAddressBuilder().withHostname("two").build()) @@ -79,7 +79,7 @@ void testReadyAddressesOnly() { void testReadyAddressesTakenNotReadyAddressesNotTaken() { boolean includeNotReadyAddresses = false; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false, false); + includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false, false, null); EndpointSubset endpointSubset = new EndpointSubsetBuilder() .withAddresses(new EndpointAddressBuilder().withHostname("one").build(), new EndpointAddressBuilder().withHostname("two").build()) @@ -101,7 +101,7 @@ void testReadyAddressesTakenNotReadyAddressesNotTaken() { void testBothAddressesTaken() { boolean includeNotReadyAddresses = true; KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60L, - includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false); + includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false, false, null); EndpointSubset endpointSubset = new EndpointSubsetBuilder() .withAddresses(new EndpointAddressBuilder().withHostname("one").build(), new EndpointAddressBuilder().withHostname("two").build()) diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/reactive/KubernetesReactiveDiscoveryClientTests.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/reactive/KubernetesReactiveDiscoveryClientTests.java index f2241b1e4..c08bf43ac 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/reactive/KubernetesReactiveDiscoveryClientTests.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/reactive/KubernetesReactiveDiscoveryClientTests.java @@ -397,7 +397,7 @@ void shouldReturnFluxOfServicesAcrossAllNamespaces() { .once(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, - false, null, Set.of(), Map.of(), "https_tcp", Metadata.DEFAULT, 0, true); + false, null, Set.of(), Map.of(), "https_tcp", Metadata.DEFAULT, 0, true, false, null); ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient(kubernetesClient, properties, KubernetesClient::services); Flux instances = client.getInstances("existing-service"); diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceInstanceMapperTests.java b/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceInstanceMapperTests.java index 8bc939412..b8450285e 100644 --- a/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceInstanceMapperTests.java +++ b/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceInstanceMapperTests.java @@ -90,7 +90,7 @@ void testMapperSecureNullLabelsAndAnnotations() { KubernetesLoadBalancerProperties properties = new KubernetesLoadBalancerProperties(); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, false, null, Set.of(443, 8443), Map.of(), null, - KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false); + KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false, null); List ports = new ArrayList<>(); ports.add(new ServicePortBuilder().withPort(443).build()); Service service = buildService("test", "test-namespace", "abc", ports, null, null); @@ -123,7 +123,7 @@ void serviceMetadataTest() { KubernetesLoadBalancerProperties loadBalancerProperties = new KubernetesLoadBalancerProperties(); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + true, false, null); List ports = new ArrayList<>(); ports.add(new ServicePortBuilder().withPort(443).build()); @@ -151,7 +151,7 @@ void testMapEmptyPorts(CapturedOutput output) { KubernetesLoadBalancerProperties loadBalancerProperties = new KubernetesLoadBalancerProperties(); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + true, false, null); List ports = List.of(); Service service = buildService("test", "test-namespace", "abc", ports, Map.of(), Map.of()); @@ -176,7 +176,7 @@ void testSinglePortsMatchesProperty(CapturedOutput output) { loadBalancerProperties.setPortName("my-port-name"); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + true, false, null); List ports = List.of(new ServicePortBuilder().withPort(8080).withName("my-port-name").build()); Service service = buildService("test", "test-namespace", "abc", ports, Map.of(), Map.of()); @@ -205,7 +205,7 @@ void testSinglePortDoesNotMatchProperty(CapturedOutput output) { loadBalancerProperties.setPortName("my-different-port-name"); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + true, false, null); List ports = List.of(new ServicePortBuilder().withPort(8080).withName("my-port-name").build()); Service service = buildService("test", "test-namespace", "abc", ports, Map.of(), Map.of()); @@ -231,7 +231,7 @@ void testMultiplePortsWithoutPortNameProperty(CapturedOutput output) { loadBalancerProperties.setPortName(""); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + true, false, null); List ports = List.of(new ServicePortBuilder().withPort(8080).withName("one").build(), new ServicePortBuilder().withPort(8081).withName("two").build()); @@ -256,7 +256,7 @@ void testMultiplePortsWithPortNamePropertyMatch(CapturedOutput output) { loadBalancerProperties.setPortName("one"); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + true, false, null); List ports = List.of(new ServicePortBuilder().withPort(8080).withName("one").build(), new ServicePortBuilder().withPort(8081).withName("two").build()); @@ -281,7 +281,7 @@ void testMultiplePortsWithPortNamePropertyNoMatch(CapturedOutput output) { loadBalancerProperties.setPortName("three"); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - true); + true, false, null); List ports = List.of(new ServicePortBuilder().withPort(8080).withName("one").build(), new ServicePortBuilder().withPort(8081).withName("two").build()); 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 5e12209d5..d1c5c49fd 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 @@ -93,7 +93,7 @@ void testPositiveMatchAllNamespaces() { when(this.multiDeletable.list()).thenReturn(serviceList); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, - false); + false, false, null); KubernetesServicesListSupplier supplier = new Fabric8ServicesListSupplier(environment, client, mapper, discoveryProperties); List instances = supplier.get().blockFirst();