Merge pull request #19545 from RamBITS-AI/merge_nvidia-gpu-device-plugin__and__nvidia_device_plugin

Merge nvidia-gpu-device-plugin and nvidia-device-plugin.

Author: spowelljr

pkg/addons/addons.go

@@ -104,6 +104,8 @@ func preStartMessages(name, value string) {
 		out.Styled(style.Warning, "The ambassador addon has stopped working as of v1.23.0, for more details visit: https://github.com/datawire/ambassador-operator/issues/73")
 	case "olm":
 		out.Styled(style.Warning, "The OLM addon has stopped working, for more details visit: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534")
+	case "nvidia-gpu-device-plugin":
+		out.Styled(style.Warning, "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.")
 	}
 }
 
@@ -163,6 +165,8 @@ func Deprecations(name string) (bool, string, string) {
 		return true, "metrics-server", "using metrics-server addon, heapster is deprecated"
 	case "efk":
 		return true, "", "The current images used in the efk addon contain Log4j vulnerabilities, the addon will be disabled until images are updated, see: https://github.com/kubernetes/minikube/issues/15280"
+	case "nvidia-gpu-device-plugin":
+		return true, "nvidia-device-plugin", "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114."
 	}
 	return false, "", ""
 }

pkg/addons/config.go

@@ -126,6 +126,7 @@ var Addons = []*Addon{
 		callbacks:   []setFn{EnableOrDisableAddon},
 	},
 	{
+		// The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon.
 		name:        "nvidia-gpu-device-plugin",
 		set:         SetBool,
 		validations: []setFn{isKVMDriverForNVIDIA},

site/content/en/docs/tutorials/nvidia.md

@@ -113,9 +113,10 @@ host to the minikube VM. Doing so has a few prerequisites:
 
   If this succeeded, run the following commands:
   ```shell
-  minikube addons enable nvidia-gpu-device-plugin
+  minikube addons enable nvidia-device-plugin
   minikube addons enable nvidia-driver-installer
   ```
+  NOTE: `nvidia-gpu-device-plugin` addon has been deprecated and it's functionality is merged inside of `nvidia-device-plugin` addon.
 
   This will install the NVIDIA driver (that works for GeForce/Quadro cards)
   on the VM.