-
Notifications
You must be signed in to change notification settings - Fork 76
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: automatically insert the rdma resource to pod by DRA claim #3670
Open
cyclinder
wants to merge
1
commit into
spidernet-io:main
Choose a base branch
from
cyclinder:dra/webhook_resourceName
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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
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
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
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
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,121 @@ | ||
| // Copyright 2024 Authors of spidernet-io | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| package utils | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "os" | ||
|
|
||
| init_cmd "github.com/spidernet-io/spiderpool/cmd/spiderpool-init/cmd" | ||
| "github.com/spidernet-io/spiderpool/pkg/constant" | ||
| spiderpoolv2beta1 "github.com/spidernet-io/spiderpool/pkg/k8s/apis/spiderpool.spidernet.io/v2beta1" | ||
| corev1 "k8s.io/api/core/v1" | ||
| resourcev1alpha2 "k8s.io/api/resource/v1alpha2" | ||
| k8s_resource "k8s.io/apimachinery/pkg/api/resource" | ||
| apitypes "k8s.io/apimachinery/pkg/types" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| ) | ||
|
|
||
| func GetStaticNicsFromSpiderClaimParameter(ctx context.Context, apiReader client.Reader, pod *corev1.Pod) ([]spiderpoolv2beta1.MultusConfig, error) { | ||
| for _, rc := range pod.Spec.ResourceClaims { | ||
| if rc.Source.ResourceClaimTemplateName != nil { | ||
| var rct resourcev1alpha2.ResourceClaimTemplate | ||
| if err := apiReader.Get(ctx, apitypes.NamespacedName{Namespace: pod.Namespace, Name: *rc.Source.ResourceClaimTemplateName}, &rct); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if rct.Spec.Spec.ResourceClassName == constant.DRADriverName && rct.Spec.Spec.ParametersRef.APIGroup == constant.SpiderpoolAPIGroup && | ||
| rct.Spec.Spec.ParametersRef.Kind == constant.KindSpiderClaimParameter { | ||
|
|
||
| var scp spiderpoolv2beta1.SpiderClaimParameter | ||
| if err := apiReader.Get(ctx, apitypes.NamespacedName{Namespace: pod.Namespace, Name: pod.Name}, &scp); err != nil { | ||
| return nil, fmt.Errorf("failed to get spiderClaimParameter for pod %s/%s: %v", pod.Namespace, pod.Name, err) | ||
| } | ||
|
|
||
| var multusConfigs []spiderpoolv2beta1.MultusConfig | ||
| if scp.Spec.DefaultNic != nil { | ||
| multusConfigs = append(multusConfigs, *scp.Spec.DefaultNic) | ||
| } | ||
| multusConfigs = append(multusConfigs, scp.Spec.SecondaryNics...) | ||
|
|
||
| return multusConfigs, nil | ||
| } | ||
| } | ||
| } | ||
| return []spiderpoolv2beta1.MultusConfig{}, nil | ||
| } | ||
|
|
||
| func GetRdmaResourceMapFromStaticNics(ctx context.Context, apiReader client.Reader, staticNics []spiderpoolv2beta1.MultusConfig) (map[string]bool, error) { | ||
| resourceMap := make(map[string]bool) | ||
| for _, nic := range staticNics { | ||
| if nic.Namespace == "" { | ||
| nic.Namespace = os.Getenv(init_cmd.ENVNamespace) | ||
| } | ||
|
|
||
| var smc spiderpoolv2beta1.SpiderMultusConfig | ||
| if err := apiReader.Get(ctx, apitypes.NamespacedName{Namespace: nic.Namespace, Name: nic.MultusName}, &smc); err != nil { | ||
| return nil, fmt.Errorf("failed to get spiderClaimParameter: %v", err) | ||
| } | ||
|
|
||
| resourceName := resourceName(&smc) | ||
| if resourceName == "" { | ||
| continue | ||
| } | ||
|
|
||
| if _, ok := resourceMap[resourceName]; !ok { | ||
| resourceMap[resourceName] = false | ||
| } | ||
| } | ||
| return resourceMap, nil | ||
| } | ||
|
|
||
| // resourceName return the resourceName for given spiderMultusConfig | ||
| func resourceName(smc *spiderpoolv2beta1.SpiderMultusConfig) string { | ||
| switch *smc.Spec.CniType { | ||
| case constant.MacvlanCNI: | ||
| if smc.Spec.MacvlanConfig != nil && smc.Spec.MacvlanConfig.EnableRdma { | ||
| return smc.Spec.MacvlanConfig.RdmaResourceName | ||
| } | ||
| case constant.IPVlanCNI: | ||
| if smc.Spec.IPVlanConfig != nil && smc.Spec.IPVlanConfig.EnableRdma { | ||
| return smc.Spec.IPVlanConfig.RdmaResourceName | ||
| } | ||
| case constant.SriovCNI: | ||
| if smc.Spec.SriovConfig != nil { | ||
| return smc.Spec.SriovConfig.ResourceName | ||
| } | ||
| case constant.IBSriovCNI: | ||
| if smc.Spec.IbSriovConfig != nil { | ||
| return smc.Spec.IbSriovConfig.ResourceName | ||
| } | ||
| } | ||
| return "" | ||
| } | ||
|
|
||
| func InjectRdmaResourceToPod(resourceMap map[string]bool, pod *corev1.Pod) { | ||
| for _, c := range pod.Spec.Containers { | ||
| for resource := range resourceMap { | ||
| if resourceMap[resource] { | ||
| // the resource has found in pod, skip | ||
| continue | ||
| } | ||
|
|
||
| // try to find the resource in container resources.requests | ||
| if _, ok := c.Resources.Requests[corev1.ResourceName(resource)]; ok { | ||
| resourceMap[resource] = true | ||
| } else { | ||
| if _, ok := c.Resources.Limits[corev1.ResourceName(resource)]; ok { | ||
| resourceMap[resource] = true | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| for resource, found := range resourceMap { | ||
| if !found { | ||
| // inject the resource to the pod.containers[0].resources.requests | ||
| pod.Spec.Containers[0].Resources.Requests[corev1.ResourceName(resource)] = k8s_resource.MustParse("1") | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个 不需要 用户判断，由 controller 代码动态 patch
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
什么情况下patch