github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Kubectl]Fix example and annotation in convert 

Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
pull/6/head
yuexiao-wang 2017-10-17 16:50:43 +08:00
parent d7e56d5330
commit a0e06c746f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubectl/cmd/convert.go
View File

@ -51,7 +51,7 @@ var (
kubectl convert -f pod.yaml
# Convert the live state of the resource specified by 'pod.yaml' to the latest version
# and print to stdout in json format.
# and print to stdout in JSON format.
kubectl convert -f pod.yaml --local -o json
# Convert all files under current directory to latest version and create them all.
@ -203,7 +203,7 @@ func (o *ConvertOptions) RunConvert() error {
return o.printer.PrintObj(objects, o.out)
}
// ObjectListToVersionedObject receives a list of api objects and a group version
// objectListToVersionedObject receives a list of api objects and a group version
// and squashes the list's items into a single versioned runtime.Object.
func objectListToVersionedObject(objects []runtime.Object, version schema.GroupVersion) (runtime.Object, error) {
objectList := &api.List{Items: objects}
@ -214,7 +214,7 @@ func objectListToVersionedObject(objects []runtime.Object, version schema.GroupV
return converted, nil
}
// AsVersionedObject converts a list of infos into a single object - either a List containing
// asVersionedObject converts a list of infos into a single object - either a List containing
// the objects as children, or if only a single Object is present, as that object. The provided
// version will be preferred as the conversion target, but the Object's mapping version will be
// used if that version is not present.
@ -247,7 +247,7 @@ func asVersionedObject(infos []*resource.Info, forceList bool, version schema.Gr
return object, nil
}
// AsVersionedObjects converts a list of infos into versioned objects. The provided
// asVersionedObjects converts a list of infos into versioned objects. The provided
// version will be preferred as the conversion target, but the Object's mapping version will be
// used if that version is not present.
func asVersionedObjects(infos []*resource.Info, version schema.GroupVersion, encoder runtime.Encoder) ([]runtime.Object, error) {