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

Limit pod name to 63 characters, and shorten randomly generated string #143

Merged
merged 1 commit into from
Mar 1, 2017
Merged

Limit pod name to 63 characters, and shorten randomly generated string #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesSlave.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;

import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
import org.jenkinsci.plugins.durabletask.executors.OnceRetentionStrategy;
import org.jvnet.localizer.Localizable;
Expand Down Expand Up @@ -83,16 +84,16 @@ public KubernetesSlave(PodTemplate template, String nodeDescription, String clou
}

static String getSlaveName(PodTemplate template) {
String hex = Long.toHexString(System.nanoTime());
String randString = RandomStringUtils.random(5, "bcdfghjklmnpqrstvwxz0123456789");
String name = template.getName();
if (StringUtils.isEmpty(name)) {
return hex;
return String.format("kubernetes-%s", randString);
}
// no spaces
name = template.getName().replace(" ", "-").toLowerCase();
// keep it under 256 chars
name = name.substring(0, Math.min(name.length(), 256 - hex.length()));
return String.format("%s-%s", name, hex);
// keep it under 63 chars (62 is used to account for the '-')
name = name.substring(0, Math.min(name.length(), 62 - randString.length()));
return String.format("%s-%s", name, randString);
}

@Override
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/PodTemplateStepExecution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,11 @@ public boolean start() throws Exception {
cloud.getClass().getName()));
}
KubernetesCloud kubernetesCloud = (KubernetesCloud) cloud;
String uuid = UUID.randomUUID().toString().replaceAll("-", "");
String name = String.format(NAME_FORMAT, step.getName(), uuid);

PodTemplateAction action = new PodTemplateAction(getContext().get(Run.class));

PodTemplate newTemplate = new PodTemplate();
newTemplate.setName(name);
newTemplate.setName(step.getName());
newTemplate.setInheritFrom(!Strings.isNullOrEmpty( action.getParentTemplates()) ? action.getParentTemplates() : step.getInheritFrom());
newTemplate.setInstanceCap(step.getInstanceCap());
newTemplate.setLabel(step.getLabel());
Expand All @@ -66,7 +64,7 @@ public boolean start() throws Exception {
getContext().newBodyInvoker().withContext(step).withCallback(new PodTemplateCallback(newTemplate)).start();


action.push(name);
action.push(step.getName());
return false;
}

Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesSlaveTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ public void testGetSlaveName() {
List<? extends PodVolume> volumes = Collections.emptyList();
List<ContainerTemplate> containers = Collections.emptyList();

assertRegex(KubernetesSlave.getSlaveName(new PodTemplate("image", volumes)), "^[0-9a-f]{10,}$");
assertRegex(KubernetesSlave.getSlaveName(new PodTemplate("", volumes, containers)), "^[0-9a-f]{10,}$");
assertRegex(KubernetesSlave.getSlaveName(new PodTemplate("image", volumes)), "^kubernetes-[0-9a-z]{5}$");
assertRegex(KubernetesSlave.getSlaveName(new PodTemplate("", volumes, containers)), "^kubernetes-[0-9a-z]{5}$");
assertRegex(KubernetesSlave.getSlaveName(new PodTemplate("a name", volumes, containers)),
("^a-name-[0-9a-f]{10,}$"));
("^a-name-[0-9a-z]{5}$"));
}

private void assertRegex(String name, String regex) {
Expand Down