Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

webhook: supplement items for priority and QOS validation in clusterColocationProfile. #2270

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

webhook: supplement items for priority and QOS validation in clusterColocationProfile. #2270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/webhook/pod/validating/cluster_colocation_profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ func (h *PodValidatingHandler) clusterColocationProfileValidatingPod(ctx context

allErrs = append(allErrs, validateRequiredQoSClass(newPod)...)
allErrs = append(allErrs, forbidSpecialQoSClassAndPriorityClass(newPod, extension.QoSBE, extension.PriorityNone, extension.PriorityProd)...)
allErrs = append(allErrs, forbidSpecialQoSClassAndPriorityClass(newPod, extension.QoSLS, extension.PriorityNone, extension.PriorityBatch, extension.PriorityFree)...)
allErrs = append(allErrs, forbidSpecialQoSClassAndPriorityClass(newPod, extension.QoSLSR, extension.PriorityNone, extension.PriorityMid, extension.PriorityBatch, extension.PriorityFree)...)
allErrs = append(allErrs, forbidSpecialQoSClassAndPriorityClass(newPod, extension.QoSLSE, extension.PriorityNone, extension.PriorityMid, extension.PriorityBatch, extension.PriorityFree)...)
allErrs = append(allErrs, validateResources(newPod)...)
err := allErrs.ToAggregate()
allowed := true
Expand Down
101 changes: 100 additions & 1 deletion pkg/webhook/pod/validating/cluster_colocation_profile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,19 @@ func TestClusterColocationProfileValidatingPod(t *testing.T) {
extension.LabelPodQoS: string(extension.QoSLS),
},
},
Spec: corev1.PodSpec{
Priority: pointer.Int32(extension.PriorityMidValueMin),
},
},
oldPod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
extension.LabelPodQoS: string(extension.QoSBE),
},
},
Spec: corev1.PodSpec{
Priority: pointer.Int32(extension.PriorityMidValueMin),
},
},
wantAllowed: false,
wantReason: `labels.koordinator.sh/qosClass: Invalid value: "LS": field is immutable`,
Expand Down Expand Up @@ -355,7 +361,7 @@ func TestClusterColocationProfileValidatingPod(t *testing.T) {
wantReason: `Pod: Forbidden: koordinator.sh/qosClass=LSR and priorityClass=koord-free cannot be used in combination`,
},
{
name: "validate resources - LSR And Prod",
name: "validate resources - LS And Prod",
operation: admissionv1.Create,
newPod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -383,6 +389,69 @@ func TestClusterColocationProfileValidatingPod(t *testing.T) {
},
wantAllowed: true,
},
{
name: "forbidden resources - LS And Batch",
operation: admissionv1.Create,
newPod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
extension.LabelPodQoS: string(extension.QoSLS),
},
},
Spec: corev1.PodSpec{
Priority: pointer.Int32(extension.PriorityBatchValueMax),
},
},
wantAllowed: false,
wantReason: `Pod: Forbidden: koordinator.sh/qosClass=LS and priorityClass=koord-batch cannot be used in combination`,
},
{
name: "forbidden resources - LS And Free",
operation: admissionv1.Create,
newPod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
extension.LabelPodQoS: string(extension.QoSLS),
},
},
Spec: corev1.PodSpec{
Priority: pointer.Int32(extension.PriorityFreeValueMax),
},
},
wantAllowed: false,
wantReason: `Pod: Forbidden: koordinator.sh/qosClass=LS and priorityClass=koord-free cannot be used in combination`,
},
{
name: "forbidden resources - LSE And Free",
operation: admissionv1.Create,
newPod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
extension.LabelPodQoS: string(extension.QoSLSE),
},
},
Spec: corev1.PodSpec{
Priority: pointer.Int32(extension.PriorityFreeValueMax),
Containers: []corev1.Container{
{
Name: "test-container-skip",
Resources: corev1.ResourceRequirements{
Limits: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("1000m"),
corev1.ResourceMemory: resource.MustParse("4Gi"),
},
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("1000m"),
corev1.ResourceMemory: resource.MustParse("0Gi"),
},
},
},
},
},
},
wantAllowed: false,
wantReason: `Pod: Forbidden: koordinator.sh/qosClass=LSE and priorityClass=koord-free cannot be used in combination`,
},
{
name: "forbidden resources - LSR And Prod: unset CPUs",
operation: admissionv1.Create,
Expand Down Expand Up @@ -443,6 +512,36 @@ func TestClusterColocationProfileValidatingPod(t *testing.T) {
wantAllowed: false,
wantReason: `pod.spec.containers[*].resources.requests: Invalid value: "100m": the requested CPUs of LSR Pod must be integer`,
},
{
name: "validate resources - LSE And Prod",
operation: admissionv1.Create,
newPod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
extension.LabelPodQoS: string(extension.QoSLSE),
},
},
Spec: corev1.PodSpec{
Priority: pointer.Int32(extension.PriorityProdValueMax),
Containers: []corev1.Container{
{
Name: "test-container-skip",
Resources: corev1.ResourceRequirements{
Limits: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("1000m"),
corev1.ResourceMemory: resource.MustParse("4Gi"),
},
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("1000m"),
corev1.ResourceMemory: resource.MustParse("0Gi"),
},
},
},
},
},
},
wantAllowed: true,
},
}

for _, tt := range tests {
Expand Down