This is an automated email from the ASF dual-hosted git repository.
ccondit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-site.git
The following commit(s) were added to refs/heads/master by this push:
new 20e9dfaecf [YUNIKORN-1884] Fix allow-preemption documentation (#325)
20e9dfaecf is described below
commit 20e9dfaecf0ea94c78e55482185c487236439c65
Author: Frank Yang <[email protected]>
AuthorDate: Tue Aug 22 12:36:42 2023 -0500
[YUNIKORN-1884] Fix allow-preemption documentation (#325)
Closes: #325
Signed-off-by: Craig Condit <[email protected]>
---
docs/user_guide/labels_and_annotations_in_yunikorn.md | 2 +-
.../current/user_guide/labels_and_annotations_in_yunikorn.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/user_guide/labels_and_annotations_in_yunikorn.md
b/docs/user_guide/labels_and_annotations_in_yunikorn.md
index d85cda8999..a09051e107 100644
--- a/docs/user_guide/labels_and_annotations_in_yunikorn.md
+++ b/docs/user_guide/labels_and_annotations_in_yunikorn.md
@@ -44,7 +44,7 @@ All annotations are under the namespace
`yunikorn.apache.org`. For example `yuni
| `task-groups` | Defines the set of task groups for
this application for gang scheduling. Each pod within an application must
define all task groups.
|
| `schedulingPolicyParameters` | Arbitrary key-value pairs used to
customize scheduling policies such as gang scheduling.
|
| `placeholder` | Set if this pod represents a
placeholder for gang scheduling. Set internally by YuniKorn.
|
-| `allow-preemption` | The `allow-preemption` annotation can
only be set on the PriorityClass object. It will trigger opt out of preemption
for pods with that specific priority class. Further details can be found in the
[DaemonSet Scheduling using Simple Preemptor](./../design/simple_preemptor)
documentation. |
+| `allow-preemption` | The `allow-preemption` annotation can
be set on the Pod or PriorityClass object. The annotation in Pod takes priority
over PriorityClass. It will trigger opt out of preemption for pods. Further
details can be found in the [DaemonSet Scheduling using Simple
Preemptor](./../design/simple_preemptor) documentation. |
| `parentqueue` | Define a parent queue for a set of K8s
namespaces. Further details can be found in the [ Resource Quota
Management](resource_quota_management#parent-queue-mapping-for-namespaces)
documentation.
|
| `namespace.quota` | Set the maximum capacity of the queue
mapped to this namespace. Further details can be found in the [ Resource Quota
Management](resource_quota_management#namespace-quota) documentation.
|
| [DEPRECATED] `namespace.max.cpu` | Replaced with ``namespace.quota``
since version 1.2.0
|
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/current/user_guide/labels_and_annotations_in_yunikorn.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/current/user_guide/labels_and_annotations_in_yunikorn.md
index 0c9b1124f0..5f18f10153 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/current/user_guide/labels_and_annotations_in_yunikorn.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/current/user_guide/labels_and_annotations_in_yunikorn.md
@@ -44,7 +44,7 @@ All annotations are under the namespace
`yunikorn.apache.org`. For example `yuni
| `task-groups` | Defines the set of task groups for
this application for gang scheduling. Each pod within an application must
define all task groups.
|
| `schedulingPolicyParameters` | Arbitrary key-value pairs used to
customize scheduling policies such as gang scheduling.
|
| `placeholder` | Set if this pod represents a
placeholder for gang scheduling. Set internally by YuniKorn.
|
-| `allow-preemption` | The `allow-preemption` annotation can
only be set on the PriorityClass object. It will trigger opt out of preemption
for pods with that specific priority class. Further details can be found in the
[DaemonSet Scheduling using Simple Preemptor](./../design/simple_preemptor)
documentation. |
+| `allow-preemption` | The `allow-preemption` annotation can
be set on the Pod or PriorityClass object. The annotation in Pod takes priority
over PriorityClass. It will trigger opt out of preemption for pods. Further
details can be found in the [DaemonSet Scheduling using Simple
Preemptor](./../design/simple_preemptor) documentation. |
| `parentqueue` | Define a parent queue for a set of K8s
namespaces. Further details can be found in the [ Resource Quota
Management](resource_quota_management#parent-queue-mapping-for-namespaces)
documentation.
|
| `namespace.quota` | Set the maximum capacity of the queue
mapped to this namespace. Further details can be found in the [ Resource Quota
Management](resource_quota_management#namespace-quota) documentation.
|
| [DEPRECATED] `namespace.max.cpu` | Replaced with ``namespace.quota``
since version 1.2.0
|
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
