mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-19 09:52:49 +00:00
Merge pull request #116215 from kannon92/comment-manual-selector
update documentation on generateSelector for manual selector case
This commit is contained in:
commit
2898a044d9
@ -211,9 +211,8 @@ func generateSelector(obj *batch.Job) {
|
||||
// a label.
|
||||
_, found := obj.Spec.Template.Labels["job-name"]
|
||||
if found {
|
||||
// User asked us to not automatically generate a selector and labels,
|
||||
// but set a possibly conflicting value. If there is a conflict,
|
||||
// we will reject in validation.
|
||||
// User asked us to automatically generate a selector, but set manual labels.
|
||||
// If there is a conflict, we will reject in validation.
|
||||
} else {
|
||||
obj.Spec.Template.Labels["job-name"] = string(obj.ObjectMeta.Name)
|
||||
}
|
||||
@ -221,9 +220,8 @@ func generateSelector(obj *batch.Job) {
|
||||
// only match this job.
|
||||
_, found = obj.Spec.Template.Labels["controller-uid"]
|
||||
if found {
|
||||
// User asked us to automatically generate a selector and labels,
|
||||
// but set a possibly conflicting value. If there is a conflict,
|
||||
// we will reject in validation.
|
||||
// User asked us to automatically generate a selector, but set manual labels.
|
||||
// If there is a conflict, we will reject in validation.
|
||||
} else {
|
||||
obj.Spec.Template.Labels["controller-uid"] = string(obj.ObjectMeta.UID)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user