From 6319af242bddb5da933b95bcfb583270a6c09769 Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Fri, 30 Aug 2024 06:46:09 +0530
Subject: [PATCH 01/39] Initial Commit.

Initial Commit.
---
 pkg/addons/validations.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/addons/validations.go b/pkg/addons/validations.go
index 593e27991756..18639607aeec 100644
--- a/pkg/addons/validations.go
+++ b/pkg/addons/validations.go
@@ -12,6 +12,7 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
+TODO: Remove this line before PR is merged.
 */
 
 package addons

From cd8327c11651bb36b8e4bbbca25c0079ad9623af Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Fri, 30 Aug 2024 06:50:55 +0530
Subject: [PATCH 02/39] Update validations.go

---
 pkg/addons/validations.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/addons/validations.go b/pkg/addons/validations.go
index 18639607aeec..593e27991756 100644
--- a/pkg/addons/validations.go
+++ b/pkg/addons/validations.go
@@ -12,7 +12,6 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-TODO: Remove this line before PR is merged.
 */
 
 package addons

From 938f6f0eecd4a012fe5b75ba1745172301f5db61 Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Sat, 31 Aug 2024 16:50:10 +0530
Subject: [PATCH 03/39] Removing isKVMDriverForNVIDIA from validations for
 nvidia-gpu-device-plugin.

Removing isKVMDriverForNVIDIA from validations for nvidia-gpu-device-plugin. This is being done to allow merger of functionalities of nvidia-gpu-device-plugin and nvidia-device-plugin into nvidia-gpu-device-plugin. This basically means nvidia-gpu-device-plugin will work for both KVM & non-KVM (including docker) drivers.
---
 pkg/addons/config.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkg/addons/config.go b/pkg/addons/config.go
index a849538eb815..dd30e09ecc74 100644
--- a/pkg/addons/config.go
+++ b/pkg/addons/config.go
@@ -131,10 +131,9 @@ var Addons = []*Addon{
 		callbacks:   []setFn{EnableOrDisableAddon},
 	},
 	{
-		name:        "nvidia-gpu-device-plugin",
-		set:         SetBool,
-		validations: []setFn{isKVMDriverForNVIDIA},
-		callbacks:   []setFn{EnableOrDisableAddon},
+		name:      "nvidia-gpu-device-plugin",
+		set:       SetBool,
+		callbacks: []setFn{EnableOrDisableAddon},
 	},
 	{
 		name:      "olm",

From b282913a9110fe82a9f91511801b78af93e33950 Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Sat, 31 Aug 2024 17:48:55 +0530
Subject: [PATCH 04/39] Messages, Warnings and In-line Code Comments w.r.t the
 merger.

Messages, Warnings and In-line Code Comments w.r.t the merger.
---
 pkg/addons/addons.go                     | 4 ++++
 pkg/addons/config.go                     | 1 +
 site/content/en/docs/tutorials/nvidia.md | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index 4029555bd7ed..bb19a8b6d70b 100644
--- a/pkg/addons/addons.go
+++ b/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-device-plugin":
+		out.Styled(style.Warning, "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-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-device-plugin":
+		return true, "nvidia-gpu-device-plugin", "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114"
 	}
 	return false, "", ""
 }
diff --git a/pkg/addons/config.go b/pkg/addons/config.go
index dd30e09ecc74..b2916a94f188 100644
--- a/pkg/addons/config.go
+++ b/pkg/addons/config.go
@@ -234,6 +234,7 @@ var Addons = []*Addon{
 		callbacks: []setFn{EnableOrDisableAddon},
 	},
 	{
+		// The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon.
 		name:      "nvidia-device-plugin",
 		set:       SetBool,
 		callbacks: []setFn{EnableOrDisableAddon},
diff --git a/site/content/en/docs/tutorials/nvidia.md b/site/content/en/docs/tutorials/nvidia.md
index 58f5d78442ae..b5a80dd44b62 100644
--- a/site/content/en/docs/tutorials/nvidia.md
+++ b/site/content/en/docs/tutorials/nvidia.md
@@ -59,8 +59,9 @@ to expose GPUs with `--driver=kvm`. Please don't mix these instructions.
 
 - Install NVIDIA's device plugin:
   ```shell
-  minikube addons enable nvidia-device-plugin
+  minikube addons enable nvidia-gpu-device-plugin
   ```
+  NOTE: `nvidia-device-plugin` addon has been deprecated and it's functionality is merged inside of `nvidia-gpu-device-plugin` addon.
 {{% /tab %}}
 {{% tab kvm %}}
 ## Using the kvm driver

From 9491f8db62944a2521fddd62349b95f304e2ab07 Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Sat, 31 Aug 2024 18:13:13 +0530
Subject: [PATCH 05/39] Update addons.go

---
 pkg/addons/addons.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index bb19a8b6d70b..b2717c8ea017 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -105,7 +105,7 @@ func preStartMessages(name, value string) {
 	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-device-plugin":
-		out.Styled(style.Warning, "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114")
+		out.Styled(style.Warning, "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.")
 	}
 }
 
@@ -166,7 +166,7 @@ func Deprecations(name string) (bool, string, string) {
 	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-device-plugin":
-		return true, "nvidia-gpu-device-plugin", "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114"
+		return true, "nvidia-gpu-device-plugin", "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114."
 	}
 	return false, "", ""
 }

From 7ee5901bd36fd1bdf581e9104db79d21f6233f16 Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Fri, 6 Sep 2024 05:55:11 +0530
Subject: [PATCH 06/39] Merged nvidia-device-plugin addon into
 nvidia-gpu-device-plugin addon.

Merged nvidia-device-plugin addon into nvidia-gpu-device-plugin addon.
---
 deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl | 3 +++
 pkg/minikube/cruntime/docker.go                      | 2 +-
 test/integration/addons_test.go                      | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl
index 0ec4cd4fff99..6976fe77cc49 100644
--- a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl
+++ b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl
@@ -47,6 +47,9 @@ spec:
       - image: {{.CustomRegistries.NvidiaDevicePlugin  | default .ImageRepository | default .Registries.NvidiaDevicePlugin }}{{.Images.NvidiaDevicePlugin}}
         command: ["/usr/bin/nvidia-gpu-device-plugin", "-logtostderr"]
         name: nvidia-gpu-device-plugin
+        env:
+          - name: FAIL_ON_INIT_ERROR
+            value: "false"
         resources:
           requests:
             cpu: 50m
diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go
index 4c27c11dcfb0..54b3df586f49 100644
--- a/pkg/minikube/cruntime/docker.go
+++ b/pkg/minikube/cruntime/docker.go
@@ -581,7 +581,7 @@ func (r *Docker) configureDocker(driver string) error {
 		StorageDriver: "overlay2",
 	}
 	if r.GPUs {
-		assets.Addons["nvidia-device-plugin"].EnableByDefault()
+		assets.Addons["nvidia-gpu-device-plugin"].EnableByDefault()
 		daemonConfig.DefaultRuntime = "nvidia"
 		runtimes := &dockerDaemonRuntimes{}
 		runtimes.Nvidia.Path = "/usr/bin/nvidia-container-runtime"
diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go
index 3b0888c78678..901aa0f04718 100644
--- a/test/integration/addons_test.go
+++ b/test/integration/addons_test.go
@@ -100,7 +100,7 @@ func TestAddons(t *testing.T) {
 		// so we override that here to let minikube auto-detect appropriate cgroup driver
 		os.Setenv(constants.MinikubeForceSystemdEnv, "")
 
-		args := append([]string{"start", "-p", profile, "--wait=true", "--memory=4000", "--alsologtostderr", "--addons=registry", "--addons=metrics-server", "--addons=volumesnapshots", "--addons=csi-hostpath-driver", "--addons=gcp-auth", "--addons=cloud-spanner", "--addons=inspektor-gadget", "--addons=storage-provisioner-rancher", "--addons=nvidia-device-plugin", "--addons=yakd", "--addons=volcano"}, StartArgs()...)
+		args := append([]string{"start", "-p", profile, "--wait=true", "--memory=4000", "--alsologtostderr", "--addons=registry", "--addons=metrics-server", "--addons=volumesnapshots", "--addons=csi-hostpath-driver", "--addons=gcp-auth", "--addons=cloud-spanner", "--addons=inspektor-gadget", "--addons=storage-provisioner-rancher", "--addons=nvidia-gpu-device-plugin", "--addons=yakd", "--addons=volcano"}, StartArgs()...)
 		if !NoneDriver() { // none driver does not support ingress
 			args = append(args, "--addons=ingress", "--addons=ingress-dns")
 		}
@@ -1054,15 +1054,15 @@ func validateDisablingAddonOnNonExistingCluster(ctx context.Context, t *testing.
 	}
 }
 
-// validateNvidiaDevicePlugin tests the nvidia-device-plugin addon by ensuring the pod comes up and the addon disables
+// validateNvidiaDevicePlugin tests the nvidia-gpu-device-plugin addon by ensuring the pod comes up and the addon disables
 func validateNvidiaDevicePlugin(ctx context.Context, t *testing.T, profile string) {
 	defer PostMortemLogs(t, profile)
 
 	if _, err := PodWait(ctx, t, profile, "kube-system", "name=nvidia-device-plugin-ds", Minutes(6)); err != nil {
 		t.Fatalf("failed waiting for nvidia-device-plugin-ds pod: %v", err)
 	}
-	if rr, err := Run(t, exec.CommandContext(ctx, Target(), "addons", "disable", "nvidia-device-plugin", "-p", profile)); err != nil {
-		t.Errorf("failed to disable nvidia-device-plugin: args %q : %v", rr.Command(), err)
+	if rr, err := Run(t, exec.CommandContext(ctx, Target(), "addons", "disable", "nvidia-gpu-device-plugin", "-p", profile)); err != nil {
+		t.Errorf("failed to disable nvidia-gpu-device-plugin: args %q : %v", rr.Command(), err)
 	}
 }
 

From 1a0ef3c88fd1c73778fa2bf49e7f5849140bc7bd Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Fri, 4 Oct 2024 19:56:16 +0530
Subject: [PATCH 07/39] Reverting nvidia-gpu-device-plugin to
 nvidia-device-plugin.

Reverting nvidia-gpu-device-plugin to nvidia-device-plugin.
---
 test/integration/addons_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go
index 7677f606d477..759a15d61be4 100644
--- a/test/integration/addons_test.go
+++ b/test/integration/addons_test.go
@@ -951,15 +951,15 @@ func validateDisablingAddonOnNonExistingCluster(ctx context.Context, t *testing.
 	}
 }
 
-// validateNvidiaDevicePlugin tests the nvidia-gpu-device-plugin addon by ensuring the pod comes up and the addon disables
+// validateNvidiaDevicePlugin tests the nvidia-device-plugin addon by ensuring the pod comes up and the addon disables
 func validateNvidiaDevicePlugin(ctx context.Context, t *testing.T, profile string) {
 	defer PostMortemLogs(t, profile)
 
 	if _, err := PodWait(ctx, t, profile, "kube-system", "name=nvidia-device-plugin-ds", Minutes(6)); err != nil {
 		t.Fatalf("failed waiting for nvidia-device-plugin-ds pod: %v", err)
 	}
-	if rr, err := Run(t, exec.CommandContext(ctx, Target(), "addons", "disable", "nvidia-gpu-device-plugin", "-p", profile)); err != nil {
-		t.Errorf("failed to disable nvidia-gpu-device-plugin: args %q : %v", rr.Command(), err)
+	if rr, err := Run(t, exec.CommandContext(ctx, Target(), "addons", "disable", "nvidia-device-plugin", "-p", profile)); err != nil {
+		t.Errorf("failed to disable nvidia-device-plugin: args %q : %v", rr.Command(), err)
 	}
 }
 

From a98eefef98ff041f926ac413192efa8de1a9c036 Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Fri, 4 Oct 2024 19:59:41 +0530
Subject: [PATCH 08/39] Reverting nvidia-gpu-device-plugin to
 nvidia-device-plugin.

Reverting nvidia-gpu-device-plugin to nvidia-device-plugin.
---
 site/content/en/docs/tutorials/nvidia.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/content/en/docs/tutorials/nvidia.md b/site/content/en/docs/tutorials/nvidia.md
index 5117abeb7bb3..968dff68d188 100644
--- a/site/content/en/docs/tutorials/nvidia.md
+++ b/site/content/en/docs/tutorials/nvidia.md
@@ -70,9 +70,8 @@ to expose GPUs with `--driver=kvm`. Please don't mix these instructions.
 
 - Install NVIDIA's device plugin:
   ```shell
-  minikube addons enable nvidia-gpu-device-plugin
+  minikube addons enable nvidia-device-plugin
   ```
-  NOTE: `nvidia-device-plugin` addon has been deprecated and it's functionality is merged inside of `nvidia-gpu-device-plugin` addon.
 {{% /tab %}}
 {{% tab kvm %}}
 ## Using the kvm driver
@@ -114,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.

From f5c192e05742ba1a0ebcdd6bae2eb414e993953c Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Fri, 4 Oct 2024 20:01:44 +0530
Subject: [PATCH 09/39] Reverting nvidia-gpu-device-plugin to
 nvidia-device-plugin.

Reverting nvidia-gpu-device-plugin to nvidia-device-plugin.
---
 pkg/minikube/cruntime/docker.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go
index 54b3df586f49..4c27c11dcfb0 100644
--- a/pkg/minikube/cruntime/docker.go
+++ b/pkg/minikube/cruntime/docker.go
@@ -581,7 +581,7 @@ func (r *Docker) configureDocker(driver string) error {
 		StorageDriver: "overlay2",
 	}
 	if r.GPUs {
-		assets.Addons["nvidia-gpu-device-plugin"].EnableByDefault()
+		assets.Addons["nvidia-device-plugin"].EnableByDefault()
 		daemonConfig.DefaultRuntime = "nvidia"
 		runtimes := &dockerDaemonRuntimes{}
 		runtimes.Nvidia.Path = "/usr/bin/nvidia-container-runtime"

From d6e44196d727885d23108f3f6394d1311b1019ca Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Fri, 4 Oct 2024 20:04:34 +0530
Subject: [PATCH 10/39] Reverting nvidia-gpu-device-plugin to
 nvidia-device-plugin.

Reverting nvidia-gpu-device-plugin to nvidia-device-plugin.
---
 pkg/addons/config.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/addons/config.go b/pkg/addons/config.go
index d677d640f8c6..c4385dfd018d 100644
--- a/pkg/addons/config.go
+++ b/pkg/addons/config.go
@@ -126,9 +126,11 @@ var Addons = []*Addon{
 		callbacks:   []setFn{EnableOrDisableAddon},
 	},
 	{
-		name:      "nvidia-gpu-device-plugin",
-		set:       SetBool,
-		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},
+		callbacks:   []setFn{EnableOrDisableAddon},
 	},
 	{
 		name:      "olm",
@@ -229,7 +231,6 @@ var Addons = []*Addon{
 		callbacks: []setFn{EnableOrDisableAddon},
 	},
 	{
-		// The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon.
 		name:      "nvidia-device-plugin",
 		set:       SetBool,
 		callbacks: []setFn{EnableOrDisableAddon},

From d4d2a4678271fab672d87e9dfdbc2b441c932534 Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Fri, 4 Oct 2024 20:09:36 +0530
Subject: [PATCH 11/39] Reverting nvidia-gpu-device-plugin to
 nvidia-device-plugin.

Reverting nvidia-gpu-device-plugin to nvidia-device-plugin.
---
 pkg/addons/addons.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index b2717c8ea017..8ab6bed63ee9 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -104,8 +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-device-plugin":
-		out.Styled(style.Warning, "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.")
+	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.")
 	}
 }
 
@@ -165,8 +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-device-plugin":
-		return true, "nvidia-gpu-device-plugin", "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114."
+	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, "", ""
 }

From b1ab86bdeb852493b690b30ba17d70d5bee41663 Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Fri, 4 Oct 2024 20:12:10 +0530
Subject: [PATCH 12/39] Reverting nvidia-gpu-device-plugin to
 nvidia-device-plugin.

Reverting nvidia-gpu-device-plugin to nvidia-device-plugin.
---
 deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl
index 6976fe77cc49..0ec4cd4fff99 100644
--- a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl
+++ b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl
@@ -47,9 +47,6 @@ spec:
       - image: {{.CustomRegistries.NvidiaDevicePlugin  | default .ImageRepository | default .Registries.NvidiaDevicePlugin }}{{.Images.NvidiaDevicePlugin}}
         command: ["/usr/bin/nvidia-gpu-device-plugin", "-logtostderr"]
         name: nvidia-gpu-device-plugin
-        env:
-          - name: FAIL_ON_INIT_ERROR
-            value: "false"
         resources:
           requests:
             cpu: 50m

From a0f915eda8a31049eb26e6eaa3dd0133e507bce0 Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Fri, 4 Oct 2024 20:42:19 +0530
Subject: [PATCH 13/39] Merging
 deploy\addons\gpu\nvidia-gpu-device-plugin.yaml.tmpl into
 deploy\addons\nvidia-device-plugin\nvidia-device-plugin.yaml.tmpl.

Merging deploy\addons\gpu\nvidia-gpu-device-plugin.yaml.tmpl into deploy\addons\nvidia-device-plugin\nvidia-device-plugin.yaml.tmpl.
---
 .../nvidia-device-plugin.yaml.tmpl                   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
index c05c586edcbe..e7555f65d41c 100644
--- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
+++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
@@ -29,6 +29,10 @@ spec:
         name: nvidia-device-plugin-ds
     spec:
       tolerations:
+      - operator: Exists
+        effect: NoExecute
+      - operator: Exists
+        effect: NoSchedule
       - key: nvidia.com/gpu
         operator: Exists
         effect: NoSchedule
@@ -43,6 +47,10 @@ spec:
         env:
           - name: FAIL_ON_INIT_ERROR
             value: "false"
+        resources:
+          requests:
+            cpu: 50m
+            memory: 10Mi
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -50,7 +58,11 @@ spec:
         volumeMounts:
         - name: device-plugin
           mountPath: /var/lib/kubelet/device-plugins
+        - name: dev
+          mountPath: /dev
       volumes:
       - name: device-plugin
         hostPath:
           path: /var/lib/kubelet/device-plugins
+        - name: dev
+          mountPath: /dev
\ No newline at end of file

From 4be65dcc671604c96a861fd34295283726a48c2d Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Fri, 4 Oct 2024 21:09:14 +0530
Subject: [PATCH 14/39] Update nvidia-device-plugin.yaml.tmpl

---
 .../nvidia-device-plugin.yaml.tmpl                 | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
index e7555f65d41c..fcb6012b1333 100644
--- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
+++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
@@ -29,10 +29,6 @@ spec:
         name: nvidia-device-plugin-ds
     spec:
       tolerations:
-      - operator: Exists
-        effect: NoExecute
-      - operator: Exists
-        effect: NoSchedule
       - key: nvidia.com/gpu
         operator: Exists
         effect: NoSchedule
@@ -47,10 +43,6 @@ spec:
         env:
           - name: FAIL_ON_INIT_ERROR
             value: "false"
-        resources:
-          requests:
-            cpu: 50m
-            memory: 10Mi
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -58,11 +50,7 @@ spec:
         volumeMounts:
         - name: device-plugin
           mountPath: /var/lib/kubelet/device-plugins
-        - name: dev
-          mountPath: /dev
       volumes:
       - name: device-plugin
         hostPath:
-          path: /var/lib/kubelet/device-plugins
-        - name: dev
-          mountPath: /dev
\ No newline at end of file
+          path: /var/lib/kubelet/device-plugins
\ No newline at end of file

From 8db684b8b1d5d813822c6ef6e8aab7f63ed09533 Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Sat, 5 Oct 2024 04:14:48 +0530
Subject: [PATCH 15/39] Revert "Update nvidia-device-plugin.yaml.tmpl"

This reverts commit 4be65dcc671604c96a861fd34295283726a48c2d.
---
 .../nvidia-device-plugin.yaml.tmpl                 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
index fcb6012b1333..e7555f65d41c 100644
--- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
+++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
@@ -29,6 +29,10 @@ spec:
         name: nvidia-device-plugin-ds
     spec:
       tolerations:
+      - operator: Exists
+        effect: NoExecute
+      - operator: Exists
+        effect: NoSchedule
       - key: nvidia.com/gpu
         operator: Exists
         effect: NoSchedule
@@ -43,6 +47,10 @@ spec:
         env:
           - name: FAIL_ON_INIT_ERROR
             value: "false"
+        resources:
+          requests:
+            cpu: 50m
+            memory: 10Mi
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -50,7 +58,11 @@ spec:
         volumeMounts:
         - name: device-plugin
           mountPath: /var/lib/kubelet/device-plugins
+        - name: dev
+          mountPath: /dev
       volumes:
       - name: device-plugin
         hostPath:
-          path: /var/lib/kubelet/device-plugins
\ No newline at end of file
+          path: /var/lib/kubelet/device-plugins
+        - name: dev
+          mountPath: /dev
\ No newline at end of file

From e7141bcc73573a70aff2ad563579afd6e9c61825 Mon Sep 17 00:00:00 2001
From: Ramachandran C <rambits.ai@gmail.com>
Date: Sat, 5 Oct 2024 04:48:05 +0530
Subject: [PATCH 16/39] dev volume added.

dev volume added.
---
 .../nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
index e7555f65d41c..d5f9347634c6 100644
--- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
+++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
@@ -64,5 +64,6 @@ spec:
       - name: device-plugin
         hostPath:
           path: /var/lib/kubelet/device-plugins
-        - name: dev
-          mountPath: /dev
\ No newline at end of file
+      - name: dev
+        hostPath:
+          path: /dev

From 69bab32b875b756d49903925ec3e0c5948a1ccd2 Mon Sep 17 00:00:00 2001
From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com>
Date: Mon, 16 Dec 2024 06:10:03 +0530
Subject: [PATCH 17/39] Update nvidia-device-plugin.yaml.tmpl

These values are likely no longer needed when using the updated image.
---
 .../nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
index d5f9347634c6..5950c3946907 100644
--- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
+++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
@@ -29,10 +29,6 @@ spec:
         name: nvidia-device-plugin-ds
     spec:
       tolerations:
-      - operator: Exists
-        effect: NoExecute
-      - operator: Exists
-        effect: NoSchedule
       - key: nvidia.com/gpu
         operator: Exists
         effect: NoSchedule

From 6aec15cfa9de763d65021ef8cf2999a75664ec17 Mon Sep 17 00:00:00 2001
From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com>
Date: Thu, 19 Dec 2024 04:24:17 +0530
Subject: [PATCH 18/39] Update nvidia-device-plugin.yaml.tmpl

---
 .../nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
index 5950c3946907..c05c586edcbe 100644
--- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
+++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
@@ -43,10 +43,6 @@ spec:
         env:
           - name: FAIL_ON_INIT_ERROR
             value: "false"
-        resources:
-          requests:
-            cpu: 50m
-            memory: 10Mi
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -54,12 +50,7 @@ spec:
         volumeMounts:
         - name: device-plugin
           mountPath: /var/lib/kubelet/device-plugins
-        - name: dev
-          mountPath: /dev
       volumes:
       - name: device-plugin
         hostPath:
           path: /var/lib/kubelet/device-plugins
-      - name: dev
-        hostPath:
-          path: /dev

From 9ade6fecb3c2a911f592e6af6c87a040a30dd7df Mon Sep 17 00:00:00 2001
From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com>
Date: Thu, 19 Dec 2024 04:57:57 +0530
Subject: [PATCH 19/39] Update nvidia-device-plugin.yaml.tmpl

---
 .../nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
index c05c586edcbe..5950c3946907 100644
--- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
+++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
@@ -43,6 +43,10 @@ spec:
         env:
           - name: FAIL_ON_INIT_ERROR
             value: "false"
+        resources:
+          requests:
+            cpu: 50m
+            memory: 10Mi
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -50,7 +54,12 @@ spec:
         volumeMounts:
         - name: device-plugin
           mountPath: /var/lib/kubelet/device-plugins
+        - name: dev
+          mountPath: /dev
       volumes:
       - name: device-plugin
         hostPath:
           path: /var/lib/kubelet/device-plugins
+      - name: dev
+        hostPath:
+          path: /dev

From 72b1672ee9f0d6f527af5fd8acc2073b63870923 Mon Sep 17 00:00:00 2001
From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com>
Date: Thu, 19 Dec 2024 05:04:03 +0530
Subject: [PATCH 20/39] Update nvidia-device-plugin.yaml.tmpl

---
 .../nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
index 5950c3946907..c05c586edcbe 100644
--- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
+++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl
@@ -43,10 +43,6 @@ spec:
         env:
           - name: FAIL_ON_INIT_ERROR
             value: "false"
-        resources:
-          requests:
-            cpu: 50m
-            memory: 10Mi
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -54,12 +50,7 @@ spec:
         volumeMounts:
         - name: device-plugin
           mountPath: /var/lib/kubelet/device-plugins
-        - name: dev
-          mountPath: /dev
       volumes:
       - name: device-plugin
         hostPath:
           path: /var/lib/kubelet/device-plugins
-      - name: dev
-        hostPath:
-          path: /dev

From 51859e4fce01884c20d0e728a9c3c19dcbbb860f Mon Sep 17 00:00:00 2001
From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com>
Date: Thu, 19 Dec 2024 05:05:47 +0530
Subject: [PATCH 21/39] Update addons.go

---
 pkg/addons/addons.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index 8ab6bed63ee9..e28f1929d8f0 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -104,8 +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.")
+	// 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.")
 	}
 }
 
