msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Merge 129ff801f1 into 1ee1706870

Browse Source
pull/3914/merge
Matthew Fisher 8 years ago committed by GitHub
parent 1ee1706870 129ff801f1
commit 3b420adf86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File

3
pkg/kube/client.go
Unescape View File

@ -45,6 +45,7 @@ import (
"k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
"k8s.io/kubernetes/pkg/api/legacyscheme"
batchinternal "k8s.io/kubernetes/pkg/apis/batch" batchinternal "k8s.io/kubernetes/pkg/apis/batch"
"k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl"
@ -612,7 +613,7 @@ func (c *Client) AsVersionedObject(obj runtime.Object) (runtime.Object, error) {
return nil, err return nil, err
} }
versions := &runtime.VersionedObjects{} versions := &runtime.VersionedObjects{}
decoder := unstructured.UnstructuredJSONScheme decoder := legacyscheme.Codecs.UniversalDecoder()
err = runtime.DecodeInto(decoder, json, versions) err = runtime.DecodeInto(decoder, json, versions)
return versions.First(), err return versions.First(), err
} }

Write Preview
Loading…
Cancel
Save