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

Default podTemplate slaveConnectTimeout to 100 #235

Merged
merged 1 commit into from
Oct 12, 2017
Merged

Default podTemplate slaveConnectTimeout to 100 #235

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
2 changes: 1 addition & 1 deletion src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class PodTemplate extends AbstractDescribableImpl<PodTemplate> implements

private static final Logger LOGGER = Logger.getLogger(PodTemplate.class.getName());

private static final int DEFAULT_SLAVE_JENKINS_CONNECTION_TIMEOUT = 100;
public static final int DEFAULT_SLAVE_JENKINS_CONNECTION_TIMEOUT = 100;

private String inheritFrom;

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/PodTemplateStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate;
import org.csanchez.jenkins.plugins.kubernetes.PodAnnotation;
import org.csanchez.jenkins.plugins.kubernetes.PodTemplate;
import org.csanchez.jenkins.plugins.kubernetes.model.TemplateEnvVar;
import org.csanchez.jenkins.plugins.kubernetes.volumes.PodVolume;
import org.csanchez.jenkins.plugins.kubernetes.volumes.workspace.WorkspaceVolume;
Expand Down Expand Up @@ -47,7 +48,7 @@ public class PodTemplateStep extends Step implements Serializable {

private int instanceCap = Integer.MAX_VALUE;
private int idleMinutes;
private int slaveConnectTimeout;
private int slaveConnectTimeout = PodTemplate.DEFAULT_SLAVE_JENKINS_CONNECTION_TIMEOUT;

private String serviceAccount;
private String nodeSelector;
Expand Down