Skip to content

Fix DCGM exporter Kubernetes mode override #2675

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.

Sign up for GitHub

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

Closed
rtsui-harmonicinc wants to merge 1 commit into from
+45 −3
Closed

Fix DCGM exporter Kubernetes mode override #2675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions controllers/object_controls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2628,17 +2628,28 @@ func getContainerEnv(c *corev1.Container, key string) string {
}

func setContainerEnv(c *corev1.Container, key, value string) {
for i, val := range c.Env {
if val.Name != key {
for index := 0; index < len(c.Env); index++ {
if c.Env[index].Name != key {
continue
}

c.Env[i].Value = value
c.Env[index].Value = value
c.Env = append(c.Env[:index+1], removeDuplicateEnvVars(c.Env[index+1:], key)...)
return
}
c.Env = append(c.Env, corev1.EnvVar{Name: key, Value: value})
}

func removeDuplicateEnvVars(env []corev1.EnvVar, key string) []corev1.EnvVar {
result := env[:0]
for _, variable := range env {
if variable.Name != key {
result = append(result, variable)
}
}
return result
}

// findContainerByName returns a pointer to the container with the given name, or nil if not found.
func findContainerByName(containers []corev1.Container, name string) *corev1.Container {
for i := range containers {
Expand Down
31 changes: 31 additions & 0 deletions controllers/transforms_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1352,6 +1352,37 @@ func TestTransformDCGMExporter(t *testing.T) {
},
}).WithContainer(corev1.Container{Name: "dummy"}).WithPullSecret("pull-secret").WithRuntimeClassName("nvidia").WithHostPID(true),
},
{
description: "transform dcgm exporter overrides kubernetes environment variable",
ds: NewDaemonset().
WithContainer(corev1.Container{
Name: "dcgm-exporter",
Env: []corev1.EnvVar{
{Name: "DCGM_EXPORTER_KUBERNETES", Value: "true"},
{Name: "DCGM_EXPORTER_KUBERNETES", Value: "false"},
},
}).
WithContainer(corev1.Container{Name: "dummy"}),
cpSpec: &gpuv1.ClusterPolicySpec{
DCGMExporter: gpuv1.DCGMExporterSpec{
Repository: "nvcr.io/nvidia/cloud-native",
Image: "dcgm-exporter",
Version: "v1.0.0",
Env: []gpuv1.EnvVar{
{Name: "DCGM_EXPORTER_KUBERNETES", Value: "false"},
},
},
},
expectedDs: NewDaemonset().WithContainer(corev1.Container{
Name: "dcgm-exporter",
Image: "nvcr.io/nvidia/cloud-native/dcgm-exporter:v1.0.0",
ImagePullPolicy: corev1.PullIfNotPresent,
Env: []corev1.EnvVar{
{Name: "DCGM_EXPORTER_KUBERNETES", Value: "false"},
{Name: "DCGM_REMOTE_HOSTENGINE_INFO", Value: "nvidia-dcgm:5555"},
},
}).WithContainer(corev1.Container{Name: "dummy"}).WithRuntimeClassName("nvidia"),
},
{
description: "transform dcgm exporter with hostPID disabled",
ds: NewDaemonset().
Expand Down