Merge pull request #533 from elezar/rename-mps-capable

Rename nvidia.com/sharing.mps.enabled to nvidia.com/mps.capable
NVIDIA · Feb 21, 2024 · 4d9e794 · 4d9e794
2 parents 35c1393 + a42bda3
commit 4d9e794
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 13 deletions.
diff --git a/deployments/helm/nvidia-device-plugin/templates/daemonset-mps-control-daemon.yml b/deployments/helm/nvidia-device-plugin/templates/daemonset-mps-control-daemon.yml
@@ -209,7 +209,7 @@ spec:
       {{- end }}
       nodeSelector:
         # We only deploy this pod if the following sharing label is applied.
-        nvidia.com/sharing.mps.enabled: "true"
+        nvidia.com/mps.capable: "true"
       {{- with .Values.nodeSelector }}
         {{- toYaml . | nindent 8 }}
       {{- end }}

diff --git a/internal/lm/nvml.go b/internal/lm/nvml.go
@@ -146,6 +146,6 @@ func newSharingLabeler(config *spec.Config) Labeler {
 	}
 
 	return Labels{
-		"nvidia.com/sharing.mps.enabled": strconv.FormatBool(mpsEnabled),
+		"nvidia.com/mps.capable": strconv.FormatBool(mpsEnabled),
 	}
 }
diff --git a/internal/lm/nvml_test.go b/internal/lm/nvml_test.go
@@ -87,14 +87,14 @@ func TestSharingLabeler(t *testing.T) {
 		{
 			descrition: "nil config",
 			expectedLabels: map[string]string{
-				"nvidia.com/sharing.mps.enabled": "false",
+				"nvidia.com/mps.capable": "false",
 			},
 		},
 		{
 			descrition: "empty config",
 			config:     &spec.Config{},
 			expectedLabels: map[string]string{
-				"nvidia.com/sharing.mps.enabled": "false",
+				"nvidia.com/mps.capable": "false",
 			},
 		},
 		{
@@ -111,7 +111,7 @@ func TestSharingLabeler(t *testing.T) {
 				},
 			},
 			expectedLabels: map[string]string{
-				"nvidia.com/sharing.mps.enabled": "false",
+				"nvidia.com/mps.capable": "false",
 			},
 		},
 		{
@@ -128,7 +128,7 @@ func TestSharingLabeler(t *testing.T) {
 				},
 			},
 			expectedLabels: map[string]string{
-				"nvidia.com/sharing.mps.enabled": "false",
+				"nvidia.com/mps.capable": "false",
 			},
 		},
 		{
@@ -145,7 +145,7 @@ func TestSharingLabeler(t *testing.T) {
 				},
 			},
 			expectedLabels: map[string]string{
-				"nvidia.com/sharing.mps.enabled": "true",
+				"nvidia.com/mps.capable": "true",
 			},
 		},
 	}

diff --git a/tests/e2e/gpu-feature-discovery_test.go b/tests/e2e/gpu-feature-discovery_test.go
@@ -59,7 +59,7 @@ var _ = NVDescribe("GPU Feature Discovery", func() {
 		"nvidia.com/mig.capable":          "[true|false]",
 		"nvidia.com/gpu.compute.major":    "[0-9]+",
 		"nvidia.com/gpu.compute.minor":    "[0-9]+",
-		"nvidia.com/sharing.mps.enabled":  "[true|false]",
+		"nvidia.com/mps.capable":          "[true|false]",
 	}
 
 	Context("When deploying GFD", Ordered, func() {

diff --git a/tests/expected-output-mig-mixed.txt b/tests/expected-output-mig-mixed.txt
@@ -28,5 +28,4 @@ nvidia\.com\/mig-[0-9]+g\.[0-9]+gb\.engines\.jpeg=[0-9]+
 nvidia\.com\/mig-[0-9]+g\.[0-9]+gb\.engines\.ofa=[0-9]+
 nvidia\.com\/mig-[0-9]+g\.[0-9]+gb\.slices\.gi=[0-9]+
 nvidia\.com\/mig-[0-9]+g\.[0-9]+gb\.slices\.ci=[0-9]+
-nvidia\.com\/sharing\.mps\.enabled=[true|false]
-
+nvidia\.com\/mps\.capable=[true|false]
diff --git a/tests/expected-output-mig-none.txt b/tests/expected-output-mig-none.txt
@@ -14,4 +14,4 @@ nvidia\.com\/gpu\.family=[a-z]+
 nvidia\.com\/mig\.capable=[true|false]
 nvidia\.com\/gpu\.compute\.major=[0-9]+
 nvidia\.com\/gpu\.compute\.minor=[0-9]+
-nvidia\.com\/sharing\.mps\.enabled=[true|false]
+nvidia\.com\/mps\.capable=[true|false]
diff --git a/tests/expected-output-mig-single.txt b/tests/expected-output-mig-single.txt
@@ -23,4 +23,4 @@ nvidia\.com\/gpu\.engines\.jpeg=[0-9]+
 nvidia\.com\/gpu\.engines\.ofa=[0-9]+
 nvidia\.com\/gpu\.slices\.gi=[0-9]+
 nvidia\.com\/gpu\.slices\.ci=[0-9]+
-nvidia\.com\/sharing\.mps\.enabled=[true|false]
+nvidia\.com\/mps\.capable=[true|false]
diff --git a/tests/expected-output.txt b/tests/expected-output.txt
@@ -14,4 +14,4 @@ nvidia\.com\/gpu\.family=[a-z]+
 nvidia\.com\/mig\.capable=[true|false]
 nvidia\.com\/gpu\.compute\.major=[0-9]+
 nvidia\.com\/gpu\.compute\.minor=[0-9]+
-nvidia\.com\/sharing\.mps\.enabled=[true|false]
+nvidia\.com\/mps\.capable=[true|false]