Skip to content

Commit

Permalink
webhook: supplement items for priority and QOS validation in clusterC…
Browse files Browse the repository at this point in the history 
…olocationProfile..

Signed-off-by: wangyang60 <[email protected]>
  • Loading branch information
@tan90github
tan90github committed Dec 30, 2024
1 parent e49c43d commit 7950140
Show file tree
Hide file tree
Showing 2 changed files with 182 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkg/webhook/pod/validating/cluster_colocation_profile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ 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.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, forbidSpecialQoSClassAndPriorityClass(newPod, extension.QoSSystem, extension.PriorityMid, extension.PriorityBatch, extension.PriorityFree)...)
allErrs = append(allErrs, validateResources(newPod)...)
err := allErrs.ToAggregate()
allowed := true
Expand Down
180 changes: 180 additions & 0 deletions pkg/webhook/pod/validating/cluster_colocation_profile_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,156 @@ func TestClusterColocationProfileValidatingPod(t *testing.T) {
},
wantAllowed: true,
},
{
name: "forbidden QoS and priorityClass combination: LSE And batch",
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.PriorityBatchValueMax),
Containers: []corev1.Container{
{
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("1"),
},
},
},
},
},
},
wantAllowed: false,
wantReason: `Pod: Forbidden: koordinator.sh/qosClass=LSE and priorityClass=koord-batch cannot be used in combination`,
},
{
name: "forbidden QoS and priorityClass combination: LSE And Mid",
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.PriorityMidValueMax),
Containers: []corev1.Container{
{
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("1"),
},
},
},
},
},
},
wantAllowed: false,
wantReason: `Pod: Forbidden: koordinator.sh/qosClass=LSE and priorityClass=koord-mid cannot be used in combination`,
},
{
name: "forbidden QoS and priorityClass combination: 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{
{
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("1"),
},
},
},
},
},
},
wantAllowed: false,
wantReason: `Pod: Forbidden: koordinator.sh/qosClass=LSE and priorityClass=koord-free cannot be used in combination`,
},
{
name: "forbidden QoS and priorityClass combination: SYSTEM And batch",
operation: admissionv1.Create,
newPod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
extension.LabelPodQoS: string(extension.QoSSystem),
},
},
Spec: corev1.PodSpec{
Priority: pointer.Int32(extension.PriorityBatchValueMax),
Containers: []corev1.Container{
{
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("1"),
},
},
},
},
},
},
wantAllowed: false,
wantReason: `Pod: Forbidden: koordinator.sh/qosClass=SYSTEM and priorityClass=koord-batch cannot be used in combination`,
},
{
name: "forbidden QoS and priorityClass combination: SYSTEM And Mid",
operation: admissionv1.Create,
newPod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
extension.LabelPodQoS: string(extension.QoSSystem),
},
},
Spec: corev1.PodSpec{
Priority: pointer.Int32(extension.PriorityMidValueMax),
Containers: []corev1.Container{
{
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("1"),
},
},
},
},
},
},
wantAllowed: false,
wantReason: `Pod: Forbidden: koordinator.sh/qosClass=SYSTEM and priorityClass=koord-mid cannot be used in combination`,
},
{
name: "forbidden QoS and priorityClass combination: SYSTEM And free",
operation: admissionv1.Create,
newPod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
extension.LabelPodQoS: string(extension.QoSSystem),
},
},
Spec: corev1.PodSpec{
Priority: pointer.Int32(extension.PriorityFreeValueMax),
Containers: []corev1.Container{
{
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("1"),
},
},
},
},
},
},
wantAllowed: false,
wantReason: `Pod: Forbidden: koordinator.sh/qosClass=SYSTEM 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 +593,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("4Gi"),
},
},
},
},
},
},
wantAllowed: true,
},
}

for _, tt := range tests {
Expand Down

0 comments on commit 7950140

Please sign in to comment.