@@ -165,8 +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."
+	// 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, "", ""
 }

From 2741016fbabce64751b7894093bf30e3aef3c940 Mon Sep 17 00:00:00 2001
From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com>
Date: Thu, 19 Dec 2024 05:08:34 +0530
Subject: [PATCH 22/39] Update addons.go

---
 pkg/addons/addons.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index e28f1929d8f0..8ab6bed63ee9 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -104,8 +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.")
+	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.")
 	}
 }
 
@@ -165,8 +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."
+	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, "", ""
 }

From a88b4b40a3809e4a8d9b436efa812f1138662c5b Mon Sep 17 00:00:00 2001
From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com>
Date: Thu, 19 Dec 2024 05:15:00 +0530
Subject: [PATCH 23/39] Update config.go

---
 pkg/addons/config.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/addons/config.go b/pkg/addons/config.go
index c4385dfd018d..dbceeb385ffa 100644
--- a/pkg/addons/config.go
+++ b/pkg/addons/config.go
@@ -125,13 +125,13 @@ var Addons = []*Addon{
 		validations: []setFn{isKVMDriverForNVIDIA},
 		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},
-		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},
+	// 	callbacks:   []setFn{EnableOrDisableAddon},
+	// },
 	{
 		name:      "olm",
 		set:       SetBool,

From aced0197fd3729387e2ea080ea95c99c7a5be9f0 Mon Sep 17 00:00:00 2001
From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com>
Date: Thu, 19 Dec 2024 05:18:23 +0530
Subject: [PATCH 24/39] Update config.go

---
 pkg/addons/config.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/addons/config.go b/pkg/addons/config.go
index dbceeb385ffa..97b5862b4745 100644
--- a/pkg/addons/config.go
+++ b/pkg/addons/config.go
@@ -125,13 +125,13 @@ var Addons = []*Addon{
 		validations: []setFn{isKVMDriverForNVIDIA},
 		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},
-	// 	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},
+		// callbacks:   []setFn{EnableOrDisableAddon},
+	},
 	{
 		name:      "olm",
 		set:       SetBool,

From d77948195e719c6c646841950e37518d28bf0442 Mon Sep 17 00:00:00 2001
From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com>
Date: Thu, 19 Dec 2024 05:22:14 +0530
Subject: [PATCH 25/39] Update config.go

---
 pkg/addons/config.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/addons/config.go b/pkg/addons/config.go
index 97b5862b4745..525ccbf80c64 100644
--- a/pkg/addons/config.go
+++ b/pkg/addons/config.go
@@ -130,7 +130,7 @@ var Addons = []*Addon{
 		name:        "nvidia-gpu-device-plugin",
 		set:         SetBool,
 		// validations: []setFn{isKVMDriverForNVIDIA},
-		// callbacks:   []setFn{EnableOrDisableAddon},
+		callbacks:   []setFn{EnableOrDisableAddon},
 	},
 	{
 		name:      "olm",

From cf3c03fa7872eb77fa6442fd078eadf26dff30a2 Mon Sep 17 00:00:00 2001
From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com>
Date: Thu, 19 Dec 2024 05:24:34 +0530
Subject: [PATCH 26/39] Update config.go

---
 pkg/addons/config.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/addons/config.go b/pkg/addons/config.go
index 525ccbf80c64..c4385dfd018d 100644
--- a/pkg/addons/config.go
+++ b/pkg/addons/config.go
@@ -129,7 +129,7 @@ var Addons = []*Addon{
 		// 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},
+		validations: []setFn{isKVMDriverForNVIDIA},
 		callbacks:   []setFn{EnableOrDisableAddon},
 	},
 	{

From 7debb54f293092757ecbcb6aa99e0e638eb64ab0 Mon Sep 17 00:00:00 2001
From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com>
Date: Thu, 19 Dec 2024 05:33:54 +0530
Subject: [PATCH 27/39] Update Makefile

---
 Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 15d916f703bc..e41c359c76d6 100644
--- a/Makefile
+++ b/Makefile
@@ -190,9 +190,11 @@ define DOCKER
 	docker run --rm -e GOCACHE=/app/.cache -e IN_DOCKER=1 --user $(shell id -u):$(shell id -g) -w /app -v $(PWD):/app -v $(GOPATH):/go --init $(1) /bin/bash -c '$(2)'
 endef
 
-ifeq ($(BUILD_IN_DOCKER),y)
-	MINIKUBE_BUILD_IN_DOCKER=y
-endif
+# ifeq ($(BUILD_IN_DOCKER),y)
+# 	MINIKUBE_BUILD_IN_DOCKER=y
+# endif
+
+MINIKUBE_BUILD_IN_DOCKER=y
 
 # If we are already running in docker,
 # prevent recursion by unsetting the BUILD_IN_DOCKER directives.

From 1db9a8723b8e1fab63096e048147105823567e1e Mon Sep 17 00:00:00 2001
From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com>
Date: Thu, 19 Dec 2024 05:39:52 +0530
Subject: [PATCH 28/39] Update Makefile

---
 Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index e41c359c76d6..15d916f703bc 100644
--- a/Makefile
+++ b/Makefile
@@ -190,11 +190,9 @@ define DOCKER
 	docker run --rm -e GOCACHE=/app/.cache -e IN_DOCKER=1 --user $(shell id -u):$(shell id -g) -w /app -v $(PWD):/app -v $(GOPATH):/go --init $(1) /bin/bash -c '$(2)'
 endef
 
-# ifeq ($(BUILD_IN_DOCKER),y)
-# 	MINIKUBE_BUILD_IN_DOCKER=y
-# endif
-
-MINIKUBE_BUILD_IN_DOCKER=y
+ifeq ($(BUILD_IN_DOCKER),y)
+	MINIKUBE_BUILD_IN_DOCKER=y
+endif
 
 # If we are already running in docker,
 # prevent recursion by unsetting the BUILD_IN_DOCKER directives.

From 0dbe96ac5411b33140c50f7278a491748785a757 Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Thu, 19 Dec 2024 09:49:51 -0800
Subject: [PATCH 29/39] CNI: Update flannel from v0.26.1 to v0.26.2 (#20107)

---
 pkg/minikube/cni/flannel.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/minikube/cni/flannel.yaml b/pkg/minikube/cni/flannel.yaml
index 06016d7f86d4..f8409f200f6a 100644
--- a/pkg/minikube/cni/flannel.yaml
+++ b/pkg/minikube/cni/flannel.yaml
@@ -133,7 +133,7 @@ spec:
       serviceAccountName: flannel
       initContainers:
       - name: install-cni-plugin
-        image: docker.io/flannel/flannel-cni-plugin:v1.5.1-flannel2
+        image: docker.io/flannel/flannel-cni-plugin:v1.6.0-flannel1
         command:
         - cp
         args:
@@ -144,7 +144,7 @@ spec:
         - name: cni-plugin
           mountPath: /opt/cni/bin
       - name: install-cni
-        image: docker.io/flannel/flannel:v0.26.1
+        image: docker.io/flannel/flannel:v0.26.2
         command:
         - cp
         args:
@@ -158,7 +158,7 @@ spec:
           mountPath: /etc/kube-flannel/
       containers:
       - name: kube-flannel
-        image: docker.io/flannel/flannel:v0.26.1
+        image: docker.io/flannel/flannel:v0.26.2
         command:
         - /opt/bin/flanneld
         args:

From f76d5c961a131bbb9ac55509cf6f58b182b75978 Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Mon, 23 Dec 2024 10:24:12 -0800
Subject: [PATCH 30/39] Site: Update hugo from v0.139.5 to v0.140.0 (#20153)

---
 netlify.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netlify.toml b/netlify.toml
index e57cd593785a..256b596f0407 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in
 
 [build.environment]
 NODE_VERSION = "20.18.1"
-HUGO_VERSION = "v0.139.5"
+HUGO_VERSION = "v0.140.0"
 
 [context.production.environment]
 HUGO_ENV = "production"

From 550d8140f1ac11f91bb1d80d76f1625d2c74fdd1 Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Mon, 23 Dec 2024 10:24:37 -0800
Subject: [PATCH 31/39] CNI: Update cilium from v1.16.4 to v1.16.5 (#20148)

---
 pkg/minikube/cni/cilium.yaml | 66 +++++++++++++++++++++++++++++++-----
 1 file changed, 57 insertions(+), 9 deletions(-)

diff --git a/pkg/minikube/cni/cilium.yaml b/pkg/minikube/cni/cilium.yaml
index 70bd6e94a440..43c9e284833a 100644
--- a/pkg/minikube/cni/cilium.yaml
+++ b/pkg/minikube/cni/cilium.yaml
@@ -316,6 +316,30 @@ data:
                           }
                         }
                       ],
+                      "internal_address_config": {
+                        "cidr_ranges": [
+                          {
+                            "address_prefix": "10.0.0.0",
+                            "prefix_len": 8
+                          },
+                          {
+                            "address_prefix": "172.16.0.0",
+                            "prefix_len": 12
+                          },
+                          {
+                            "address_prefix": "192.168.0.0",
+                            "prefix_len": 16
+                          },
+                          {
+                            "address_prefix": "127.0.0.1",
+                            "prefix_len": 32
+                          },
+                          {
+                            "address_prefix": "::1",
+                            "prefix_len": 128
+                          }
+                        ]
+                      },
                       "stream_idle_timeout": "0s"
                     }
                   }
@@ -369,6 +393,30 @@ data:
                           }
                         }
                       ],
