SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2023-08-09 02:24:09 +00:00
parent e88d94d51d
commit 9df7836847
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,12 +151,12 @@ public final class DiscoveryClientUtils {
serviceMetadata.name(), serviceMetadata.labels(), serviceMetadata.annotations()));
}
Map<String, Map<String, String>> podMetadata = podMetadata(data.podName(), serviceInstanceMetadata,
properties, podLabelsAndMetadata);
Map<String, Map<String, String>> podMetadata = podMetadata(data.podName(), serviceInstanceMetadata, properties,
podLabelsAndMetadata);
return new DefaultKubernetesServiceInstance(data.instanceId(), serviceMetadata.name(),
data.host(), portData.portNumber(), serviceInstanceMetadata, secured,
serviceMetadata.namespace(), null, podMetadata);
return new DefaultKubernetesServiceInstance(data.instanceId(), serviceMetadata.name(), data.host(),
portData.portNumber(), serviceInstanceMetadata, secured, serviceMetadata.namespace(), null,
podMetadata);
}
/**

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

@@ -661,8 +661,7 @@ class DiscoveryClientUtilsTests {
ServicePortSecureResolver resolver = new ServicePortSecureResolver(properties);
ServicePortNameAndNumber portData = new ServicePortNameAndNumber(8080, "http");
ServiceMetadata forServiceInstance = new ServiceMetadata("my-service", "k8s", "ClusterIP", Map.of(),
Map.of());
ServiceMetadata forServiceInstance = new ServiceMetadata("my-service", "k8s", "ClusterIP", Map.of(), Map.of());
InstanceIdHostPodName instanceIdHostPodName = new InstanceIdHostPodName("123", "127.0.0.1", null);
Map<String, String> serviceMetadata = Map.of("a", "b");
@@ -689,8 +688,7 @@ class DiscoveryClientUtilsTests {
false, "", Set.of(), Map.of(), "", KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false, false);
ServicePortNameAndNumber portData = new ServicePortNameAndNumber(-1, "http");
ServiceMetadata forServiceInstance = new ServiceMetadata("my-service", "k8s", "ClusterIP", Map.of(),
Map.of());
ServiceMetadata forServiceInstance = new ServiceMetadata("my-service", "k8s", "ClusterIP", Map.of(), Map.of());
InstanceIdHostPodName instanceIdHostPodName = new InstanceIdHostPodName("123", "spring.io", null);
Map<String, String> serviceMetadata = Map.of("a", "b");