Skip to content

Commit 7373142

Browse files
wind57wind57
committed
Merge branch 'drop-constructors-from-default-kubernetes-service-instance' into clean-up-after-breaking-changes
2 parents 5023e90 + 91fe36f commit 7373142

File tree

15 files changed

+53
-70
lines changed

15 files changed

+53
-70
lines changed

‎spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerDiscoveryClientTests.java‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void testServiceWithUnsetPortNames() {
112112
assertThat(discoveryClient.getInstances("test-svc-1").toArray())
113113
.containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "1.1.1.1", 80,
114114
Map.of("port.<unset>", "80", "k8s_namespace", "namespace1", "type", "ClusterIP"), false,
115-
"namespace1", null));
115+
"namespace1", null, Map.of()));
116116
}
117117

118118
@Test
@@ -162,7 +162,7 @@ void testDiscoveryInstancesWithServiceLabels() {
162162
new DefaultKubernetesServiceInstance(
163163
null, "test-svc-3", "2.2.2.2", 8080, Map.of("spring", "true", "port.<unset>", "8080", "k8s",
164164
"true", "k8s_namespace", "namespace1", "type", "ClusterIP"),
165-
false, "namespace1", null));
165+
false, "namespace1", null, Map.of()));
166166
}
167167

168168
@Test
@@ -215,7 +215,7 @@ void testDiscoveryGetInstanceAllNamespaceShouldWork() {
215215
assertThat(discoveryClient.getInstances("test-svc-1"))
216216
.containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "2.2.2.2", 8080,
217217
Map.of("port.<unset>", "8080", "k8s_namespace", "namespace1", "type", "ClusterIP"), false,
218-
"namespace1", null));
218+
"namespace1", null, Map.of()));
219219
}
220220

221221
@Test
@@ -230,7 +230,7 @@ void testDiscoveryGetInstanceOneNamespaceShouldWork() {
230230
assertThat(discoveryClient.getInstances("test-svc-1"))
231231
.containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "2.2.2.2", 8080,
232232
Map.of("port.<unset>", "8080", "k8s_namespace", "namespace1", "type", "ClusterIP"), false,
233-
"namespace1", null));
233+
"namespace1", null, Map.of()));
234234
}
235235

236236
@Test
@@ -261,7 +261,7 @@ void testDiscoveryGetInstanceWithNotReadyAddressesIncludedShouldWork() {
261261
assertThat(discoveryClient.getInstances("test-svc-1"))
262262
.containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "2.2.2.2", 8080,
263263
Map.of("port.<unset>", "8080", "k8s_namespace", "namespace1", "type", "ClusterIP"), false,
264-
"namespace1", null));
264+
"namespace1", null, Map.of()));
265265
}
266266

267267
@Test
@@ -287,7 +287,7 @@ void instanceWithoutPortsWillNotBeSkipped() {
287287

288288
assertThat(discoveryClient.getInstances("test-svc-1"))
289289
.containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "1.1.1.1", 0,
290-
Map.of("k8s_namespace", "namespace1", "type", "ClusterIP"), false, "namespace1", null));
290+
Map.of("k8s_namespace", "namespace1", "type", "ClusterIP"), false, "namespace1", null, Map.of()));
291291
}
292292

293293
@Test
@@ -299,10 +299,10 @@ void instanceWithMultiplePortsAndPrimaryPortNameConfiguredWithLabelShouldWork()
299299
List.of(SHARED_INFORMER_FACTORY), List.of(serviceLister), List.of(endpointsLister), null, null,
300300
NOT_ALL_NAMESPACES, CORE_V1_API, x -> true);
301301

302-
assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new DefaultKubernetesServiceInstance(
303-
null, "test-svc-1", "1.1.1.1", 443, Map.of("port.http", "80", "primary-port-name", "https",
304-
"port.https", "443", "k8s_namespace", "namespace1", "type", "ClusterIP"),
305-
true, "namespace1", null));
302+
assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new DefaultKubernetesServiceInstance(null,
303+
"test-svc-1", "1.1.1.1", 443, Map.of("port.http", "80", "primary-port-name", "https", "port.https",
304+
"443", "k8s_namespace", "namespace1", "type", "ClusterIP"),
305+
true, "namespace1", null, Map.of()));
306306
}
307307

