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
98748d1a
Unverified
Commit
98748d1a
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 #68697 from seans3/editoptions-fix
Replace internal version Encoder with external version Encoder
parents
3a933224
731b9851
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
editoptions.go
pkg/kubectl/cmd/util/editor/editoptions.go
+1
-1
No files found.
pkg/kubectl/cmd/util/editor/editoptions.go
View file @
98748d1a
...
@@ -668,7 +668,7 @@ func (o *EditOptions) visitAnnotation(annotationVisitor resource.Visitor) error
...
@@ -668,7 +668,7 @@ func (o *EditOptions) visitAnnotation(annotationVisitor resource.Visitor) error
err
:=
annotationVisitor
.
Visit
(
func
(
info
*
resource
.
Info
,
incomingErr
error
)
error
{
err
:=
annotationVisitor
.
Visit
(
func
(
info
*
resource
.
Info
,
incomingErr
error
)
error
{
// put configuration annotation in "updates"
// put configuration annotation in "updates"
if
o
.
ApplyAnnotation
{
if
o
.
ApplyAnnotation
{
if
err
:=
kubectl
.
CreateOrUpdateAnnotation
(
true
,
info
.
Object
,
cmdutil
.
InternalVersion
JSONEncoder
());
err
!=
nil
{
if
err
:=
kubectl
.
CreateOrUpdateAnnotation
(
true
,
info
.
Object
,
scheme
.
Default
JSONEncoder
());
err
!=
nil
{
return
err
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