+                      "internal_address_config": {
+                        "cidr_ranges": [
+                          {
+                            "address_prefix": "10.0.0.0",
+                            "prefix_len": 8
+                          },
+                          {
+                            "address_prefix": "172.16.0.0",
+                            "prefix_len": 12
+                          },
+                          {
+                            "address_prefix": "192.168.0.0",
+                            "prefix_len": 16
+                          },
+                          {
+                            "address_prefix": "127.0.0.1",
+                            "prefix_len": 32
+                          },
+                          {
+                            "address_prefix": "::1",
+                            "prefix_len": 128
+                          }
+                        ]
+                      },
                       "stream_idle_timeout": "0s"
                     }
                   }
@@ -1068,7 +1116,7 @@ spec:
           type: Unconfined
       containers:
       - name: cilium-agent
-        image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf"
+        image: "quay.io/cilium/cilium:v1.16.5@sha256:758ca0793f5995bb938a2fa219dcce63dc0b3fa7fc4ce5cc851125281fb7361d"
         imagePullPolicy: IfNotPresent
         command:
         - cilium-agent
@@ -1222,7 +1270,7 @@ spec:
           mountPath: /tmp
       initContainers:
       - name: config
-        image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf"
+        image: "quay.io/cilium/cilium:v1.16.5@sha256:758ca0793f5995bb938a2fa219dcce63dc0b3fa7fc4ce5cc851125281fb7361d"
         imagePullPolicy: IfNotPresent
         command:
         - cilium-dbg
