Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
508145e5
Unverified
Commit
508145e5
authored
Jun 22, 2018
by
juanvallejo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
special-case template printing in get.go
parent
e467e9ab
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
6 deletions
+20
-6
test-cmd-util.sh
hack/make-rules/test-cmd-util.sh
+4
-0
get.go
pkg/kubectl/cmd/get/get.go
+6
-1
get_flags.go
pkg/kubectl/cmd/get/get_flags.go
+10
-5
No files found.
hack/make-rules/test-cmd-util.sh
View file @
508145e5
...
...
@@ -1620,6 +1620,10 @@ run_kubectl_get_tests() {
## check --allow-missing-template-keys defaults to true for go templates
kubectl get
"
${
kube_flags
[@]
}
"
pod valid-pod
-o
go-template
=
'{{.missing}}'
## check --template flag causes go-template to be printed, even when no --output value is provided
output_message
=
$(
kubectl get
"
${
kube_flags
[@]
}
"
pod valid-pod
--template
=
"{{
$id_field
}}:"
)
kube::test::if_has_string
"
${
output_message
}
"
'valid-pod:'
## check --allow-missing-template-keys=false results in an error for a missing key with jsonpath
output_message
=
$(
!
kubectl get pod valid-pod
--allow-missing-template-keys
=
false
-o
jsonpath
=
'{.missing}'
"
${
kube_flags
[@]
}
"
)
kube::test::if_has_string
"
${
output_message
}
"
'missing is not found'
...
...
pkg/kubectl/cmd/get/get.go
View file @
508145e5
...
...
@@ -212,8 +212,13 @@ func (o *GetOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []stri
o
.
ServerPrint
=
false
}
templateArg
:=
""
if
o
.
PrintFlags
.
TemplateFlags
!=
nil
&&
o
.
PrintFlags
.
TemplateFlags
.
TemplateArgument
!=
nil
{
templateArg
=
*
o
.
PrintFlags
.
TemplateFlags
.
TemplateArgument
}
// human readable printers have special conversion rules, so we determine if we're using one.
if
len
(
*
o
.
PrintFlags
.
OutputFormat
)
==
0
||
*
o
.
PrintFlags
.
OutputFormat
==
"wide"
{
if
(
len
(
*
o
.
PrintFlags
.
OutputFormat
)
==
0
&&
len
(
templateArg
)
==
0
)
||
*
o
.
PrintFlags
.
OutputFormat
==
"wide"
{
o
.
IsHumanReadablePrinter
=
true
}
...
...
pkg/kubectl/cmd/get/get_flags.go
View file @
508145e5
...
...
@@ -33,9 +33,9 @@ import (
type
PrintFlags
struct
{
JSONYamlPrintFlags
*
genericclioptions
.
JSONYamlPrintFlags
NamePrintFlags
*
genericclioptions
.
NamePrintFlags
TemplateFlags
*
printers
.
KubeTemplatePrintFlags
CustomColumnsFlags
*
printers
.
CustomColumnsPrintFlags
HumanReadableFlags
*
HumanPrintFlags
TemplateFlags
*
printers
.
KubeTemplatePrintFlags
NoHeaders
*
bool
OutputFormat
*
string
...
...
@@ -117,6 +117,15 @@ func (f *PrintFlags) ToPrinter() (printers.ResourcePrinter, error) {
f
.
HumanReadableFlags
.
NoHeaders
=
noHeaders
f
.
CustomColumnsFlags
.
NoHeaders
=
noHeaders
// for "get.go" we want to support a --template argument given, even when no --output format is provided
if
f
.
TemplateFlags
.
TemplateArgument
!=
nil
&&
len
(
*
f
.
TemplateFlags
.
TemplateArgument
)
>
0
&&
len
(
outputFormat
)
==
0
{
outputFormat
=
"go-template"
}
if
p
,
err
:=
f
.
TemplateFlags
.
ToPrinter
(
outputFormat
);
!
genericclioptions
.
IsNoCompatiblePrinterError
(
err
)
{
return
p
,
err
}
if
f
.
TemplateFlags
.
TemplateArgument
!=
nil
{
f
.
CustomColumnsFlags
.
TemplateArgument
=
*
f
.
TemplateFlags
.
TemplateArgument
}
...
...
@@ -129,10 +138,6 @@ func (f *PrintFlags) ToPrinter() (printers.ResourcePrinter, error) {
return
p
,
err
}
if
p
,
err
:=
f
.
TemplateFlags
.
ToPrinter
(
outputFormat
);
!
genericclioptions
.
IsNoCompatiblePrinterError
(
err
)
{
return
p
,
err
}
if
p
,
err
:=
f
.
CustomColumnsFlags
.
ToPrinter
(
outputFormat
);
!
genericclioptions
.
IsNoCompatiblePrinterError
(
err
)
{
return
p
,
err
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment