Merge pull request #121771 from pohly/apimachinery-encoding-shortcut

encoding: avoid setting GVK unnecessarily Kubernetes-commit: 508e3b94fe48136c2c7bff6239986851f0e21dc0
tilt-dev · Dec 14, 2023 · 2341c26 · 2341c26
2 parents aa9a6c8 + 013c6eb
commit 2341c26
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/pkg/runtime/helper.go b/pkg/runtime/helper.go
@@ -236,10 +236,14 @@ func (e WithVersionEncoder) Encode(obj Object, stream io.Writer) error {
 			gvk = preferredGVK
 		}
 	}
-	kind.SetGroupVersionKind(gvk)
-	err = e.Encoder.Encode(obj, stream)
-	kind.SetGroupVersionKind(oldGVK)
-	return err
+
+	// The gvk only needs to be set if not already as desired.
+	if gvk != oldGVK {
+		kind.SetGroupVersionKind(gvk)
+		defer kind.SetGroupVersionKind(oldGVK)
+	}
+
+	return e.Encoder.Encode(obj, stream)
 }
 
 // WithoutVersionDecoder clears the group version kind of a deserialized object.