github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

update more kubectl bits for groupversion

Browse Source
This commit is contained in:
deads2k
2015-12-01 11:52:11 -05:00
parent 33eda2ffb5
commit 66eecb963a
20 changed files with 129 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubectl/cmd/edit.go
View File

@@ -28,6 +28,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/unversioned"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@@ -149,10 +150,13 @@ func RunEdit(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []strin
windowsLineEndings := cmdutil.GetFlagBool(cmd, "windows-line-endings")
edit := editor.NewDefaultEditor(f.EditorEnvs())
defaultVersion := cmdutil.OutputVersionFromGroupVersion(cmd, clientConfig.GroupVersion)
defaultVersion, err := cmdutil.OutputVersion(cmd, clientConfig.GroupVersion)
if err != nil {
return err
}
results := editResults{}
for {
objs, err := resource.AsVersionedObjects(infos, defaultVersion)
objs, err := resource.AsVersionedObjects(infos, defaultVersion.String())
if err != nil {
return preservedFile(err, results.file, out)
}
@@ -356,7 +360,7 @@ type editResults struct {
edit []*resource.Info
file string
version string
version unversioned.GroupVersion
}
func (r *editResults) addError(err error, info *resource.Info) string {