This is an automated email from the ASF dual-hosted git repository.
chenyulin0719 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 33bc097b3f [YUNIKORN-2890] fix broken table in "Labels and Annotations
in YuniKorn" page (#473)
33bc097b3f is described below
commit 33bc097b3fbbb6903fcb40c4c27d39bd48466cb1
Author: Ryan <[email protected]>
AuthorDate: Thu Sep 26 18:34:35 2024 +0800
[YUNIKORN-2890] fix broken table in "Labels and Annotations in YuniKorn"
page (#473)
Closes: #473
Signed-off-by: Yu-Lin Chen <[email protected]>
---
docs/user_guide/labels_and_annotations_in_yunikorn.md | 4 ++--
.../version-1.6.0/user_guide/labels_and_annotations_in_yunikorn.md | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/user_guide/labels_and_annotations_in_yunikorn.md
b/docs/user_guide/labels_and_annotations_in_yunikorn.md
index 890503f1a1..677b8ffb56 100644
--- a/docs/user_guide/labels_and_annotations_in_yunikorn.md
+++ b/docs/user_guide/labels_and_annotations_in_yunikorn.md
@@ -34,8 +34,8 @@ The non-canonical (legacy) representations will not be
deprecated and will conti
Label values should comply with [Kubernetes Syntax and character
set](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set).
| Name | Description
[...]
-| ---------------------------- |
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[...]
-| `yunikorn.apache.org/app-id` | Associates this pod with an application. This
is the canonical representation and it is recommended to use it.<br/><br/>The
priority of application ID is determined in the following order: <ol><li>Label
`yunikorn.apache.org/app-id`</li><li>Annotation
`yunikorn.apache.org/app-id`</li><li>Label `applicationId`</li><li>Label
`spark-app-selector`</li></ol>**Note**: Pods with inconsistent application
metadata will be rejected in 1.7.0. [...]
+| ---------------------------- |
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[...]
+| `yunikorn.apache.org/app-id` | Associates this pod with an application. This
is the canonical representation and it is recommended to use it.<br/><br/>The
priority of application ID is determined in the following order: <ol><li>Label
`yunikorn.apache.org/app-id`</li><li>Annotation
`yunikorn.apache.org/app-id`</li><li>Label `applicationId`</li><li>Label
`spark-app-selector`</li></ol>**Note**: Pods with inconsistent application
metadata will be rejected in 1.7.0. [...]
| `yunikorn.apache.org/queue` | Selects the YuniKorn queue this application
should be scheduled in. This is the canonical representation and it is
recommended to use it.<br/><br/>Queue name should comply with [Kubernetes
Syntax and character
set](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set)
and also with [Partition and Queue Configuration](queue_config#queues). This
may be ignored if a placement policy is in effect.<br/><br/>The pri [...]
| [LEGACY]<br/>`applicationId` | Equivalent to the preferred label
`yunikorn.apache.org/app-id`.
[...]
| [LEGACY]<br/>`queue` | Equivalent to the preferred label
`yunikorn.apache.org/queue`.
[...]
diff --git
a/versioned_docs/version-1.6.0/user_guide/labels_and_annotations_in_yunikorn.md
b/versioned_docs/version-1.6.0/user_guide/labels_and_annotations_in_yunikorn.md
index 890503f1a1..677b8ffb56 100644
---
a/versioned_docs/version-1.6.0/user_guide/labels_and_annotations_in_yunikorn.md
+++
b/versioned_docs/version-1.6.0/user_guide/labels_and_annotations_in_yunikorn.md
@@ -34,8 +34,8 @@ The non-canonical (legacy) representations will not be
deprecated and will conti
Label values should comply with [Kubernetes Syntax and character
set](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set).
| Name | Description
[...]
-| ---------------------------- |
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[...]
-| `yunikorn.apache.org/app-id` | Associates this pod with an application. This
is the canonical representation and it is recommended to use it.<br/><br/>The
priority of application ID is determined in the following order: <ol><li>Label
`yunikorn.apache.org/app-id`</li><li>Annotation
`yunikorn.apache.org/app-id`</li><li>Label `applicationId`</li><li>Label
`spark-app-selector`</li></ol>**Note**: Pods with inconsistent application
metadata will be rejected in 1.7.0. [...]
+| ---------------------------- |
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[...]
+| `yunikorn.apache.org/app-id` | Associates this pod with an application. This
is the canonical representation and it is recommended to use it.<br/><br/>The
priority of application ID is determined in the following order: <ol><li>Label
`yunikorn.apache.org/app-id`</li><li>Annotation
`yunikorn.apache.org/app-id`</li><li>Label `applicationId`</li><li>Label
`spark-app-selector`</li></ol>**Note**: Pods with inconsistent application
metadata will be rejected in 1.7.0. [...]
| `yunikorn.apache.org/queue` | Selects the YuniKorn queue this application
should be scheduled in. This is the canonical representation and it is
recommended to use it.<br/><br/>Queue name should comply with [Kubernetes
Syntax and character
set](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set)
and also with [Partition and Queue Configuration](queue_config#queues). This
may be ignored if a placement policy is in effect.<br/><br/>The pri [...]
| [LEGACY]<br/>`applicationId` | Equivalent to the preferred label
`yunikorn.apache.org/app-id`.
[...]
| [LEGACY]<br/>`queue` | Equivalent to the preferred label
`yunikorn.apache.org/queue`.
[...]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
