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

some polishing (#788)

Browse Source
This commit is contained in:
erabii
2021-05-18 16:06:47 -04:00
committed by GitHub
parent ee9c8782e4
commit 6a5c2d924a
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributor.java
View File

@@ -19,7 +19,10 @@ package org.springframework.cloud.kubernetes.client;
import java.util.Collections;
import java.util.Map;
import io.kubernetes.client.openapi.models.V1ObjectMeta;
import io.kubernetes.client.openapi.models.V1Pod;
import io.kubernetes.client.openapi.models.V1PodSpec;
import io.kubernetes.client.openapi.models.V1PodStatus;
import org.springframework.cloud.kubernetes.commons.AbstractKubernetesInfoContributor;
import org.springframework.cloud.kubernetes.commons.PodUtils;
@@ -42,12 +45,19 @@ public class KubernetesClientInfoContributor extends AbstractKubernetesInfoContr
if (current != null) {
Map<String, Object> details = CollectionUtils.newHashMap(7);
details.put(INSIDE, true);
details.put(NAMESPACE, current.getMetadata().getNamespace());
details.put(POD_NAME, current.getMetadata().getName());
details.put(SERVICE_ACCOUNT, current.getSpec().getServiceAccountName());
details.put(NODE_NAME, current.getSpec().getNodeName());
details.put(POD_IP, current.getStatus().getPodIP());
details.put(HOST_IP, current.getStatus().getHostIP());
V1ObjectMeta meta = current.getMetadata();
details.put(NAMESPACE, meta.getNamespace());
details.put(POD_NAME, meta.getName());
V1PodSpec spec = current.getSpec();
details.put(SERVICE_ACCOUNT, spec.getServiceAccountName());
details.put(NODE_NAME, spec.getNodeName());
V1PodStatus status = current.getStatus();
details.put(POD_IP, status.getPodIP());
details.put(HOST_IP, status.getHostIP());
return details;
}
return Collections.singletonMap(INSIDE, false);

4
spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributorTests.java
View File

@@ -57,7 +57,7 @@ class KubernetesClientInfoContributorTests {
KubernetesClientInfoContributor infoContributor = new KubernetesClientInfoContributor(utils);
Map<String, Object> details = infoContributor.getDetails();
assertThat(details.containsKey(INSIDE)).isTrue();
assertThat(details.size()).isEqualTo(1);
assertThat(details.get(INSIDE)).isEqualTo(false);
}
@@ -68,7 +68,7 @@ class KubernetesClientInfoContributorTests {
KubernetesClientInfoContributor infoContributor = new KubernetesClientInfoContributor(utils);
Map<String, Object> details = infoContributor.getDetails();
assertThat(details.containsKey(INSIDE)).isTrue();
assertThat(details.size()).isEqualTo(7);
assertThat(details.get(INSIDE)).isEqualTo(true);
assertThat(details.get(HOST_IP)).isEqualTo(STUB_HOST_IP);