308308
@Test
@@ -315,11 +315,10 @@ void instanceWithMultiplePortsAndMisconfiguredPrimaryPortNameInLabelShouldReturn
315315
List.of(SHARED_INFORMER_FACTORY), List.of(serviceLister), List.of(endpointsLister), null, null,
316316
NOT_ALL_NAMESPACES, CORE_V1_API, x -> true);
317317

318-
assertThat(discoveryClient.getInstances("test-svc-1"))
319-
.containsOnly(new DefaultKubernetesServiceInstance(
320-
null, "test-svc-1", "1.1.1.1", 80, Map.of("port.tcp1", "80", "primary-port-name", "oops",
321-
"port.tcp2", "443", "k8s_namespace", "namespace1", "type", "ClusterIP"),
322-
false, "namespace1", null));
318+
assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new DefaultKubernetesServiceInstance(
319+
null, "test-svc-1", "1.1.1.1", 80, Map.of("port.tcp1", "80", "primary-port-name", "oops", "port.tcp2",
320+
"443", "k8s_namespace", "namespace1", "type", "ClusterIP"),
321+
false, "namespace1", null, Map.of()));
323322
}
324323

325324
@Test
@@ -334,7 +333,7 @@ void instanceWithMultiplePortsAndGenericPrimaryPortNameConfiguredShouldWork() {
334333
assertThat(discoveryClient.getInstances("test-svc-1"))
335334
.containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "1.1.1.1", 443,
336335
Map.of("port.http", "80", "port.https", "443", "k8s_namespace", "namespace1", "type", "ClusterIP"),
337-
true, "namespace1", null));
336+
true, "namespace1", null, Map.of()));
338337
}
339338

340339
@Test
@@ -350,7 +349,7 @@ void instanceWithMultiplePortsAndMisconfiguredGenericPrimaryPortNameShouldReturn
350349
assertThat(discoveryClient.getInstances("test-svc-1"))
351350
.containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "1.1.1.1", 80,
352351
Map.of("port.tcp1", "80", "port.tcp2", "443", "k8s_namespace", "namespace1", "type", "ClusterIP"),
353-
false, "namespace1", null));
352+
false, "namespace1", null, Map.of()));
354353
}
355354

356355
@Test
@@ -365,7 +364,7 @@ void instanceWithMultiplePortsAndWithoutPrimaryPortNameSpecifiedShouldFallBackTo
365364
assertThat(discoveryClient.getInstances("test-svc-1"))
366365
.containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "1.1.1.1", 443,
367366
Map.of("port.http", "80", "port.https", "443", "k8s_namespace", "namespace1", "type", "ClusterIP"),
368-
true, "namespace1", null));
367+
true, "namespace1", null, Map.of()));
369368
}
370369

371370
@Test
@@ -380,7 +379,7 @@ void instanceWithMultiplePortsAndWithoutPrimaryPortNameSpecifiedOrHttpsPortShoul
380379
assertThat(discoveryClient.getInstances("test-svc-1"))
381380
.containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "1.1.1.1", 80,
382381
Map.of("port.http", "80", "port.tcp", "443", "k8s_namespace", "namespace1", "type", "ClusterIP"),
383-
false, "namespace1", null));
382+
false, "namespace1", null, Map.of()));
384383
}
385384

386385
@Test
@@ -396,7 +395,7 @@ void instanceWithMultiplePortsAndWithoutAnyConfigurationShouldPickTheFirstPort()
396395
assertThat(discoveryClient.getInstances("test-svc-1"))
397396
.containsOnly(new DefaultKubernetesServiceInstance(null, "test-svc-1", "1.1.1.1", 80,
398397
Map.of("port.tcp1", "80", "port.tcp2", "443", "k8s_namespace", "namespace1", "type", "ClusterIP"),
399-
false, "namespace1", null));
398+
false, "namespace1", null, Map.of()));
400399
}
401400

