From 9ab290c347b5f4c8168cafdf4356a5a2b3803b0f Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <liggitt@google.com>
Date: Mon, 13 Sep 2021 11:49:17 -0400
Subject: [PATCH] Propagate conversion errors

Kubernetes-commit: b9adf66929f09712f931d975034a2ef3940b3ec0
---
 tools/clientcmd/api/v1/conversion.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/clientcmd/api/v1/conversion.go b/tools/clientcmd/api/v1/conversion.go
index c38ebc076..6eee281bc 100644
--- a/tools/clientcmd/api/v1/conversion.go
+++ b/tools/clientcmd/api/v1/conversion.go
@@ -165,7 +165,7 @@ func Convert_Map_string_To_runtime_Object_To_Slice_v1_NamedExtension(in *map[str
 		newExtension := (*in)[key]
 		oldExtension := runtime.RawExtension{}
 		if err := runtime.Convert_runtime_Object_To_runtime_RawExtension(&newExtension, &oldExtension, s); err != nil {
-			return nil
+			return err
 		}
 		namedExtension := NamedExtension{key, oldExtension}
 		*out = append(*out, namedExtension)