-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #329 from wangweizZZ/main
feature: support pod convert
- Loading branch information
Showing
8 changed files
with
302 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package convertpolicy | ||
|
|
||
| import ( | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/labels" | ||
|
|
||
| kosmosv1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1" | ||
| ) | ||
|
|
||
| // GetMatchPodConvertPolicy returns the PodConvertPolicies matching label selector | ||
| func GetMatchPodConvertPolicy(policies kosmosv1alpha1.PodConvertPolicyList, podLabels map[string]string, nodeLabels map[string]string) ([]kosmosv1alpha1.PodConvertPolicy, error) { | ||
| matched := make([]kosmosv1alpha1.PodConvertPolicy, 0) | ||
|
|
||
| var podSelector, nodeSelector labels.Selector | ||
| var err error | ||
| for _, po := range policies.Items { | ||
| spec := po.Spec | ||
| podSelector, err = metav1.LabelSelectorAsSelector(&spec.LabelSelector) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if !podSelector.Matches(labels.Set(podLabels)) { | ||
| continue | ||
| } | ||
|
|
||
| if spec.LeafNodeSelector == nil { | ||
| // matches all leafNode. | ||
| nodeSelector = labels.Everything() | ||
| } else { | ||
| if nodeSelector, err = metav1.LabelSelectorAsSelector(spec.LeafNodeSelector); err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| if !nodeSelector.Matches(labels.Set(nodeLabels)) { | ||
| continue | ||
| } | ||
|
|
||
| matched = append(matched, po) | ||
| } | ||
| return matched, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| package podutils | ||
|
|
||
| import ( | ||
| corev1 "k8s.io/api/core/v1" | ||
| "k8s.io/klog" | ||
|
|
||
| kosmosv1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1" | ||
| "github.com/kosmos.io/kosmos/pkg/utils" | ||
| ) | ||
|
|
||
| // ConvertPod perform all conversions | ||
| func ConvertPod(pod *corev1.Pod, policies []kosmosv1alpha1.PodConvertPolicy) { | ||
| if len(policies) <= 0 { | ||
| return | ||
| } | ||
|
|
||
| var choose *kosmosv1alpha1.PodConvertPolicy | ||
| // current, use the first non-empty matching policy | ||
| for idx, po := range policies { | ||
| if po.Spec.Converters != nil { | ||
| choose = &policies[idx] | ||
| break | ||
| } | ||
| } | ||
| if choose == nil { | ||
| return | ||
| } | ||
| klog.V(4).Infof("Convert pod %v/%+v, policy: %s", pod.Namespace, pod.Name, choose.Name) | ||
|
|
||
| converters := choose.Spec.Converters | ||
| convertSchedulerName(pod, converters.SchedulerNameConverter) | ||
| convertNodeName(pod, converters.NodeNameConverter) | ||
| convertNodeSelector(pod, converters.NodeSelectorConverter) | ||
| converToleration(pod, converters.TolerationConverter) | ||
| convertAffinity(pod, converters.AffinityConverter) | ||
| convertTopologySpreadConstraints(pod, converters.TopologySpreadConstraintsConverter) | ||
|
|
||
| pod.Annotations[utils.KosmosConvertLabels] = choose.Name | ||
| } | ||
|
|
||
| func convertSchedulerName(pod *corev1.Pod, converter *kosmosv1alpha1.SchedulerNameConverter) { | ||
| if converter == nil { | ||
| return | ||
| } | ||
|
|
||
| switch converter.ConvertType { | ||
| case kosmosv1alpha1.Add: | ||
| if pod.Spec.SchedulerName == "" { | ||
| pod.Spec.SchedulerName = converter.SchedulerName | ||
| } | ||
| case kosmosv1alpha1.Remove: | ||
| pod.Spec.SchedulerName = "" | ||
| case kosmosv1alpha1.Replace: | ||
| pod.Spec.SchedulerName = converter.SchedulerName | ||
| default: | ||
| klog.Warningf("Skip other convert type, SchedulerName: %s", converter.ConvertType) | ||
| } | ||
| } | ||
|
|
||
| func convertNodeName(pod *corev1.Pod, converter *kosmosv1alpha1.NodeNameConverter) { | ||
| if converter == nil { | ||
| return | ||
| } | ||
|
|
||
| switch converter.ConvertType { | ||
| case kosmosv1alpha1.Add: | ||
| if pod.Spec.NodeName == "" { | ||
| pod.Spec.NodeName = converter.NodeName | ||
| } | ||
| case kosmosv1alpha1.Remove: | ||
| pod.Spec.NodeName = "" | ||
| case kosmosv1alpha1.Replace: | ||
| pod.Spec.NodeName = converter.NodeName | ||
| default: | ||
| klog.Warningf("Skip other convert type, NodeName: %s", converter.ConvertType) | ||
| } | ||
| } | ||
|
|
||
| func converToleration(pod *corev1.Pod, conveter *kosmosv1alpha1.TolerationConverter) { | ||
| if conveter == nil { | ||
| return | ||
| } | ||
|
|
||
| switch conveter.ConvertType { | ||
| case kosmosv1alpha1.Add: | ||
| if pod.Spec.Tolerations == nil { | ||
| pod.Spec.Tolerations = conveter.Tolerations | ||
| } | ||
| case kosmosv1alpha1.Remove: | ||
| pod.Spec.Tolerations = nil | ||
| case kosmosv1alpha1.Replace: | ||
| pod.Spec.Tolerations = conveter.Tolerations | ||
| default: | ||
| klog.Warningf("Skip other convert type, Tolerations: %s", conveter.ConvertType) | ||
| } | ||
| } | ||
|
|
||
| func convertNodeSelector(pod *corev1.Pod, converter *kosmosv1alpha1.NodeSelectorConverter) { | ||
| if converter == nil { | ||
| return | ||
| } | ||
|
|
||
| switch converter.ConvertType { | ||
| case kosmosv1alpha1.Add: | ||
| if pod.Spec.NodeSelector == nil { | ||
| pod.Spec.NodeSelector = converter.NodeSelector | ||
| } | ||
| case kosmosv1alpha1.Remove: | ||
| pod.Spec.NodeSelector = nil | ||
| case kosmosv1alpha1.Replace: | ||
| pod.Spec.NodeSelector = converter.NodeSelector | ||
| default: | ||
| klog.Warningf("Skip other convert type, NodeSelector: %s", converter.ConvertType) | ||
| } | ||
| } | ||
|
|
||
| func convertAffinity(pod *corev1.Pod, converter *kosmosv1alpha1.AffinityConverter) { | ||
| if converter == nil { | ||
| return | ||
| } | ||
|
|
||
| switch converter.ConvertType { | ||
| case kosmosv1alpha1.Add: | ||
| if pod.Spec.Affinity == nil { | ||
| pod.Spec.Affinity = converter.Affinity | ||
| } | ||
| case kosmosv1alpha1.Remove: | ||
| pod.Spec.Affinity = nil | ||
| case kosmosv1alpha1.Replace: | ||
| pod.Spec.Affinity = converter.Affinity | ||
| default: | ||
| klog.Warningf("Skip other convert type, Affinity: %s", converter.ConvertType) | ||
| } | ||
| } | ||
|
|
||
| func convertTopologySpreadConstraints(pod *corev1.Pod, converter *kosmosv1alpha1.TopologySpreadConstraintsConverter) { | ||
| if converter == nil { | ||
| return | ||
| } | ||
|
|
||
| switch converter.ConvertType { | ||
| case kosmosv1alpha1.Add: | ||
| if pod.Spec.Affinity == nil { | ||
| pod.Spec.TopologySpreadConstraints = converter.TopologySpreadConstraints | ||
| } | ||
| case kosmosv1alpha1.Remove: | ||
| pod.Spec.TopologySpreadConstraints = nil | ||
| case kosmosv1alpha1.Replace: | ||
| pod.Spec.TopologySpreadConstraints = converter.TopologySpreadConstraints | ||
| default: | ||
| klog.Warningf("Skip other convert type, TopologySpreadConstraints: %s", converter.ConvertType) | ||
| } | ||
| } |