402401
@Test
@@ -411,10 +410,10 @@ void getInstancesShouldReturnInstancesWithTheSameServiceIdFromNamespaces() {
411410
assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(
412411
new DefaultKubernetesServiceInstance(null, "test-svc-1", "2.2.2.2", 8080,
413412
Map.of("port.<unset>", "8080", "k8s_namespace", "namespace1", "type", "ClusterIP"), false,
414-
"namespace1", null),
413+
"namespace1", null, Map.of()),
415414
new DefaultKubernetesServiceInstance(null, "test-svc-1", "2.2.2.2", 8080,
416415
Map.of("port.<unset>", "8080", "k8s_namespace", "namespace2", "type", "ClusterIP"), false,
417-
"namespace2", null));
416+
"namespace2", null, Map.of()));
418417
}
419418

420419
@Test

‎spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerReactiveDiscoveryClientTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ void testDiscoveryGetInstanceAllNamespaceShouldWork() {
137137
StepVerifier.create(discoveryClient.getInstances("test-svc-1"))
138138
.expectNext(new DefaultKubernetesServiceInstance(null, "test-svc-1", "2.2.2.2", 8080,
139139
Map.of("type", "ClusterIP", "port.<unset>", "8080", "k8s_namespace", "namespace1"), false,
140-
"namespace1", null))
140+
"namespace1", null, Map.of()))
141141
.expectComplete()
142142
.verify();
143143

@@ -159,7 +159,7 @@ void testDiscoveryGetInstanceOneNamespaceShouldWork() {
159159
StepVerifier.create(discoveryClient.getInstances("test-svc-1"))
160160
.expectNext(new DefaultKubernetesServiceInstance(null, "test-svc-1", "2.2.2.2", 8080,
161161
Map.of("type", "ClusterIP", "port.<unset>", "8080", "k8s_namespace", "namespace1"), false,
162-
"namespace1", null))
162+
"namespace1", null, Map.of()))
163163
.expectComplete()
164164
.verify();
165165

‎spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public KubernetesServiceInstance map(V1Service service) {
116116
boolean secure = secure(port, service);
117117

118118
return new DefaultKubernetesServiceInstance(metadata.getUid(), metadata.getName(), host, port.getPort(),
119-
serviceMetadata(service), secure);
119+
serviceMetadata(service), secure, null, null, Map.of());
120120
}
121121

122122
private Map<String, String> serviceMetadata(V1Service service) {

‎spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapperTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void singlePortNonSecure() {
5959
Map<String, String> metadata = Map.of("org.springframework.cloud", "true", "beta", "true", "k8s_namespace",
6060
"default", "type", "V1Service");
6161
DefaultKubernetesServiceInstance result = new DefaultKubernetesServiceInstance("0", "database",
62-
"database.default.svc.cluster.local", 80, metadata, false);
62+
"database.default.svc.cluster.local", 80, metadata, false, null, null, Map.of());
6363
assertThat(serviceInstance).isEqualTo(result);
6464
}
6565

@@ -79,7 +79,7 @@ void singlePortSecure() {
7979
Map<String, String> metadata = Map.of("org.springframework.cloud", "true", "beta", "true", "secured", "true",
8080
"k8s_namespace", "default", "type", "V1Service");
8181
DefaultKubernetesServiceInstance result = new DefaultKubernetesServiceInstance("0", "database",
82-
"database.default.svc.cluster.local", 80, metadata, true);
82+
"database.default.svc.cluster.local", 80, metadata, true, null, null, Map.of());
8383
assertThat(serviceInstance).isEqualTo(result);
8484
}
8585

