Skip to content

Commit 9df7836

Browse files
committed
Bumping versions
1 parent e88d94d commit 9df7836

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ public static ServiceInstance serviceInstance(@Nullable ServicePortSecureResolve
151151
serviceMetadata.name(), serviceMetadata.labels(), serviceMetadata.annotations()));
152152
}
153153

154-
Map<String, Map<String, String>> podMetadata = podMetadata(data.podName(), serviceInstanceMetadata,
155-
properties, podLabelsAndMetadata);
154+
Map<String, Map<String, String>> podMetadata = podMetadata(data.podName(), serviceInstanceMetadata, properties,
155+
podLabelsAndMetadata);
156156

157-
return new DefaultKubernetesServiceInstance(data.instanceId(), serviceMetadata.name(),
158-
data.host(), portData.portNumber(), serviceInstanceMetadata, secured,
159-
serviceMetadata.namespace(), null, podMetadata);
157+
return new DefaultKubernetesServiceInstance(data.instanceId(), serviceMetadata.name(), data.host(),
158+
portData.portNumber(), serviceInstanceMetadata, secured, serviceMetadata.namespace(), null,
159+
podMetadata);
160160
}
161161

162162
/**

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -661,8 +661,7 @@ void testServiceInstance() {
661661
ServicePortSecureResolver resolver = new ServicePortSecureResolver(properties);
662662

663663
ServicePortNameAndNumber portData = new ServicePortNameAndNumber(8080, "http");
664-
ServiceMetadata forServiceInstance = new ServiceMetadata("my-service", "k8s", "ClusterIP", Map.of(),
665-
Map.of());
664+
ServiceMetadata forServiceInstance = new ServiceMetadata("my-service", "k8s", "ClusterIP", Map.of(), Map.of());
666665
InstanceIdHostPodName instanceIdHostPodName = new InstanceIdHostPodName("123", "127.0.0.1", null);
667666
Map<String, String> serviceMetadata = Map.of("a", "b");
668667

@@ -689,8 +688,7 @@ void testExternalNameServiceInstance() {
689688
false, "", Set.of(), Map.of(), "", KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false);
690689

691690
ServicePortNameAndNumber portData = new ServicePortNameAndNumber(-1, "http");
692-
ServiceMetadata forServiceInstance = new ServiceMetadata("my-service", "k8s", "ClusterIP", Map.of(),
693-
Map.of());
691+
ServiceMetadata forServiceInstance = new ServiceMetadata("my-service", "k8s", "ClusterIP", Map.of(), Map.of());
694692
InstanceIdHostPodName instanceIdHostPodName = new InstanceIdHostPodName("123", "spring.io", null);
695693
Map<String, String> serviceMetadata = Map.of("a", "b");
696694

0 commit comments

Comments
 (0)