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
3a933224
Unverified
Commit
3a933224
authored
Sep 25, 2018
by
k8s-ci-robot
Committed by
GitHub
Sep 25, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #68696 from seans3/autoscale-fix
Replace internal version resources with external version resources
parents
b0422194
8d67edfc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
autoscale.go
pkg/kubectl/cmd/autoscale.go
+2
-3
No files found.
pkg/kubectl/cmd/autoscale.go
View file @
3a933224
...
...
@@ -28,7 +28,6 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions/printers"
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
autoscalingv1client
"k8s.io/client-go/kubernetes/typed/autoscaling/v1"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
...
...
@@ -195,7 +194,7 @@ func (o *AutoscaleOptions) Validate() error {
func
(
o
*
AutoscaleOptions
)
Run
()
error
{
r
:=
o
.
builder
.
WithScheme
(
legacyscheme
.
Scheme
)
.
WithScheme
(
scheme
.
Scheme
,
scheme
.
Scheme
.
PrioritizedVersionsAllGroups
()
...
)
.
ContinueOnError
()
.
NamespaceParam
(
o
.
namespace
)
.
DefaultNamespace
()
.
FilenameParam
(
o
.
enforceNamespace
,
o
.
FilenameOptions
)
.
...
...
@@ -246,7 +245,7 @@ func (o *AutoscaleOptions) Run() error {
return
printer
.
PrintObj
(
hpa
,
o
.
Out
)
}
if
err
:=
kubectl
.
CreateOrUpdateAnnotation
(
o
.
createAnnotation
,
hpa
,
cmdutil
.
InternalVersion
JSONEncoder
());
err
!=
nil
{
if
err
:=
kubectl
.
CreateOrUpdateAnnotation
(
o
.
createAnnotation
,
hpa
,
scheme
.
Default
JSONEncoder
());
err
!=
nil
{
return
err
}
...
...
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