Skip to content

Commit 1613606

Browse files
authored
Merge pull request #32774 from miteshskj/daemonset-review
Remove stale information about pod selector.
2 parents d63dbd7 + 1eca303 commit 1613606

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

content/en/docs/concepts/workloads/controllers/daemonset.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ A Pod Template in a DaemonSet must have a [`RestartPolicy`](/docs/concepts/workl
7676
The `.spec.selector` field is a pod selector. It works the same as the `.spec.selector` of
7777
a [Job](/docs/concepts/workloads/controllers/job/).
7878

79-
As of Kubernetes 1.8, you must specify a pod selector that matches the labels of the
80-
`.spec.template`. The pod selector will no longer be defaulted when left empty. Selector
81-
defaulting was not compatible with `kubectl apply`. Also, once a DaemonSet is created,
79+
You must specify a pod selector that matches the labels of the
80+
`.spec.template`.
81+
Also, once a DaemonSet is created,
8282
its `.spec.selector` can not be mutated. Mutating the pod selector can lead to the
8383
unintentional orphaning of Pods, and it was found to be confusing to users.
8484

@@ -91,8 +91,8 @@ The `.spec.selector` is an object consisting of two fields:
9191

9292
When the two are specified the result is ANDed.
9393

94-
If the `.spec.selector` is specified, it must match the `.spec.template.metadata.labels`.
95-
Config with these not matching will be rejected by the API.
94+
The `.spec.selector` must match the `.spec.template.metadata.labels`.
95+
Config with these two not matching will be rejected by the API.
9696

9797
### Running Pods on select Nodes
9898

0 commit comments

Comments
 (0)