@@ -1245,7 +1293,7 @@ spec:
       # Required to mount cgroup2 filesystem on the underlying Kubernetes node.
       # We use nsenter command with host's cgroup and mount namespaces enabled.
       - name: mount-cgroup
-        image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf"
+        image: "quay.io/cilium/cilium:v1.16.5@sha256:758ca0793f5995bb938a2fa219dcce63dc0b3fa7fc4ce5cc851125281fb7361d"
         imagePullPolicy: IfNotPresent
         env:
         - name: CGROUP_ROOT
@@ -1282,7 +1330,7 @@ spec:
             drop:
               - ALL
       - name: apply-sysctl-overwrites
-        image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf"
+        image: "quay.io/cilium/cilium:v1.16.5@sha256:758ca0793f5995bb938a2fa219dcce63dc0b3fa7fc4ce5cc851125281fb7361d"
         imagePullPolicy: IfNotPresent
         env:
         - name: BIN_PATH
@@ -1320,7 +1368,7 @@ spec:
       # from a privileged container because the mount propagation bidirectional
       # only works from privileged containers.
       - name: mount-bpf-fs
-        image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf"
+        image: "quay.io/cilium/cilium:v1.16.5@sha256:758ca0793f5995bb938a2fa219dcce63dc0b3fa7fc4ce5cc851125281fb7361d"
         imagePullPolicy: IfNotPresent
         args:
         - 'mount | grep "/sys/fs/bpf type bpf" || mount -t bpf bpf /sys/fs/bpf'
@@ -1336,7 +1384,7 @@ spec:
           mountPath: /sys/fs/bpf
           mountPropagation: Bidirectional
       - name: clean-cilium-state
-        image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf"
+        image: "quay.io/cilium/cilium:v1.16.5@sha256:758ca0793f5995bb938a2fa219dcce63dc0b3fa7fc4ce5cc851125281fb7361d"
         imagePullPolicy: IfNotPresent
         command:
         - /init-container.sh
@@ -1383,7 +1431,7 @@ spec:
           mountPath: /var/run/cilium # wait-for-kube-proxy
       # Install the CNI binaries in an InitContainer so we don't have a writable host mount in the agent
       - name: install-cni-binaries
-        image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf"
+        image: "quay.io/cilium/cilium:v1.16.5@sha256:758ca0793f5995bb938a2fa219dcce63dc0b3fa7fc4ce5cc851125281fb7361d"
         imagePullPolicy: IfNotPresent
         command:
           - "/install-plugin.sh"
@@ -1561,7 +1609,7 @@ spec:
           type: Unconfined
       containers:
       - name: cilium-envoy
