Skip to content

K
k3s
Commit 3fa346e7 authored by Sean Sullivan's avatar Sean Sullivan
Browse files
Options

Replace internal version Encoder with external version Encoder

parent 43997eaf
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
pkg/kubectl/cmd/replace.go
View file @ 3fa346e7
...@@ -35,6 +35,7 @@ import ( ...@@ -35,6 +35,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" 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/i18n"
"k8s.io/kubernetes/pkg/kubectl/validation" "k8s.io/kubernetes/pkg/kubectl/validation"
) )
...@@ -218,7 +219,7 @@ func (o *ReplaceOptions) Run() error { ...@@ -218,7 +219,7 @@ func (o *ReplaceOptions) Run() error {
return err return err
} }
if err := kubectl.CreateOrUpdateAnnotation(o.createAnnotation, info.Object, cmdutil.InternalVersionJSONEncoder()); err != nil { if err := kubectl.CreateOrUpdateAnnotation(o.createAnnotation, info.Object, scheme.DefaultJSONEncoder()); err != nil {
return cmdutil.AddSourceToErr("replacing", info.Source, err) return cmdutil.AddSourceToErr("replacing", info.Source, err)
} }
...@@ -309,7 +310,7 @@ func (o *ReplaceOptions) forceReplace() error { ...@@ -309,7 +310,7 @@ func (o *ReplaceOptions) forceReplace() error {
return err return err
} }
if err := kubectl.CreateOrUpdateAnnotation(o.createAnnotation, info.Object, cmdutil.InternalVersionJSONEncoder()); err != nil { if err := kubectl.CreateOrUpdateAnnotation(o.createAnnotation, info.Object, scheme.DefaultJSONEncoder()); err != nil {
return err return err
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment