Skip to content

Commit 4068c52

Browse files
author
aHenryJard
committed
[JENKINS-65398] some terminology changes.
1 parent 9cb5674 commit 4068c52

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesComputer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void doContainerLog(@QueryParameter String containerId,
143143

144144
@Override
145145
public String toString() {
146-
return String.format("KubernetesComputer name: %s slave: %s", getName(), getNode());
146+
return String.format("KubernetesComputer name: %s agent: %s", getName(), getNode());
147147
}
148148

149149
@Override

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesSlave.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,8 @@ protected void _terminate(TaskListener listener) throws IOException, Interrupted
341341
deleteSlavePod(listener, client);
342342
Metrics.metricRegistry().counter(MetricNames.PODS_TERMINATED).inc();
343343
} else {
344-
// Log warning, as the slave pod may still be running
345-
LOGGER.log(Level.WARNING, "Slave pod {0} was not deleted due to retention policy {1}.",
344+
// Log warning, as the agent pod may still be running
345+
LOGGER.log(Level.WARNING, "Agent pod {0} was not deleted due to retention policy {1}.",
346346
new Object[] { name, getPodRetention(cloud) });
347347
}
348348
String msg = String.format("Disconnected computer %s", name);
@@ -599,9 +599,9 @@ public Void call() throws IOException {
599599
if (e == null) {
600600
return null;
601601
}
602-
// Tell the slave JNLP agent to not attempt further reconnects.
602+
// Tell the JNLP agent to not attempt further reconnects.
603603
e.setNoReconnect(true);
604-
LOGGER.log(Level.INFO, "Disabled slave engine reconnects.");
604+
LOGGER.log(Level.INFO, "Disabled agent engine reconnects.");
605605
return null;
606606
}
607607

src/main/java/org/csanchez/jenkins/plugins/kubernetes/pod/retention/PodRetention.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import io.fabric8.kubernetes.api.model.Pod;
88

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

3636
/**
37-
* Determines if a slave pod should be deleted after the Jenkins build completes.
37+
* Determines if a agent pod should be deleted after the Jenkins build completes.
3838
*
39-
* @param cloud - the {@link KubernetesCloud} the slave pod belongs to.
39+
* @param cloud - the {@link KubernetesCloud} the agent pod belongs to.
4040
* @param pod - the {@link Pod} running the Jenkins build.
4141
*
42-
* @return <code>true</code> if the slave pod should be deleted.
42+
* @return <code>true</code> if the agent pod should be deleted.
4343
*/
4444
public abstract boolean shouldDeletePod(KubernetesCloud cloud, Pod pod);
4545

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud/config_zh_CN.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Concurrency\ Limit=\u5BB9\u5668\u6570\u91CF
3636
Apply\ cap\ only\ on\ alive\ pods=\u7528\u4E8E\u6D3B\u8DC3\u7684 Pod
3737
Max\ connections\ to\ Kubernetes\ API=\u8FDE\u63A5 Kubernetes API \u7684\u6700\u5927\u8FDE\u63A5\u6570
3838
Container\ Cleanup\ Timeout\ (minutes)=\u5BB9\u5668\u8D85\u65F6\uFF08\u5206\uFF09
39-
Transfer\ proxy\ related\ environment\ variables\ from\ master\ to\ agent=\u4ECE master \u4F20\u9012\u7ED9 agent \u7684\u73AF\u5883\u53D8\u91CF
39+
Transfer\ proxy\ related\ environment\ variables\ from\ controller\ to\ agent=\u4ECE controller \u4F20\u9012\u7ED9 agent \u7684\u73AF\u5883\u53D8\u91CF
4040
Defaults\ Provider\ Template\ Name=\u9ED8\u8BA4\u63D0\u4F9B\u7684\u6A21\u677F\u540D\u79F0
4141
Images=\u955C\u50CF
4242
List\ of\ Images\ to\ be\ launched\ as\ agents=\u4F5C\u4E3A\u4EE3\u7406\u542F\u52A8\u7684\u955C\u50CF\u5217\u8868

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/PodTemplate/config.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
deleteCaption="${%Delete Volume}" />
4646
</f:entry>
4747

48-
<f:entry field="annotations" title="${%Annotations}" description="${%List of annotations to set in slave pod}">
48+
<f:entry field="annotations" title="${%Annotations}" description="${%List of annotations to set in agent pod}">
4949
<f:repeatableHeteroProperty field="annotations" hasHeader="true" addCaption="${%Add Annotation}"
5050
deleteCaption="${%Delete annotation Variable}" />
5151
</f:entry>

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/PodTemplate/help-podRetention.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
The following retention policies are provided:
66
</p>
77
<ol>
8-
<li>Always - always keep the slave pod.</li>
8+
<li>Always - always keep the agent pod.</li>
99
<li>Default - use the Pod Retention setting for the plugin.</li>
10-
<li>Never - always delete the slave pod.</li>
11-
<li>On Failure - keep the slave pod if it fails during the build.</li>
10+
<li>Never - always delete the agent pod.</li>
11+
<li>On Failure - keep the agent pod if it fails during the build.</li>
1212
</ol>
1313
<p>
1414
<strong>Note:</strong> Kubernetes administrators are responsible for managing any kept agent pod.

0 commit comments

Comments
 (0)