Skip to content

Commit 760b4a6

Browse files
authored
Merge pull request #1305 from Dohbedoh/docs/templatenamefix
2 parents a468c4e + cc958ab commit 760b4a6

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
<p>
2+
<b>Name</b> of the podTemplate to inherit from.
3+
</p>
14
<p>
25
A podTemplate may or may not inherit from an existing template.<br/>
36
This means that the podTemplate will inherit node selector, service account, image pull secrets, containerTemplates and volumes from the template it inherits from.

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
~ See the License for the specific language governing permissions and
1414
~ limitations under the License.
1515
-->
16-
17-
The name prefix of the pod.
18-
Defaults to the label.
16+
<p>
17+
Name that identifies the pod template. Also used to prefix the name of the node and pod created.
18+
</p>
19+
<p>
20+
When omitted, the agent and pod name is randomly generated using <i>jenkins-agent-</i> as a prefix.
21+
When omitted <b>in a <i>podTemplate(...)</i> step</b>, the <i>label</i> is used as a prefix for the name of the dynamic pod template.
22+
</p>

0 commit comments

Comments
 (0)