-        image: "quay.io/cilium/cilium-envoy:v1.30.7-1731393961-97edc2815e2c6a174d3d12e71731d54f5d32ea16@sha256:0287b36f70cfbdf54f894160082f4f94d1ee1fb10389f3a95baa6c8e448586ed"
+        image: "quay.io/cilium/cilium-envoy:v1.30.8-1733837904-eaae5aca0fb988583e5617170a65ac5aa51c0aa8@sha256:709c08ade3d17d52da4ca2af33f431360ec26268d288d9a6cd1d98acc9a1dced"
         imagePullPolicy: IfNotPresent
         command:
         - /usr/bin/cilium-envoy-starter
@@ -1737,7 +1785,7 @@ spec:
     spec:
       containers:
       - name: cilium-operator
-        image: "quay.io/cilium/operator-generic:v1.16.4@sha256:c55a7cbe19fe0b6b28903a085334edb586a3201add9db56d2122c8485f7a51c5"
+        image: "quay.io/cilium/operator-generic:v1.16.5@sha256:f7884848483bbcd7b1e0ccfd34ba4546f258b460cb4b7e2f06a1bcc96ef88039"
         imagePullPolicy: IfNotPresent
         command:
         - cilium-operator-generic

From 5a7d662d9f9f648ed0cb5633ab60be2875db3a04 Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Mon, 23 Dec 2024 10:24:58 -0800
Subject: [PATCH 32/39] CI: Update gh from 2.63.2 to 2.64.0 (#20149)

---
 hack/jenkins/installers/check_install_gh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/jenkins/installers/check_install_gh.sh b/hack/jenkins/installers/check_install_gh.sh
index 1d125fcabb58..b1f7b12176b2 100755
--- a/hack/jenkins/installers/check_install_gh.sh
+++ b/hack/jenkins/installers/check_install_gh.sh
@@ -16,7 +16,7 @@
 
 set -eux -o pipefail
 
-GH_VERSION="2.63.2"
+GH_VERSION="2.64.0"
 
 echo "Installing latest version of gh"
 curl -qLO "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz"

From 3dae3866bd4370c0f3bef22ace0071f9f83f6193 Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Mon, 23 Dec 2024 10:25:17 -0800
Subject: [PATCH 33/39] Update go-github from v67.0.0 to v67.0.0 (#20152)

---
 go.mod | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index 9a18c7eb1890..8dd7dae3d3b2 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,7 @@
 module k8s.io/minikube
 
-go 1.22.0
+go 1.23.0
+
 toolchain go1.23.4
 
 require (

From 29758e1ff1caad70a8d0265aa6e9272879331bcc Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Mon, 30 Dec 2024 10:21:56 -0800
Subject: [PATCH 34/39] Update auto-generated docs and translations (#20157)

---
 translations/de.json     | 1 +
 translations/es.json     | 1 +
 translations/fr.json     | 1 +
 translations/ja.json     | 1 +
 translations/ko.json     | 1 +
 translations/pl.json     | 1 +
 translations/ru.json     | 1 +
 translations/strings.txt | 1 +
 translations/zh-CN.json  | 1 +
 9 files changed, 9 insertions(+)

diff --git a/translations/de.json b/translations/de.json
index cfa76e5db2f8..d5da35fe90f5 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -794,6 +794,7 @@
 	"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "Die Verwendung des 'none' Treibers mit Kubernetes v1.24+ und der Docker Container-Runtime erfordert dockert.\n\t\t\n\t\tBitte folgen Sie diesen Anweisungen um dockerd zu installieren:\n\n\t\thttps://docs.docker.com/engine/install/",
 	"The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "Die Verwendung des 'none' Treibers mit Kubernetes v1.24+ erfordert containernetworking-plugins.\n\n\t\t Bitte folgen Sie diesen Anweisungen um containernetworking-plugins zu installieren:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver",
 	"The number of nodes to spin up. Defaults to 1.": "Die Anzahl der zu startenden Nodes. Default: 1",
+	"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.": "",
 	"The output format. One of 'json', 'table'": "Das Ausgabe Format. (Entweder 'json' oder 'table')",
 	"The path on the file system where the docs in markdown need to be saved": "Der Pfad auf dem Dateisystem indem die Dokumente in Markdown gespeichert werden müssen",
 	"The path on the file system where the error code docs in markdown need to be saved": "Der Pfad auf dem Dateisystem auf dem die Fehler-Code Dokumente in Markdown gespeichert werden müssen",
diff --git a/translations/es.json b/translations/es.json
index 554a651f015c..a963b1614e97 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -771,6 +771,7 @@
 	"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "",
 	"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "",
 	"The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "",
+	"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.": "",
 	"The output format. One of 'json', 'table'": "",
 	"The path on the file system where the docs in markdown need to be saved": "",
 	"The path on the file system where the error code docs in markdown need to be saved": "",
diff --git a/translations/fr.json b/translations/fr.json
index c2c55a0a8bb7..bfb4fabaf40b 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -779,6 +779,7 @@
 	"The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "Le pilote none avec Kubernetes v1.24+ nécessite containernetworking-plugins.\n\n\t\tVeuillez installer containernetworking-plugins en suivant ces instructions :\n\n\t\thttps://minikube.sigs.k8s.io/docs /faq/#how-do-i-install-containernetworking-plugins-for-none-driver",
 	"The number of bytes to use for 9p packet payload": "Le nombre d'octets à utiliser pour la charge utile du paquet 9p",
 	"The number of nodes to spin up. Defaults to 1.": "Le nombre de nœuds à faire tourner. La valeur par défaut est 1.",
+	"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.": "",
 	"The output format. One of 'json', 'table'": "Le format de sortie. 'json' ou 'table'",
 	"The path on the file system where the docs in markdown need to be saved": "Le chemin sur le système de fichiers où les documents en markdown doivent être enregistrés",
 	"The path on the file system where the error code docs in markdown need to be saved": "Le chemin sur le système de fichiers où les documents code d'erreur en markdown doivent être enregistrés",
diff --git a/translations/ja.json b/translations/ja.json
index ecdc1353c897..ddfaee886a8d 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -746,6 +746,7 @@
 	"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "Kubernetes v1.24+ の none ドライバーと docker container-runtime は dockerd を要求します。\n\t\t\n\t\tこれらの手順を参照して dockerd をインストールしてください:\n\n\t\thttps://docs.docker.com/engine/install/",
 	"The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "",
 	"The number of nodes to spin up. Defaults to 1.": "起動するノード数。デフォルトは 1。",
+	"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.": "",
 	"The output format. One of 'json', 'table'": "出力形式。'json', 'table' のいずれか",
 	"The path on the file system where the docs in markdown need to be saved": "markdown で書かれたドキュメントの保存先のファイルシステムパス",
 	"The path on the file system where the error code docs in markdown need to be saved": "markdown で書かれたエラーコードドキュメントの保存先のファイルシステムパス",
diff --git a/translations/ko.json b/translations/ko.json
index fa4a1f9586a8..7805aaa8d853 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -781,6 +781,7 @@
 	"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "",
 	"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "",
 	"The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "",
+	"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.": "",
 	"The output format. One of 'json', 'table'": "",
 	"The path on the file system where the docs in markdown need to be saved": "",
 	"The path on the file system where the error code docs in markdown need to be saved": "",
diff --git a/translations/pl.json b/translations/pl.json
index f01136fc454c..6f743b36b116 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -783,6 +783,7 @@
 	"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "",
 	"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "",
 	"The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "",
+	"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.": "",
 	"The output format. One of 'json', 'table'": "",
 	"The path on the file system where the docs in markdown need to be saved": "",
 	"The path on the file system where the error code docs in markdown need to be saved": "",
diff --git a/translations/ru.json b/translations/ru.json
index 77543c24cba7..80b268d8435c 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -713,6 +713,7 @@
 	"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "",
 	"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "",
 	"The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "",
+	"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.": "",
 	"The output format. One of 'json', 'table'": "",
 	"The path on the file system where the docs in markdown need to be saved": "",
 	"The path on the file system where the error code docs in markdown need to be saved": "",
diff --git a/translations/strings.txt b/translations/strings.txt
index 6ae6cee19a69..32b5e0e67edb 100644
--- a/translations/strings.txt
+++ b/translations/strings.txt
@@ -711,6 +711,7 @@
 	"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "",
 	"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "",
 	"The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "",
+	"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.": "",
 	"The output format. One of 'json', 'table'": "",
 	"The path on the file system where the docs in markdown need to be saved": "",
 	"The path on the file system where the error code docs in markdown need to be saved": "",
diff --git a/translations/zh-CN.json b/translations/zh-CN.json
index 680f996bccb9..40d03afbc710 100644
--- a/translations/zh-CN.json
+++ b/translations/zh-CN.json
@@ -892,6 +892,7 @@
 	"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "Kubernetes v1.24+ 和 docker 容器运行时的 none 驱动需要 cri-dockerd。\n\n请使用以下说明安装 cri-dockerd：\n\n\thttps://github.com/Mirantis/cri-dockerd",
 	"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "Kubernetes v1.24+ 和 docker 容器运行时的 none 驱动需要 dockerd。\n\n请使用以下说明安装 dockerd：\n\n\thttps://docs.docker.com/engine/install/",
 	"The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "",
+	"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.": "",
 	"The output format. One of 'json', 'table'": "输出的格式。'json' 或者 'table'",
 	"The path on the file system where the docs in markdown need to be saved": "Markdown 文档需要保存的文件系统路径。",
 	"The path on the file system where the error code docs in markdown need to be saved": "错误代码文档（markdown 格式）需要保存在文件系统上的路径",

From 5a1b391fb0bfb88f529868e6c2abe4b3ea66a2e5 Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Mon, 30 Dec 2024 10:24:00 -0800
Subject: [PATCH 35/39] Update go-github from v67.0.0 to v68.0.0 (#20174)

---
 cmd/minikube/cmd/config/kubernetes_version.go                 | 2 +-
 go.mod                                                        | 2 +-
 go.sum                                                        | 4 ++--
 hack/preload-images/kubernetes.go                             | 2 +-
 hack/update/github.go                                         | 2 +-
 hack/update/ingress_version/update_ingress_version.go         | 2 +-
 hack/update/kubeadm_constants/update_kubeadm_constants.go     | 2 +-
 .../update_kubernetes_versions_list.go                        | 2 +-
 hack/update/site_node_version/update_site_node_version.go     | 2 +-
 pkg/perf/monitor/github.go                                    | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cmd/minikube/cmd/config/kubernetes_version.go b/cmd/minikube/cmd/config/kubernetes_version.go
index e0d62e81cfc7..7c260cbad48c 100644
--- a/cmd/minikube/cmd/config/kubernetes_version.go
+++ b/cmd/minikube/cmd/config/kubernetes_version.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/google/go-github/v67/github"
+	"github.com/google/go-github/v68/github"
 	"golang.org/x/mod/semver"
 	"k8s.io/minikube/pkg/minikube/constants"
 )
diff --git a/go.mod b/go.mod
index 8dd7dae3d3b2..55acc6559549 100644
--- a/go.mod
+++ b/go.mod
@@ -28,7 +28,7 @@ require (
 	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
 	github.com/google/go-cmp v0.6.0
 	github.com/google/go-containerregistry v0.20.2
-	github.com/google/go-github/v67 v67.0.0
+	github.com/google/go-github/v68 v68.0.0
 	github.com/google/slowjam v1.1.1
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-getter v1.7.6
diff --git a/go.sum b/go.sum
index 7791e35101f5..36cb075dcab2 100644
--- a/go.sum
+++ b/go.sum
@@ -873,8 +873,8 @@ github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYV
 github.com/google/go-containerregistry v0.20.2 h1:B1wPJ1SN/S7pB+ZAimcciVD+r+yV/l/DSArMxlbwseo=
 github.com/google/go-containerregistry v0.20.2/go.mod h1:z38EKdKh4h7IP2gSfUUqEvalZBqs6AoLeWfUy34nQC8=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
-github.com/google/go-github/v67 v67.0.0 h1:g11NDAmfaBaCO8qYdI9fsmbaRipHNWRIU/2YGvlh4rg=
-github.com/google/go-github/v67 v67.0.0/go.mod h1:zH3K7BxjFndr9QSeFibx4lTKkYS3K9nDanoI1NjaOtY=
+github.com/google/go-github/v68 v68.0.0 h1:ZW57zeNZiXTdQ16qrDiZ0k6XucrxZ2CGmoTvcCyQG6s=
+github.com/google/go-github/v68 v68.0.0/go.mod h1:K9HAUBovM2sLwM408A18h+wd9vqdLOEqTUCbnRIcx68=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
diff --git a/hack/preload-images/kubernetes.go b/hack/preload-images/kubernetes.go
index ed826f1eec8d..d6b13518dac8 100644
--- a/hack/preload-images/kubernetes.go
+++ b/hack/preload-images/kubernetes.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/google/go-github/v67/github"
+	"github.com/google/go-github/v68/github"
 
 	"k8s.io/klog/v2"
 )
diff --git a/hack/update/github.go b/hack/update/github.go
index ad74175a953f..fb74e36ae94c 100644
--- a/hack/update/github.go
+++ b/hack/update/github.go
@@ -23,7 +23,7 @@ import (
 
 	"golang.org/x/mod/semver"
 
-	"github.com/google/go-github/v67/github"
+	"github.com/google/go-github/v68/github"
 )
 
 const (
diff --git a/hack/update/ingress_version/update_ingress_version.go b/hack/update/ingress_version/update_ingress_version.go
index 4311baca8691..2457f14e2943 100644
--- a/hack/update/ingress_version/update_ingress_version.go
+++ b/hack/update/ingress_version/update_ingress_version.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/google/go-github/v67/github"
+	"github.com/google/go-github/v68/github"
 	"golang.org/x/mod/semver"
 	"k8s.io/klog/v2"
 
diff --git a/hack/update/kubeadm_constants/update_kubeadm_constants.go b/hack/update/kubeadm_constants/update_kubeadm_constants.go
index 76683959edb2..1653b7e7b038 100644
--- a/hack/update/kubeadm_constants/update_kubeadm_constants.go
+++ b/hack/update/kubeadm_constants/update_kubeadm_constants.go
@@ -29,7 +29,7 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/google/go-github/v67/github"
+	"github.com/google/go-github/v68/github"
 	"golang.org/x/mod/semver"
 	"k8s.io/klog/v2"
 	"k8s.io/minikube/hack/update"
diff --git a/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go b/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go
index 1e50197b2436..81a70886e6c2 100644
--- a/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go
+++ b/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go
@@ -23,7 +23,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/google/go-github/v67/github"
+	"github.com/google/go-github/v68/github"
 	"golang.org/x/mod/semver"
 	"k8s.io/klog/v2"
 	"k8s.io/minikube/hack/update"
diff --git a/hack/update/site_node_version/update_site_node_version.go b/hack/update/site_node_version/update_site_node_version.go
index 5ea5534530e3..018326dd1922 100644
--- a/hack/update/site_node_version/update_site_node_version.go
+++ b/hack/update/site_node_version/update_site_node_version.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/google/go-github/v67/github"
+	"github.com/google/go-github/v68/github"
 	"golang.org/x/mod/semver"
 	"k8s.io/klog/v2"
 	"k8s.io/minikube/hack/update"
diff --git a/pkg/perf/monitor/github.go b/pkg/perf/monitor/github.go
index f104ed177f87..1162f265cdc4 100644
--- a/pkg/perf/monitor/github.go
+++ b/pkg/perf/monitor/github.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/google/go-github/v67/github"
+	"github.com/google/go-github/v68/github"
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
 )

From b7d73c376d8526368ecaa29858affc4a98b6db73 Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Mon, 30 Dec 2024 10:24:16 -0800
Subject: [PATCH 36/39] Site: Update hugo from v0.140.0 to v0.140.1 (#20175)

---
 netlify.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netlify.toml b/netlify.toml
index 256b596f0407..3d55dc413ed1 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in
 
 [build.environment]
 NODE_VERSION = "20.18.1"
-HUGO_VERSION = "v0.140.0"
+HUGO_VERSION = "v0.140.1"
 
 [context.production.environment]
 HUGO_ENV = "production"

From 6c3ebafe3caa952065ba6c72c38cd6232013571a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Dec 2024 10:26:24 -0800
Subject: [PATCH 37/39] Build(deps): Bump google.golang.org/api from 0.210.0 to
 0.214.0 (#20158)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.210.0 to 0.214.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.210.0...v0.214.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 12 ++++++------
 go.sum | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/go.mod b/go.mod
index 55acc6559549..53a1af2b577b 100644
--- a/go.mod
+++ b/go.mod
@@ -68,7 +68,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.33.0
 	go.opentelemetry.io/otel/trace v1.33.0
 	golang.org/x/build v0.0.0-20190927031335-2835ba2e683f
-	golang.org/x/crypto v0.30.0
+	golang.org/x/crypto v0.31.0
 	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
 	golang.org/x/mod v0.22.0
 	golang.org/x/oauth2 v0.24.0
@@ -77,7 +77,7 @@ require (
 	golang.org/x/term v0.27.0
 	golang.org/x/text v0.21.0
 	gonum.org/v1/plot v0.15.0
-	google.golang.org/api v0.210.0
+	google.golang.org/api v0.214.0
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.31.3
 	k8s.io/apimachinery v0.32.0
@@ -94,9 +94,9 @@ require (
 require (
 	cel.dev/expr v0.16.1 // indirect
 	cloud.google.com/go v0.116.0 // indirect
-	cloud.google.com/go/auth v0.12.1 // indirect
+	cloud.google.com/go/auth v0.13.0 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
-	cloud.google.com/go/compute/metadata v0.5.2 // indirect
+	cloud.google.com/go/compute/metadata v0.6.0 // indirect
 	cloud.google.com/go/iam v1.2.2 // indirect
 	cloud.google.com/go/monitoring v1.21.2 // indirect
 	cloud.google.com/go/trace v1.11.2 // indirect
@@ -235,12 +235,12 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/image v0.21.0 // indirect
-	golang.org/x/net v0.32.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/time v0.8.0 // indirect
 	golang.org/x/tools v0.26.0 // indirect
 	google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
 	google.golang.org/grpc v1.67.2 // indirect
 	google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect
 	google.golang.org/protobuf v1.35.2 // indirect
diff --git a/go.sum b/go.sum
index 36cb075dcab2..7d760c386b09 100644
--- a/go.sum
+++ b/go.sum
@@ -51,8 +51,8 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby
 cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY=
 cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw=
 cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI=
-cloud.google.com/go/auth v0.12.1 h1:n2Bj25BUMM0nvE9D2XLTiImanwZhO3DkfWSYS/SAJP4=
-cloud.google.com/go/auth v0.12.1/go.mod h1:BFMu+TNpF3DmvfBO9ClqTR/SiqVIm7LukKF9mbendF4=
+cloud.google.com/go/auth v0.13.0 h1:8Fu8TZy167JkW8Tj3q7dIkr2v4cndv41ouecJx0PAHs=
+cloud.google.com/go/auth v0.13.0/go.mod h1:COOjD9gwfKNKz+IIduatIhYJQIc0mG3H102r/EMxX6Q=
 cloud.google.com/go/auth/oauth2adapt v0.2.6 h1:V6a6XDu2lTwPZWOawrAa9HUK+DB2zfJyTuciBG5hFkU=
 cloud.google.com/go/auth/oauth2adapt v0.2.6/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8=
 cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0=
@@ -77,8 +77,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz
 cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
 cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
-cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo=
-cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k=
+cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
+cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
 cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I=
 cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4=
 cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0=
@@ -1765,8 +1765,8 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
-golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1890,8 +1890,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
-golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -2255,8 +2255,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ
 google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
 google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
 google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
-google.golang.org/api v0.210.0 h1:HMNffZ57OoZCRYSbdWVRoqOa8V8NIHLL0CzdBPLztWk=
-google.golang.org/api v0.210.0/go.mod h1:B9XDZGnx2NtyjzVkOVTGrFSAVZgPcbedzKg/gTLwqBs=
+google.golang.org/api v0.214.0 h1:h2Gkq07OYi6kusGOaT/9rnNljuXmqPnaig7WGPmKbwA=
+google.golang.org/api v0.214.0/go.mod h1:bYPpLG8AyeMWwDU6NXoB00xC0DFkikVvd5MfwoxjLqE=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -2376,8 +2376,8 @@ google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD
 google.golang.org/genproto v0.0.0-20241118233622-e639e219e697/go.mod h1:JJrvXBWRZaFMxBufik1a4RpFw4HhgVtBBWQeQgUj2cc=
 google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f h1:M65LEviCfuZTfrfzwwEoxVtgvfkFkBUbFnRbxCXuXhU=
 google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f/go.mod h1:Yo94eF2nj7igQt+TiJ49KxjIH8ndLYPZMIRSiRcEbg0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 h1:IfdSdTcLFy4lqUQrQJLkLt1PB+AsqVz6lwkWPzWEz10=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
 google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=

From 22114eecaf55337aae5401d573a2d9a1cb8b7465 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Dec 2024 10:28:11 -0800
Subject: [PATCH 38/39] Build(deps): Bump libvirt.org/go/libvirt from 1.10009.0
 to 1.10009.1 (#20160)

Bumps [libvirt.org/go/libvirt](https://gitlab.com/libvirt/libvirt-go-module) from 1.10009.0 to 1.10009.1.
- [Commits](https://gitlab.com/libvirt/libvirt-go-module/compare/v1.10009.0...v1.10009.1)

---
updated-dependencies:
- dependency-name: libvirt.org/go/libvirt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 53a1af2b577b..b43578b306d5 100644
--- a/go.mod
+++ b/go.mod
@@ -87,7 +87,7 @@ require (
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kubectl v0.31.3
 	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
-	libvirt.org/go/libvirt v1.10009.0
+	libvirt.org/go/libvirt v1.10009.1
 	sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0
 )
 
diff --git a/go.sum b/go.sum
index 7d760c386b09..b56109cafb2c 100644
--- a/go.sum
+++ b/go.sum
@@ -2579,8 +2579,8 @@ k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
 k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-libvirt.org/go/libvirt v1.10009.0 h1:Lf3jktPJwrOF/lIb6fZN/TNUPhNVyS70wAk8lI2dGj8=
-libvirt.org/go/libvirt v1.10009.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ=
+libvirt.org/go/libvirt v1.10009.1 h1:Z79EnxEVE190MeULGoq1GY0tb+O18FpYzUNYDHgkrN8=
+libvirt.org/go/libvirt v1.10009.1/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

From 4617a6a7fbf689e799c6381e751223e6047b00fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Dec 2024 10:28:24 -0800
Subject: [PATCH 39/39] Build(deps): Bump github.com/docker/docker (#20161)

Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.3.1+incompatible to 27.4.1+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](https://github.com/docker/docker/compare/v27.3.1...v27.4.1)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index b43578b306d5..f58e1b1eddb8 100644
--- a/go.mod
+++ b/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/cloudevents/sdk-go/v2 v2.15.2
 	github.com/distribution/reference v0.6.0
 	github.com/docker/cli v27.4.0+incompatible
-	github.com/docker/docker v27.3.1+incompatible
+	github.com/docker/docker v27.4.1+incompatible
 	github.com/docker/go-connections v0.5.0
 	github.com/docker/go-units v0.5.0
 	github.com/docker/machine v0.16.2
diff --git a/go.sum b/go.sum
index b56109cafb2c..5734e3966475 100644
--- a/go.sum
+++ b/go.sum
@@ -585,8 +585,8 @@ github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r
 github.com/docker/docker v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v17.12.0-ce-rc1.0.20190115220918-5ec31380a5d3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v20.10.14+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI=
-github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4=
+github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
 github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
 github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=