refactor(providers): share Kubernetes accelerator discovery #462
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -62,7 +62,7 @@ provider discovery. | |
|
|
||
| Some GPU Operator deployments expose `nvidia.com/gpu.clique` on nodes with | ||
| Multi-Node NVLink (MNNVL) GPUs; operators may select it explicitly as either an | ||
| engine source label or a DRA/`infiniband-k8s` provider discovery label. The `netq` | ||
| provider instead uses a `DomainUUID` from the NMX management API—a different | ||
| identifier that refers to the same physical domain but cannot be compared as a | ||
| string. | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -21,9 +21,28 @@ import ( | |
| "k8s.io/client-go/tools/remotecommand" | ||
| "k8s.io/klog/v2" | ||
|
|
||
| internalconfig "github.com/NVIDIA/topograph/internal/config" | ||
| "github.com/NVIDIA/topograph/pkg/topology" | ||
| ) | ||
|
|
||
| type nodeSelectorConfig struct { | ||
| NodeSelector map[string]string `mapstructure:"nodeSelector"` | ||
| } | ||
|
|
||
| // NodeListOptions decodes a provider's optional nodeSelector into Kubernetes | ||
| // list options. Other provider parameters are intentionally ignored. | ||
| func NodeListOptions(params map[string]any) (*metav1.ListOptions, error) { | ||
| config := nodeSelectorConfig{} | ||
| if err := internalconfig.Decode(params, &config); err != nil { | ||
| return nil, err | ||
| } | ||
| if len(config.NodeSelector) == 0 { | ||
| return nil, nil | ||
| } | ||
|
|
||
| return &metav1.ListOptions{LabelSelector: labels.Set(config.NodeSelector).String()}, nil | ||
| } | ||
|
|
||
| func GetNodes(ctx context.Context, client kubernetes.Interface, opt *metav1.ListOptions) (*corev1.NodeList, error) { | ||
| if opt == nil { | ||
| opt = &metav1.ListOptions{} | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ import ( | |
|
|
||
| "github.com/stretchr/testify/require" | ||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| func TestIsPodReady(t *testing.T) { | ||
|
|
@@ -81,6 +82,43 @@ func TestIsPodReady(t *testing.T) { | |
| } | ||
| } | ||
|
|
||
| func TestNodeListOptions(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| params map[string]any | ||
| want *metav1.ListOptions | ||
| err string | ||
| }{ | ||
| {name: "no parameters"}, | ||
| { | ||
| name: "other provider parameters are ignored", | ||
| params: map[string]any{"accelerator": map[string]any{"source": "none"}}, | ||
| }, | ||
| { | ||
| name: "node selector", | ||
| params: map[string]any{"nodeSelector": map[string]string{"key": "value"}}, | ||
| want: &metav1.ListOptions{LabelSelector: "key=value"}, | ||
| }, | ||
| { | ||
| name: "invalid node selector", | ||
| params: map[string]any{"nodeSelector": 0.1}, | ||
| err: "could not decode configuration", | ||
| }, | ||
| } | ||
|
|
||
| for _, test := range tests { | ||
| t.Run(test.name, func(t *testing.T) { | ||
| got, err := NodeListOptions(test.params) | ||
| if test.err != "" { | ||
| require.ErrorContains(t, err, test.err) | ||
| return | ||
| } | ||
| require.NoError(t, err) | ||
| require.Equal(t, test.want, got) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestValidateLabelKey(t *testing.T) { | ||
| testCases := []struct { | ||
| name string | ||
|
|
||
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.
🎯 Functional Correctness | 🔵 Trivial | ⚡ Quick win
Add positive DRA validation coverage and run the chart tests.
These tests cover only rejection paths. Add or verify cases for omitted
provider.params.accelerator, which must preserve thenvidia.com/gpu.cliquedefault, and explicitsource: kubernetes-labelwithkubernetesLabel.key, which must pass.As per coding guidelines, “Run Helm chart tests when changing
charts/topograph/; review snapshot changes before committing updates.”Also applies to: 136-145
🤖 Prompt for AI Agents
Source: Coding guidelines