Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
ce656024
Commit
ce656024
authored
Sep 13, 2018
by
Sean Sullivan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove legacyscheme by adding ParameterCodec to kubectl scheme
parent
fe72bd20
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
attach.go
pkg/kubectl/cmd/attach.go
+1
-2
exec.go
pkg/kubectl/cmd/exec.go
+2
-2
scheme.go
pkg/kubectl/scheme/scheme.go
+3
-0
No files found.
pkg/kubectl/cmd/attach.go
View file @
ce656024
...
...
@@ -31,7 +31,6 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
restclient
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/remotecommand"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
...
...
@@ -137,7 +136,7 @@ func defaultAttachFunc(o *AttachOptions, containerToAttach *corev1.Container, ra
Stdout
:
o
.
Out
!=
nil
,
Stderr
:
!
o
.
DisableStderr
,
TTY
:
raw
,
},
legacy
scheme
.
ParameterCodec
)
},
scheme
.
ParameterCodec
)
return
o
.
Attach
.
Attach
(
"POST"
,
req
.
URL
(),
o
.
Config
,
o
.
In
,
o
.
Out
,
o
.
ErrOut
,
raw
,
sizeQueue
)
}
...
...
pkg/kubectl/cmd/exec.go
View file @
ce656024
...
...
@@ -30,10 +30,10 @@ import (
coreclient
"k8s.io/client-go/kubernetes/typed/core/v1"
restclient
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/remotecommand"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api
"k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/term"
"k8s.io/kubernetes/pkg/util/interrupt"
...
...
@@ -321,7 +321,7 @@ func (p *ExecOptions) Run() error {
Stdout
:
p
.
Out
!=
nil
,
Stderr
:
p
.
ErrOut
!=
nil
,
TTY
:
t
.
Raw
,
},
legacy
scheme
.
ParameterCodec
)
},
scheme
.
ParameterCodec
)
return
p
.
Executor
.
Execute
(
"POST"
,
req
.
URL
(),
p
.
Config
,
p
.
In
,
p
.
Out
,
p
.
ErrOut
,
t
.
Raw
,
sizeQueue
)
}
...
...
pkg/kubectl/scheme/scheme.go
View file @
ce656024
...
...
@@ -30,6 +30,9 @@ var Scheme = runtime.NewScheme()
// Codecs provides access to encoding and decoding for the scheme
var
Codecs
=
serializer
.
NewCodecFactory
(
Scheme
)
// ParameterCodec handles versioning of objects that are converted to query parameters.
var
ParameterCodec
=
runtime
.
NewParameterCodec
(
Scheme
)
// DefaultJSONEncoder returns a default encoder for our scheme
func
DefaultJSONEncoder
()
runtime
.
Encoder
{
return
unstructured
.
JSONFallbackEncoder
{
Encoder
:
Codecs
.
LegacyCodec
(
Scheme
.
PrioritizedVersionsAllGroups
()
...
)}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment