Merge pull request #41474 from wojtek-t/debug_decode_parameters

Automatic merge from submit-queue (batch tested with PRs 41332, 41069, 41470, 41474) Fix unnecessary conversions in parameter codec. Fix #41472 @deads2k @smarterclayton @sttts

Merge pull request #41474 from wojtek-t/debug_decode_parameters
14bdecee · Kubernetes Submit Queue · GitHub · a2e4d377 · fb78390f · 14bdecee
Commit 14bdecee authored Feb 15, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

codec.go staging/src/k8s.io/apimachinery/pkg/runtime/codec.go +5 -4

No files found.
--- a/staging/src/k8s.io/apimachinery/pkg/runtime/codec.go
+++ b/staging/src/k8s.io/apimachinery/pkg/runtime/codec.go
@@ -161,11 +161,12 @@ func (c *parameterCodec) DecodeParameters(parameters url.Values, from schema.Gro
 	if err != nil {
 		return err
 	}
-	targetGVK := targetGVKs[0]
+	for i := range targetGVKs {
-	if targetGVK.GroupVersion() == from {
+		if targetGVKs[i].GroupVersion() == from {
-		return c.convertor.Convert(&parameters, into, nil)
+			return c.convertor.Convert(&parameters, into, nil)
+		}
 	}
-	input, err := c.creator.New(from.WithKind(targetGVK.Kind))
+	input, err := c.creator.New(from.WithKind(targetGVKs[0].Kind))
 	if err != nil {
 		return err
 	}