Skip to content

Commit bbdfe5e

Browse files
thomastaylor312mattfarina
authored andcommitted
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> (cherry picked from commit e2894a1)
1 parent eec6974 commit bbdfe5e

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

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
}
@@ -888,7 +887,7 @@ func (c *Client) watchUntilReady(timeout time.Duration, info *resource.Info) err
888887
// This operates on an event returned from a watcher.
889888
func (c *Client) waitForJob(e watch.Event, name string) (bool, error) {
890889
job := &batch.Job{}
891-
err := legacyscheme.Scheme.Convert(e.Object, job, nil)
890+
err := scheme.Scheme.Convert(e.Object, job, nil)
892891
if err != nil {
893892
return true, err
894893
}
@@ -1049,5 +1048,5 @@ func asVersioned(info *resource.Info) (runtime.Object, error) {
10491048

10501049
func asInternal(info *resource.Info) (runtime.Object, error) {
10511050
groupVersioner := info.Mapping.GroupVersionKind.GroupKind().WithVersion(runtime.APIVersionInternal).GroupVersion()
1052-
return legacyscheme.Scheme.ConvertToVersion(info.Object, groupVersioner)
1051+
return scheme.Scheme.ConvertToVersion(info.Object, groupVersioner)
10531052
}

0 commit comments

Comments
 (0)