github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

move type setting into an optional layer above normal printing

Browse Source
This commit is contained in:
David Eads
2018-05-16 14:19:21 -04:00
parent 304bce3cdf
commit 420dd9bf66
50 changed files with 239 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubectl/cmd/create/flags.go
View File

@@ -31,6 +31,8 @@ type PrintFlags struct {
NamePrintFlags *printers.NamePrintFlags
TemplateFlags *printers.KubeTemplatePrintFlags
TypeSetter *printers.TypeSetterPrinter
OutputFormat *string
}
@@ -45,15 +47,15 @@ func (f *PrintFlags) ToPrinter() (printers.ResourcePrinter, error) {
}
if p, err := f.JSONYamlPrintFlags.ToPrinter(outputFormat); !printers.IsNoCompatiblePrinterError(err) {
return p, err
return f.TypeSetter.WrapToPrinter(p, err)
}
if p, err := f.NamePrintFlags.ToPrinter(outputFormat); !printers.IsNoCompatiblePrinterError(err) {
return p, err
return f.TypeSetter.WrapToPrinter(p, err)
}
if p, err := f.TemplateFlags.ToPrinter(outputFormat); !printers.IsNoCompatiblePrinterError(err) {
return p, err
return f.TypeSetter.WrapToPrinter(p, err)
}
return nil, printers.NoCompatiblePrinterError{Options: f}
@@ -69,14 +71,16 @@ func (f *PrintFlags) AddFlags(cmd *cobra.Command) {
}
}
func NewPrintFlags(operation string, scheme runtime.ObjectConvertor) *PrintFlags {
func NewPrintFlags(operation string, scheme runtime.ObjectTyper) *PrintFlags {
outputFormat := ""
return &PrintFlags{
OutputFormat: &outputFormat,
JSONYamlPrintFlags: printers.NewJSONYamlPrintFlags(scheme),
NamePrintFlags: printers.NewNamePrintFlags(operation, scheme),
JSONYamlPrintFlags: printers.NewJSONYamlPrintFlags(),
NamePrintFlags: printers.NewNamePrintFlags(operation),
TemplateFlags: printers.NewKubeTemplatePrintFlags(),
TypeSetter: printers.NewTypeSetter(scheme),
}
}