This is an automated email from the ASF dual-hosted git repository.
pbacsko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-k8shim.git
The following commit(s) were added to refs/heads/master by this push:
new b0e20383 [YUNIKORN-2229] Fix GetQueueNameFromPod default use
root.default (#742)
b0e20383 is described below
commit b0e20383f5440dda5f85a51bbf8474b84d0fa1af
Author: Kuan-Po Tseng <[email protected]>
AuthorDate: Mon Dec 4 16:03:15 2023 +0100
[YUNIKORN-2229] Fix GetQueueNameFromPod default use root.default (#742)
The default queue name for the admission controller is `root.default`
whereas in the GetQueueNameFromPod function on the shim side,
the default queue name used is `root.sandbox`. It is necessary to ensure
alignment between these two default queue names.
Closes: #742
Signed-off-by: Peter Bacsko <[email protected]>
---
pkg/admission/conf/am_conf.go | 2 +-
pkg/common/constants/constants.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/admission/conf/am_conf.go b/pkg/admission/conf/am_conf.go
index 7b2827d8..529cd2e8 100644
--- a/pkg/admission/conf/am_conf.go
+++ b/pkg/admission/conf/am_conf.go
@@ -73,7 +73,7 @@ const (
DefaultFilteringLabelNamespaces = ""
DefaultFilteringNoLabelNamespaces = ""
DefaultFilteringGenerateUniqueAppIds = false
- DefaultFilteringQueueName = "root.default"
+ DefaultFilteringQueueName = constants.ApplicationDefaultQueue
// access control defaults
DefaultAccessControlBypassAuth = false
diff --git a/pkg/common/constants/constants.go
b/pkg/common/constants/constants.go
index c64eda7a..ab4dbd1c 100644
--- a/pkg/common/constants/constants.go
+++ b/pkg/common/constants/constants.go
@@ -42,7 +42,7 @@ const RootQueue = "root"
const AnnotationQueueName = DomainYuniKorn + "queue"
const AnnotationParentQueue = DomainYuniKorn + "parentqueue"
const LabelDisableStateAware = "disableStateAware"
-const ApplicationDefaultQueue = "root.sandbox"
+const ApplicationDefaultQueue = "root.default"
const DefaultPartition = "default"
const AppTagNamespace = "namespace"
const AppTagNamespaceParentQueue = "namespace.parentqueue"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
