Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JENKINS-50879] Add volumes from pod template to JNLP container #371

Merged
merged 2 commits into from Aug 28, 2018
Merged

[JENKINS-50879] Add volumes from pod template to JNLP container #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62d315b
[JENKINS-50879] Add volumes from pod template to JNLP container
mbarbero Aug 23, 2018
731c004
Use containsInAnyOrder for a clearer test
carlossg Aug 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateBuilder.java
View file
Open in desktop
Expand Up @@ -214,7 +214,8 @@ public Pod build() {
// default jnlp container
Optional<Container> jnlpOpt = pod.getSpec().getContainers().stream().filter(c -> JNLP_NAME.equals(c.getName()))
.findFirst();
Container jnlp = jnlpOpt.orElse(new ContainerBuilder().withName(JNLP_NAME).build());
Container jnlp = jnlpOpt.orElse(new ContainerBuilder().withName(JNLP_NAME)
.withVolumeMounts(volumeMounts.values().toArray(new VolumeMount[volumeMounts.values().size()])).build());
if (!jnlpOpt.isPresent()) {
pod.getSpec().getContainers().add(jnlp);
}
Expand Down
44 changes: 27 additions & 17 deletions src/test/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateBuilderTest.java
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@
import static org.mockito.Mockito.*;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
Expand All @@ -14,12 +15,13 @@
import java.util.stream.Collectors;

import org.apache.commons.compress.utils.IOUtils;
import org.csanchez.jenkins.plugins.kubernetes.model.KeyValueEnvVar;
import org.csanchez.jenkins.plugins.kubernetes.model.TemplateEnvVar;
import org.csanchez.jenkins.plugins.kubernetes.volumes.EmptyDirVolume;
import org.csanchez.jenkins.plugins.kubernetes.volumes.HostPathVolume;
import org.csanchez.jenkins.plugins.kubernetes.volumes.PodVolume;
import org.csanchez.jenkins.plugins.kubernetes.volumes.workspace.EmptyDirWorkspaceVolume;
import org.csanchez.jenkins.plugins.kubernetes.model.TemplateEnvVar;
import org.csanchez.jenkins.plugins.kubernetes.model.KeyValueEnvVar;
import org.hamcrest.Matcher;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.Issue;
Expand Down Expand Up @@ -137,6 +139,7 @@ public void testBuildWithCustomWorkspaceVolume() throws Exception {
assertEquals(volumeMounts, container1.getVolumeMounts());
}

@Test
public void testBuildFromTemplate() throws Exception {
PodTemplate template = new PodTemplate();

Expand Down Expand Up @@ -198,27 +201,30 @@ private void validatePod(Pod pod, boolean fromYaml) {
}

List<VolumeMount> mounts = containers.get("busybox").getVolumeMounts();
List<VolumeMount> jnlpMounts = containers.get("jnlp").getVolumeMounts();
VolumeMount workspaceVolume = new VolumeMountBuilder() //
.withMountPath("/home/jenkins").withName("workspace-volume").withReadOnly(false).build();

// when using yaml we don't mount all volumes, just the ones explicitly listed
if (fromYaml) {
assertEquals(2, mounts.size());
assertEquals(new VolumeMountBuilder().withMountPath("/container/data").withName("host-volume").build(),
mounts.get(0));
assertEquals(new VolumeMountBuilder().withMountPath("/home/jenkins").withName("workspace-volume")
.withReadOnly(false).build(), mounts.get(1));
assertThat(mounts, containsInAnyOrder(workspaceVolume, //
new VolumeMountBuilder().withMountPath("/container/data").withName("host-volume").build()));
assertThat(jnlpMounts, containsInAnyOrder(workspaceVolume));
} else {
assertEquals(3, mounts.size());
assertEquals(new VolumeMountBuilder().withMountPath("/container/data").withName("volume-0").build(),
mounts.get(0));
assertEquals(new VolumeMountBuilder().withMountPath("/empty/dir").withName("volume-1").build(),
mounts.get(1));
assertEquals(new VolumeMountBuilder().withMountPath("/home/jenkins").withName("workspace-volume")
.withReadOnly(false).build(), mounts.get(2));
List<Matcher<? super VolumeMount>> volumeMounts = Arrays.asList( //
equalTo(workspaceVolume), //
equalTo(new VolumeMountBuilder() //
.withMountPath("/container/data").withName("volume-0").withReadOnly(false).build()),
equalTo(new VolumeMountBuilder() //
.withMountPath("/empty/dir").withName("volume-1").withReadOnly(false).build()));
assertThat(mounts, containsInAnyOrder(volumeMounts));
assertThat(jnlpMounts, containsInAnyOrder(volumeMounts));
}

validateJnlpContainer(containers.get("jnlp"), slave);
}

private void validateJnlpContainer(Container jnlp, KubernetesSlave slave) {
assertEquals("Wrong number of volume mounts: " + jnlp.getVolumeMounts(), 1, jnlp.getVolumeMounts().size());
assertThat(jnlp.getCommand(), empty());
List<EnvVar> envVars = Lists.newArrayList( //
new EnvVar("HOME", "/home/jenkins", null) //
Expand Down Expand Up @@ -252,7 +258,9 @@ public void testOverridesFromYaml() throws Exception {
Map<String, Container> containers = pod.getSpec().getContainers().stream()
.collect(Collectors.toMap(Container::getName, Function.identity()));
assertEquals(1, containers.size());
validateJnlpContainer(containers.get("jnlp"), slave);
Container jnlp = containers.get("jnlp");
assertEquals("Wrong number of volume mounts: " + jnlp.getVolumeMounts(), 1, jnlp.getVolumeMounts().size());
validateJnlpContainer(jnlp, slave);
}

@Test
Expand All @@ -267,6 +275,8 @@ public void testOverridesContainerSpec() throws Exception {
Map<String, Container> containers = pod.getSpec().getContainers().stream()
.collect(Collectors.toMap(Container::getName, Function.identity()));
assertEquals(1, containers.size());
validateJnlpContainer(containers.get("jnlp"), slave);
Container jnlp = containers.get("jnlp");
assertEquals("Wrong number of volume mounts: " + jnlp.getVolumeMounts(), 1, jnlp.getVolumeMounts().size());
validateJnlpContainer(jnlp, slave);
}
}