Skip to content

Commit

Permalink
[JENKINS-65398] some terminology changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
aHenryJard committed May 18, 2021
1 parent 9cb5674 commit 4068c52
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public void doContainerLog(@QueryParameter String containerId,

@Override
public String toString() {
return String.format("KubernetesComputer name: %s slave: %s", getName(), getNode());
return String.format("KubernetesComputer name: %s agent: %s", getName(), getNode());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@ protected void _terminate(TaskListener listener) throws IOException, Interrupted
deleteSlavePod(listener, client);
Metrics.metricRegistry().counter(MetricNames.PODS_TERMINATED).inc();
} else {
// Log warning, as the slave pod may still be running
LOGGER.log(Level.WARNING, "Slave pod {0} was not deleted due to retention policy {1}.",
// Log warning, as the agent pod may still be running
LOGGER.log(Level.WARNING, "Agent pod {0} was not deleted due to retention policy {1}.",
new Object[] { name, getPodRetention(cloud) });
}
String msg = String.format("Disconnected computer %s", name);
Expand Down Expand Up @@ -599,9 +599,9 @@ public Void call() throws IOException {
if (e == null) {
return null;
}
// Tell the slave JNLP agent to not attempt further reconnects.
// Tell the JNLP agent to not attempt further reconnects.
e.setNoReconnect(true);
LOGGER.log(Level.INFO, "Disabled slave engine reconnects.");
LOGGER.log(Level.INFO, "Disabled agent engine reconnects.");
return null;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import io.fabric8.kubernetes.api.model.Pod;

/**
* <code>PodRetention</code> instances determine if the Kubernetes pod running a Jenkins slave
* should be deleted after Jenkins terminates the slave.
* <code>PodRetention</code> instances determine if the Kubernetes pod running a Jenkins agent
* should be deleted after Jenkins terminates the agent.
*
* <p>Custom pod retention behavior can be added by extending this class, including a descriptor
* that extends {@link PodRetentionDescriptor}</p>
Expand All @@ -34,12 +34,12 @@ public static PodRetention getPodTemplateDefault() {
}

/**
* Determines if a slave pod should be deleted after the Jenkins build completes.
* Determines if a agent pod should be deleted after the Jenkins build completes.
*
* @param cloud - the {@link KubernetesCloud} the slave pod belongs to.
* @param cloud - the {@link KubernetesCloud} the agent pod belongs to.
* @param pod - the {@link Pod} running the Jenkins build.
*
* @return <code>true</code> if the slave pod should be deleted.
* @return <code>true</code> if the agent pod should be deleted.
*/
public abstract boolean shouldDeletePod(KubernetesCloud cloud, Pod pod);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Concurrency\ Limit=\u5BB9\u5668\u6570\u91CF
Apply\ cap\ only\ on\ alive\ pods=\u7528\u4E8E\u6D3B\u8DC3\u7684 Pod
Max\ connections\ to\ Kubernetes\ API=\u8FDE\u63A5 Kubernetes API \u7684\u6700\u5927\u8FDE\u63A5\u6570
Container\ Cleanup\ Timeout\ (minutes)=\u5BB9\u5668\u8D85\u65F6\uFF08\u5206\uFF09
Transfer\ proxy\ related\ environment\ variables\ from\ master\ to\ agent=\u4ECE master \u4F20\u9012\u7ED9 agent \u7684\u73AF\u5883\u53D8\u91CF
Transfer\ proxy\ related\ environment\ variables\ from\ controller\ to\ agent=\u4ECE controller \u4F20\u9012\u7ED9 agent \u7684\u73AF\u5883\u53D8\u91CF
Defaults\ Provider\ Template\ Name=\u9ED8\u8BA4\u63D0\u4F9B\u7684\u6A21\u677F\u540D\u79F0
Images=\u955C\u50CF
List\ of\ Images\ to\ be\ launched\ as\ agents=\u4F5C\u4E3A\u4EE3\u7406\u542F\u52A8\u7684\u955C\u50CF\u5217\u8868
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
deleteCaption="${%Delete Volume}" />
</f:entry>

<f:entry field="annotations" title="${%Annotations}" description="${%List of annotations to set in slave pod}">
<f:entry field="annotations" title="${%Annotations}" description="${%List of annotations to set in agent pod}">
<f:repeatableHeteroProperty field="annotations" hasHeader="true" addCaption="${%Add Annotation}"
deleteCaption="${%Delete annotation Variable}" />
</f:entry>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
The following retention policies are provided:
</p>
<ol>
<li>Always - always keep the slave pod.</li>
<li>Always - always keep the agent pod.</li>
<li>Default - use the Pod Retention setting for the plugin.</li>
<li>Never - always delete the slave pod.</li>
<li>On Failure - keep the slave pod if it fails during the build.</li>
<li>Never - always delete the agent pod.</li>
<li>On Failure - keep the agent pod if it fails during the build.</li>
</ol>
<p>
<strong>Note:</strong> Kubernetes administrators are responsible for managing any kept agent pod.
Expand Down

0 comments on commit 4068c52

Please sign in to comment.