From 1b0cea955daa6326fdd38823cd8d45a11a3d0bf9 Mon Sep 17 00:00:00 2001 From: Kuan-Po Tseng Date: Sun, 3 Dec 2023 22:18:02 +0800 Subject: [PATCH] [YUNIKORN-2229] Fix GetQueueNameFromPod default use root.default 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. --- 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 7b2827d81..529cd2e8a 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 c64eda7aa..ab4dbd1c8 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"