Set pod names based on configuration
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0520ae25 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0520ae25 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0520ae25 Branch: refs/heads/master Commit: 0520ae25dd2a9dfe42ba0d8b53e8260fca26656b Parents: 4ebe94b Author: Andrew Donald Kennedy <[email protected]> Authored: Tue Jan 31 07:16:44 2017 +0000 Committer: Andrew Donald Kennedy <[email protected]> Committed: Fri May 19 14:01:20 2017 +0100 ---------------------------------------------------------------------- .../kubernetes/location/KubernetesLocation.java | 2 ++ .../openshift/location/OpenShiftLocation.java | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0520ae25/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocation.java ---------------------------------------------------------------------- diff --git a/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocation.java b/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocation.java index 62285dc..03494bf 100644 --- a/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocation.java +++ b/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocation.java @@ -662,6 +662,8 @@ public class KubernetesLocation extends AbstractLocation implements MachineProvi if (Strings.isNonBlank(podName)) { podTemplateSpecBuilder.editOrNewMetadata().withName(podName).endMetadata(); } + } else { + podTemplateSpecBuilder.editOrNewMetadata().withName(deploymentName).endMetadata(); } if (secrets != null) { for (String secretName : secrets.keySet()) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0520ae25/openshift-location/src/main/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocation.java ---------------------------------------------------------------------- diff --git a/openshift-location/src/main/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocation.java b/openshift-location/src/main/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocation.java index f3d1180..c857ee2 100644 --- a/openshift-location/src/main/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocation.java +++ b/openshift-location/src/main/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocation.java @@ -9,11 +9,13 @@ import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.core.config.ConfigBag; import org.apache.brooklyn.util.core.config.ResolvingConfigBag; import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.collect.ImmutableSet; +import io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesPod; import io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesClientRegistry; import io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocation; import io.cloudsoft.amp.containerservice.openshift.entity.OpenShiftPod; @@ -165,11 +167,18 @@ public class OpenShiftLocation extends KubernetesLocation implements OpenShiftLo PodTemplateSpecBuilder podTemplateSpecBuilder = new PodTemplateSpecBuilder() .withNewMetadata() .addToLabels(metadata) - .addToLabels("name", deploymentName) .endMetadata() .withNewSpec() .addToContainers(container) .endSpec(); + if (isKubernetesPod(entity)) { + String podName = entity.config().get(KubernetesPod.POD); + if (Strings.isNonBlank(podName)) { + podTemplateSpecBuilder.editOrNewMetadata().withName(podName).endMetadata(); + } + } else { + podTemplateSpecBuilder.editOrNewMetadata().withName(deploymentName).endMetadata(); + } if (secrets != null) { for (String secretName : secrets.keySet()) { podTemplateSpecBuilder.withNewSpec()