@@ -100,7 +100,7 @@ void multiplePortsSecure() {
100100
"default", "type", "V1Service");
101101
KubernetesServiceInstance serviceInstance = mapper.map(service);
102102
DefaultKubernetesServiceInstance result = new DefaultKubernetesServiceInstance("0", "database",
103-
"database.default.svc.cluster.local", 443, metadata, true);
103+
"database.default.svc.cluster.local", 443, metadata, true, null, null, Map.of());
104104
assertThat(serviceInstance).isEqualTo(result);
105105
}
106106

‎spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ void singleNamespaceTest(CapturedOutput output) {
150150
Map<String, String> metadata = Map.of("org.springframework.cloud", "true", "beta", "true", "k8s_namespace",
151151
"default", "type", "V1Service");
152152
DefaultKubernetesServiceInstance serviceA = new DefaultKubernetesServiceInstance("0", "service-a",
153-
"service-a.default.svc.cluster.local", 80, metadata, false);
153+
"service-a.default.svc.cluster.local", 80, metadata, false, null, null, Map.of());
154154
List<ServiceInstance> services = new ArrayList<>();
155155
services.add(serviceA);
156156

@@ -218,9 +218,10 @@ void allNamespacesTest(CapturedOutput output) {
218218
Map<String, String> metadata = Map.of("org.springframework.cloud", "true", "beta", "true", "k8s_namespace",
219219
"default", "type", "V1Service");
220220
DefaultKubernetesServiceInstance serviceADefaultNamespace = new DefaultKubernetesServiceInstance("0",
221-
"service-a", "service-a.default.svc.cluster.local", 80, metadata, false);
221+
"service-a", "service-a.default.svc.cluster.local", 80, metadata, false, null, null, Map.of());
222222
DefaultKubernetesServiceInstance serviceATestNamespace = new DefaultKubernetesServiceInstance("1", "service-a",
223-
"service-a.test.svc.cluster.local", 80, Map.of("k8s_namespace", "test", "type", "V1Service"), false);
223+
"service-a.test.svc.cluster.local", 80, Map.of("k8s_namespace", "test", "type", "V1Service"), false,
224+
null, null, Map.of());
224225
List<ServiceInstance> services = new ArrayList<>();
225226
services.add(serviceADefaultNamespace);
226227
services.add(serviceATestNamespace);
@@ -263,9 +264,10 @@ void selectiveNamespacesTest(CapturedOutput output) {
263264
Map<String, String> metadata = Map.of("org.springframework.cloud", "true", "beta", "true", "k8s_namespace",
264265
"default", "type", "V1Service");
265266
DefaultKubernetesServiceInstance serviceADefaultNamespace = new DefaultKubernetesServiceInstance("0",
266-
"service-a", "service-a.default.svc.cluster.local", 80, metadata, false);
267+
"service-a", "service-a.default.svc.cluster.local", 80, metadata, false, null, null, Map.of());
267268
DefaultKubernetesServiceInstance serviceATestNamespace = new DefaultKubernetesServiceInstance("1", "service-a",
268-
"service-a.test.svc.cluster.local", 80, Map.of("k8s_namespace", "test", "type", "V1Service"), false);
269+
"service-a.test.svc.cluster.local", 80, Map.of("k8s_namespace", "test", "type", "V1Service"), false,
270+
null, null, Map.of());
269271
List<ServiceInstance> services = new ArrayList<>();
270272
services.add(serviceADefaultNamespace);
271273
services.add(serviceATestNamespace);

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/DefaultKubernetesServiceInstance.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,6 @@ public record DefaultKubernetesServiceInstance(String instanceId, String service
3838
Map<String, String> metadata, boolean secure, String namespace, String cluster,
3939
Map<String, Map<String, String>> podMetadata) implements KubernetesServiceInstance {
4040

41-
/**
42-
* @param instanceId the id of the instance.
43-
* @param serviceId the id of the service.
44-
* @param host the address where the service instance can be found.
45-
* @param port the port on which the service is running.
46-
* @param metadata a map containing metadata.
47-
* @param secure indicates whether the connection needs to be secure.
48-
*/
49-
public DefaultKubernetesServiceInstance(String instanceId, String serviceId, String host, int port,
50-
Map<String, String> metadata, boolean secure) {
51-
this(instanceId, serviceId, host, port, metadata, secure, null, null, Map.of());
52-
}
53-
54-
public DefaultKubernetesServiceInstance(String instanceId, String serviceId, String host, int port,
55-
Map<String, String> metadata, boolean secure, String namespace, String cluster) {
56-
this(instanceId, serviceId, host, port, metadata, secure, namespace, cluster, Map.of());
57-
}
58-
5941
@Override
6042
public String getInstanceId() {
6143
return this.instanceId;

‎spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesServiceInstanceTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class KubernetesServiceInstanceTests {
3232
@Test
3333
void testFirstConstructor() {
3434
DefaultKubernetesServiceInstance instance = new DefaultKubernetesServiceInstance("instanceId", "serviceId",
35-
"host", 8080, Map.of("k8s_namespace", "spring-k8s"), true);
35+
"host", 8080, Map.of("k8s_namespace", "spring-k8s"), true, null, null, Map.of());
3636

3737
assertThat(instance.getInstanceId()).isEqualTo("instanceId");
3838
assertThat(instance.getServiceId()).isEqualTo("serviceId");
@@ -50,7 +50,7 @@ void testFirstConstructor() {
5050
@Test
5151
void testSecondConstructor() {
5252
DefaultKubernetesServiceInstance instance = new DefaultKubernetesServiceInstance("instanceId", "serviceId",
53-
"host", 8080, Map.of("a", "b"), true, "spring-k8s", "cluster");
53+
"host", 8080, Map.of("a", "b"), true, "spring-k8s", "cluster", Map.of());
5454

5555
assertThat(instance.getInstanceId()).isEqualTo("instanceId");
5656
assertThat(instance.getServiceId()).isEqualTo("serviceId");
@@ -97,7 +97,7 @@ void schemeIsHttps() {
9797

9898
private DefaultKubernetesServiceInstance assertServiceInstance(boolean secure) {
9999
DefaultKubernetesServiceInstance instance = new DefaultKubernetesServiceInstance("123", "myservice", "1.2.3.4",
100-
8080, Collections.emptyMap(), secure);
100+
8080, Collections.emptyMap(), secure, null, null, Map.of());
101101

102102
assertThat(instance.getInstanceId()).isEqualTo("123");
103103
assertThat(instance.getServiceId()).isEqualTo("myservice");

‎spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedConfigMapWatchChangeDetectorTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ threadPoolTaskExecutor, new HttpRefreshTrigger(reactiveDiscoveryClient,
225225
fooEndpointPort.setPort(port);
226226
List<ServiceInstance> instances = new ArrayList<>();
227227
DefaultKubernetesServiceInstance fooServiceInstance = new DefaultKubernetesServiceInstance("foo", "foo",
228-
fooEndpointAddress.getIp(), fooEndpointPort.getPort(), metadata, false);
228+
fooEndpointAddress.getIp(), fooEndpointPort.getPort(), metadata, false, null, null, Map.of());
229229
instances.add(fooServiceInstance);
230230
return instances;
231231
}
@@ -240,7 +240,7 @@ private void stubReactiveCall() {
240240

241241
List<ServiceInstance> instances = new ArrayList<>();
242242
DefaultKubernetesServiceInstance fooServiceInstance = new DefaultKubernetesServiceInstance("foo", "foo",
243-
fooEndpointAddress.getIp(), fooEndpointPort.getPort(), new HashMap<>(), false);
243+
fooEndpointAddress.getIp(), fooEndpointPort.getPort(), new HashMap<>(), false, null, null, Map.of());
244244
instances.add(fooServiceInstance);
245245
when(reactiveDiscoveryClient.getInstances(eq("foo"))).thenReturn(Flux.fromIterable(instances));
246246
}

‎spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedSecretsWatchChangeDetectorTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ void triggerSecretRefreshWithAnnotationActuatorPath(String endpoint, RefreshStra
204204
fooEndpointPort.setPort(WIRE_MOCK_SERVER.port());
205205
List<ServiceInstance> instances = new ArrayList<>();
206206
DefaultKubernetesServiceInstance fooServiceInstance = new DefaultKubernetesServiceInstance("foo", "foo",
207-
fooEndpointAddress.getIp(), fooEndpointPort.getPort(), metadata, false);
207+
fooEndpointAddress.getIp(), fooEndpointPort.getPort(), metadata, false, null, null, Map.of());
208208
instances.add(fooServiceInstance);
209209
when(reactiveDiscoveryClient.getInstances(eq("foo"))).thenReturn(Flux.fromIterable(instances));
210210
V1Secret secret = new V1Secret();
@@ -227,7 +227,7 @@ private void stubReactiveCall() {
227227
fooEndpointPort.setPort(WIRE_MOCK_SERVER.port());
228228
List<ServiceInstance> instances = new ArrayList<>();
229229
DefaultKubernetesServiceInstance fooServiceInstance = new DefaultKubernetesServiceInstance("foo", "foo",
230-
fooEndpointAddress.getIp(), fooEndpointPort.getPort(), new HashMap<>(), false);
230+
fooEndpointAddress.getIp(), fooEndpointPort.getPort(), new HashMap<>(), false, null, null, Map.of());
231231
instances.add(fooServiceInstance);
232232
when(reactiveDiscoveryClient.getInstances(eq("foo"))).thenReturn(Flux.fromIterable(instances));
233233
}

‎spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerControllerTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@
4141
class DiscoveryServerControllerTests {
4242

4343
private static final DefaultKubernetesServiceInstance SERVICE_A_INSTANCE_1 = new DefaultKubernetesServiceInstance(
44-
"serviceAInstance1", "serviceAInstance1", "2.2.2.2", 8080, Map.of(), false, "namespace1", null);
44+
"serviceAInstance1", "serviceAInstance1", "2.2.2.2", 8080, Map.of(), false, "namespace1", null, Map.of());
4545

4646
private static final DefaultKubernetesServiceInstance SERVICE_A_INSTANCE_2 = new DefaultKubernetesServiceInstance(
47-
"serviceAInstance2", "serviceAInstance2", "2.2.2.2", 8080, Map.of(), false, "namespace1", null);
47+
"serviceAInstance2", "serviceAInstance2", "2.2.2.2", 8080, Map.of(), false, "namespace1", null, Map.of());
4848

4949
private static final DefaultKubernetesServiceInstance SERVICE_A_INSTANCE_3 = new DefaultKubernetesServiceInstance(
50-
"serviceAInstance3", "serviceAInstance3", "2.2.2.2", 8080, Map.of(), false, "namespace2", null);
50+
"serviceAInstance3", "serviceAInstance3", "2.2.2.2", 8080, Map.of(), false, "namespace2", null, Map.of());
5151

5252
private static final DefaultKubernetesServiceInstance SERVICE_B_INSTANCE_1 = new DefaultKubernetesServiceInstance(
53-
"serviceBInstance1", "serviceBInstance1", "2.2.2.2", 8080, Map.of(), false, "namespace1", null);
53+
"serviceBInstance1", "serviceBInstance1", "2.2.2.2", 8080, Map.of(), false, "namespace1", null, Map.of());
5454

5555
private static final DefaultKubernetesServiceInstance SERVICE_C_INSTANCE_1 = new DefaultKubernetesServiceInstance(
56-
"serviceCInstance1", "serviceCInstance1", "2.2.2.2", 8080, Map.of(), false, "namespace2", null);
56+
"serviceCInstance1", "serviceCInstance1", "2.2.2.2", 8080, Map.of(), false, "namespace2", null, Map.of());
5757

5858
private static Service serviceA;
5959

0 commit comments

Comments
 (0)