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.

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

[JENKINS-50268] instanceCap reached with preexisting pods #325

Merged
merged 1 commit into from May 24, 2018
Merged

Conversation

@carlossg
Copy link
Contributor

@carlossg carlossg commented May 22, 2018

because labels are empty

Supersedes #322 #320

because labels are empty
@carlossg carlossg merged commit aa3b0ed into master May 24, 2018
1 check passed
1 check passed
continuous-integration/jenkins/branch This commit looks good
Details
@carlossg carlossg deleted the JENKINS-50268 branch May 24, 2018
@@ -325,9 +325,15 @@ public int getConnectTimeout() {
* Labels for all pods started by the plugin
*/
public Map<String, String> getLabels() {
return labels == null ? Collections.emptyMap() : labels;
return labels == null || labels.isEmpty() ? DEFAULT_POD_LABELS : labels;

This comment has been minimized.

@Vlatombe

Vlatombe May 25, 2018
Member

Given the current value of DEFAULT_POD_LABELS, the problem would be the same if you have several Jenkins instances running in the same namespace.

Maybe the DEFAULT_POD_LABELS should contain a reference to the current Jenkins instance (root url?) and cloud name in order to disambiguate.

This comment has been minimized.

@carlossg

carlossg May 25, 2018
Author Contributor

sounds like a good improvement :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.