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.

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

webhook: add node affinity for pod when MultiQuotaTree on #1864

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions pkg/util/fieldindex/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,18 @@ var indexDescriptors = []fieldIndexDescriptor{
return extension.GetAnnotationQuotaNamespaces(eq)
},
},
{
description: "index elastic quota by name",
obj: &apiv1alpha1.ElasticQuota{},
field: "metadata.name",
indexerFunc: func(obj client.Object) []string {
eq, ok := obj.(*apiv1alpha1.ElasticQuota)
if !ok {
return []string{}
}
return []string{eq.Name}
},
},
}

func RegisterFieldIndexes(c cache.Cache) error {
Expand Down
149 changes: 149 additions & 0 deletions pkg/webhook/pod/mutating/multi_quota_tree_affinity.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
/*
Copyright 2022 The Koordinator Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package mutating

import (
"context"

admissionv1 "k8s.io/api/admission/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
schedulingv1alpha1 "sigs.k8s.io/scheduler-plugins/pkg/apis/scheduling/v1alpha1"

"github.com/koordinator-sh/koordinator/apis/extension"
quotav1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1"
"github.com/koordinator-sh/koordinator/pkg/features"
utilclient "github.com/koordinator-sh/koordinator/pkg/util/client"
utilfeature "github.com/koordinator-sh/koordinator/pkg/util/feature"
)

func (h *PodMutatingHandler) addNodeAffinityForMultiQuotaTree(ctx context.Context, req admission.Request, pod *corev1.Pod) error {
if req.Operation != admissionv1.Create {
return nil
}

if !utilfeature.DefaultFeatureGate.Enabled(features.MultiQuotaTree) {
return nil
}

quotaName := extension.GetQuotaName(pod)
quota := &schedulingv1alpha1.ElasticQuota{}
if quotaName == "" {
err := h.Client.Get(ctx, types.NamespacedName{Namespace: pod.Namespace, Name: pod.Namespace}, quota)
if err != nil {
if errors.IsNotFound(err) {
return nil
}
return err
}
} else {
quotaList := &schedulingv1alpha1.ElasticQuotaList{}
err := h.Client.List(ctx, quotaList, &client.ListOptions{
FieldSelector: fields.OneTermEqualSelector("metadata.name", quotaName),
}, utilclient.DisableDeepCopy)
if err != nil {
return err
}
if len(quotaList.Items) == 0 {
return nil
}
quota = &quotaList.Items[0]
}

treeID := extension.GetQuotaTreeID(quota)
if treeID == "" {
return nil
}

profileList := &quotav1alpha1.ElasticQuotaProfileList{}
err := h.Client.List(ctx, profileList, &client.ListOptions{
LabelSelector: labels.SelectorFromSet(map[string]string{extension.LabelQuotaTreeID: treeID}),
}, utilclient.DisableDeepCopy)
if err != nil {
return err
}

if len(profileList.Items) == 0 {
return nil
}

nodeSelector := profileList.Items[0].Spec.NodeSelector
if nodeSelector == nil {
return nil
}

requirements := convertNodeSelectorToNodeSelectorRequirements(nodeSelector)

affinity := pod.Spec.Affinity
if affinity == nil {
affinity = &corev1.Affinity{}
pod.Spec.Affinity = affinity
}

nodeAffinity := affinity.NodeAffinity
if nodeAffinity == nil {
nodeAffinity = &corev1.NodeAffinity{}
affinity.NodeAffinity = nodeAffinity
}

required := nodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution
if required == nil {
required = &corev1.NodeSelector{}
nodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution = required
}

for i, term := range required.NodeSelectorTerms {
term.MatchExpressions = append(term.MatchExpressions, requirements...)
required.NodeSelectorTerms[i] = term
}

if len(required.NodeSelectorTerms) == 0 {
required.NodeSelectorTerms = []corev1.NodeSelectorTerm{
{
MatchExpressions: requirements,
},
}
}

return nil
}

func convertNodeSelectorToNodeSelectorRequirements(nodeSelector *metav1.LabelSelector) []corev1.NodeSelectorRequirement {
requirements := make([]corev1.NodeSelectorRequirement, 0, len(nodeSelector.MatchLabels)+len(nodeSelector.MatchExpressions))
for k, v := range nodeSelector.MatchLabels {
requirements = append(requirements, corev1.NodeSelectorRequirement{
Key: k,
Operator: corev1.NodeSelectorOpIn,
Values: []string{v},
})
}
for _, expression := range nodeSelector.MatchExpressions {
requirements = append(requirements, corev1.NodeSelectorRequirement{
Key: expression.Key,
Operator: corev1.NodeSelectorOperator(string(expression.Operator)),
Values: expression.Values,
})
}

return requirements
}
Loading