-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Complete alignment between fabric8 and k8s discovery clients (#1500)
- Loading branch information
Showing
28 changed files
with
1,903 additions
and
483 deletions.
There are no files selected for viewing
78 changes: 78 additions & 0 deletions
78
...g/springframework/cloud/kubernetes/client/discovery/K8sInstanceIdHostPodNameSupplier.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* | ||
| * Copyright 2013-2023 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.cloud.kubernetes.client.discovery; | ||
|
|
||
| import java.util.Optional; | ||
| import java.util.function.Supplier; | ||
|
|
||
| import io.kubernetes.client.openapi.models.V1EndpointAddress; | ||
| import io.kubernetes.client.openapi.models.V1ObjectReference; | ||
| import io.kubernetes.client.openapi.models.V1Service; | ||
|
|
||
| import org.springframework.cloud.kubernetes.commons.discovery.InstanceIdHostPodName; | ||
|
|
||
| /** | ||
| * @author wind57 | ||
| */ | ||
| final class K8sInstanceIdHostPodNameSupplier implements Supplier<InstanceIdHostPodName> { | ||
|
|
||
| private final V1EndpointAddress endpointAddress; | ||
|
|
||
| private final V1Service service; | ||
|
|
||
| private K8sInstanceIdHostPodNameSupplier(V1EndpointAddress endpointAddress, V1Service service) { | ||
| this.endpointAddress = endpointAddress; | ||
| this.service = service; | ||
| } | ||
|
|
||
| @Override | ||
| public InstanceIdHostPodName get() { | ||
| return new InstanceIdHostPodName(instanceId(), host(), podName()); | ||
| } | ||
|
|
||
| /** | ||
| * to be used when .spec.type of the Service is != 'ExternalName'. | ||
| */ | ||
| static K8sInstanceIdHostPodNameSupplier nonExternalName(V1EndpointAddress endpointAddress, V1Service service) { | ||
| return new K8sInstanceIdHostPodNameSupplier(endpointAddress, service); | ||
| } | ||
|
|
||
| /** | ||
| * to be used when .spec.type of the Service is == 'ExternalName'. | ||
| */ | ||
| static K8sInstanceIdHostPodNameSupplier externalName(V1Service service) { | ||
| return new K8sInstanceIdHostPodNameSupplier(null, service); | ||
| } | ||
|
|
||
| // instanceId is usually the pod-uid as seen in the .metadata.uid | ||
| private String instanceId() { | ||
| return Optional.ofNullable(endpointAddress).map(V1EndpointAddress::getTargetRef).map(V1ObjectReference::getUid) | ||
| .orElseGet(() -> service.getMetadata().getUid()); | ||
| } | ||
|
|
||
| private String host() { | ||
| return Optional.ofNullable(endpointAddress).map(V1EndpointAddress::getIp) | ||
| .orElseGet(() -> service.getSpec().getExternalName()); | ||
| } | ||
|
|
||
| private String podName() { | ||
| return Optional.ofNullable(endpointAddress).map(V1EndpointAddress::getTargetRef) | ||
| .filter(objectReference -> "Pod".equals(objectReference.getKind())).map(V1ObjectReference::getName) | ||
| .orElse(null); | ||
| } | ||
|
|
||
| } |
80 changes: 80 additions & 0 deletions
80
...springframework/cloud/kubernetes/client/discovery/K8sPodLabelsAndAnnotationsSupplier.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * Copyright 2013-2023 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.cloud.kubernetes.client.discovery; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import java.util.function.Function; | ||
|
|
||
| import io.kubernetes.client.openapi.ApiException; | ||
| import io.kubernetes.client.openapi.apis.CoreV1Api; | ||
| import io.kubernetes.client.openapi.models.V1ObjectMeta; | ||
| import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder; | ||
| import org.apache.commons.logging.LogFactory; | ||
|
|
||
| import org.springframework.cloud.kubernetes.commons.discovery.PodLabelsAndAnnotations; | ||
| import org.springframework.core.log.LogAccessor; | ||
|
|
||
| /** | ||
| * @author wind57 | ||
| */ | ||
| final class K8sPodLabelsAndAnnotationsSupplier implements Function<String, PodLabelsAndAnnotations> { | ||
|
|
||
| private static final LogAccessor LOG = new LogAccessor(LogFactory.getLog(K8sPodLabelsAndAnnotationsSupplier.class)); | ||
|
|
||
| private final CoreV1Api coreV1Api; | ||
|
|
||
| private final String namespace; | ||
|
|
||
| private K8sPodLabelsAndAnnotationsSupplier(CoreV1Api coreV1Api, String namespace) { | ||
| this.coreV1Api = coreV1Api; | ||
| this.namespace = namespace; | ||
| } | ||
|
|
||
| /** | ||
| * to be used when .spec.type of the Service is != 'ExternalName'. | ||
| */ | ||
| static K8sPodLabelsAndAnnotationsSupplier nonExternalName(CoreV1Api coreV1Api, String namespace) { | ||
| return new K8sPodLabelsAndAnnotationsSupplier(coreV1Api, namespace); | ||
| } | ||
|
|
||
| /** | ||
| * to be used when .spec.type of the Service is == 'ExternalName'. | ||
| */ | ||
| static K8sPodLabelsAndAnnotationsSupplier externalName() { | ||
| return new K8sPodLabelsAndAnnotationsSupplier(null, null); | ||
| } | ||
|
|
||
| @Override | ||
| public PodLabelsAndAnnotations apply(String podName) { | ||
|
|
||
| V1ObjectMeta objectMeta; | ||
|
|
||
| try { | ||
| objectMeta = Optional.ofNullable(coreV1Api.readNamespacedPod(podName, namespace, null).getMetadata()) | ||
| .orElse(new V1ObjectMetaBuilder().withLabels(Map.of()).withAnnotations(Map.of()).build()); | ||
| } | ||
| catch (ApiException e) { | ||
| LOG.warn(e, "Could not get pod metadata"); | ||
| objectMeta = new V1ObjectMetaBuilder().withLabels(Map.of()).withAnnotations(Map.of()).build(); | ||
| } | ||
|
|
||
| return new PodLabelsAndAnnotations(Optional.ofNullable(objectMeta.getLabels()).orElse(Map.of()), | ||
| Optional.ofNullable(objectMeta.getAnnotations()).orElse(Map.of())); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.