scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 19:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert/disable the slash syntax for kubectl explain group/version

Browse Source
This commit is contained in:
Janet Kuo
2015-10-21 13:49:22 -07:00
parent 236193a26d
commit 1d37c549b1
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubectl/explain.go
View File

@@ -41,11 +41,10 @@ func GetSwaggerSchema(apiVer string, kubeClient client.Interface) (*swagger.ApiD
}
// SplitAndParseResourceRequest separates the users input into a model and fields
func SplitAndParseResourceRequest(inResource string, mapper meta.RESTMapper) (string, string, []string, error) {
func SplitAndParseResourceRequest(inResource string, mapper meta.RESTMapper) (string, []string, error) {
inResource, fieldsPath := splitDotNotation(inResource)
group, inResource := splitGroupFromResource(inResource)
inResource, _ = mapper.ResourceSingularizer(expandResourceShortcut(inResource))
return group, inResource, fieldsPath, nil
return inResource, fieldsPath, nil
}
// PrintModelDescription prints the description of a specific model or dot path
@@ -86,15 +85,6 @@ func PrintModelDescription(inModel string, fieldsPath []string, w io.Writer, swa
return printModelInfo(w, pointedModel, pointedModelAsProp)
}
func splitGroupFromResource(resource string) (string, string) {
seg := strings.SplitN(resource, "/", 2)
if len(seg) == 1 {
return "", seg[0]
} else {
return seg[0], seg[1]
}
}
func splitDotNotation(model string) (string, []string) {
var fieldsPath []string
dotModel := strings.Split(model, ".")