diff options
| author | Kubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com> | 2017-11-02 10:54:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-02 10:54:20 -0700 |
| commit | f20180cb62b8a69e334a4786a0d8afd13498c2c8 (patch) | |
| tree | 3790d1181b089755a80bc6b1073ab47c26bc943c | |
| parent | 1d55df081e7950fe74783a4acf421826a969e98c (diff) | |
| parent | 6fbcec0b28745e2eb59473ba440378ec5fe9a340 (diff) | |
Merge pull request #1320 from xuhuilong/patch-1
Automatic merge from submit-queue.
Typo error.
| -rw-r--r-- | contributors/design-proposals/apps/daemonset-update.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contributors/design-proposals/apps/daemonset-update.md b/contributors/design-proposals/apps/daemonset-update.md index 1fb8f75b..aea7e244 100644 --- a/contributors/design-proposals/apps/daemonset-update.md +++ b/contributors/design-proposals/apps/daemonset-update.md @@ -202,7 +202,7 @@ For each pending DaemonSet updates, it will: - The history will be labeled with `DefaultDaemonSetUniqueLabelKey`. - DaemonSet controller will add a ControllerRef in the history `.ownerReferences`. - - Current history should have the largest `.revision` number amonst all + - Current history should have the largest `.revision` number amongst all existing history. Update `.revision` if it's not (e.g. after a rollback.) - If more than one current history is found, remove duplicates and relabel their pods' `DefaultDaemonSetUniqueLabelKey`. |