Skip to content

Commit e2894a1

Browse files
fix(kube): Fixes missing API versions
In several of the job checks and other conversions we were using legacyscheme. I don't know why it was working before, but I am guessing something changed between k8s 1.15 and 1.16. To fix I changed the references to use the default scheme in client-go Signed-off-by: Taylor Thomas <taylor.thomas@microsoft.com>
1 parent bed80a5 commit e2894a1

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

pkg/kube/client.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ import (
5757
watchtools "k8s.io/client-go/tools/watch"
5858
cmdutil "k8s.io/kubectl/pkg/cmd/util"
5959
"k8s.io/kubectl/pkg/validation"
60-
"k8s.io/kubernetes/pkg/api/legacyscheme"
6160
"k8s.io/kubernetes/pkg/apis/core"
6261
"k8s.io/kubernetes/pkg/kubectl/cmd/get"
6362
)
@@ -269,7 +268,7 @@ func (c *Client) Get(namespace string, reader io.Reader) (string, error) {
269268
for i := range podItems {
270269
pod := &core.Pod{}
271270

272-
legacyscheme.Scheme.Convert(&podItems[i], pod, nil)
271+
scheme.Scheme.Convert(&podItems[i], pod, nil)
273272
if objs[key+"(related)"] == nil {
274273
objs[key+"(related)"] = make(map[string]runtime.Object)
275274
}
@@ -882,7 +881,7 @@ func (c *Client) watchUntilReady(timeout time.Duration, info *resource.Info) err
882881
// This operates on an event returned from a watcher.
883882
func (c *Client) waitForJob(e watch.Event, name string) (bool, error) {
884883
job := &batch.Job{}
885-
err := legacyscheme.Scheme.Convert(e.Object, job, nil)
884+
err := scheme.Scheme.Convert(e.Object, job, nil)
886885
if err != nil {
887886
return true, err
888887
}
@@ -1043,5 +1042,5 @@ func asVersioned(info *resource.Info) (runtime.Object, error) {
10431042

10441043
func asInternal(info *resource.Info) (runtime.Object, error) {
10451044
groupVersioner := info.Mapping.GroupVersionKind.GroupKind().WithVersion(runtime.APIVersionInternal).GroupVersion()
1046-
return legacyscheme.Scheme.ConvertToVersion(info.Object, groupVersioner)
1045+
return scheme.Scheme.ConvertToVersion(info.Object, groupVersioner)
10471046
}

0 commit comments

Comments
 (0)