github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #72356 from vithati/users/vithati/kubectl505

Browse Source 
Fix for kubectl go-template 'eq' & 'lt' not working with integers.
This commit is contained in:
Kubernetes Prow Robot 2019-01-07 12:09:25 -08:00 committed by GitHub
commit 3f2ef1417f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/cli-runtime/pkg/genericclioptions/printers/BUILD
View File

@ -20,6 +20,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/json:go_default_library",
"//staging/src/k8s.io/client-go/util/jsonpath:go_default_library", "//staging/src/k8s.io/client-go/util/jsonpath:go_default_library",
"//vendor/sigs.k8s.io/yaml:go_default_library", "//vendor/sigs.k8s.io/yaml:go_default_library",
], ],

2
staging/src/k8s.io/cli-runtime/pkg/genericclioptions/printers/template.go
View File

@ -18,13 +18,13 @@ package printers
import ( import (
"encoding/base64" "encoding/base64"
"encoding/json"
"fmt" "fmt"
"io" "io"
"reflect" "reflect"
"text/template" "text/template"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/json"
) )
// GoTemplatePrinter is an implementation of ResourcePrinter which formats data with a Go Template. // GoTemplatePrinter is an implementation of ResourcePrinter which formats data with a Go Template.

8
staging/src/k8s.io/cli-runtime/pkg/genericclioptions/printers/template_test.go
View File

@ -52,6 +52,14 @@ func TestTemplate(t *testing.T) {
return "a base64 decode error", matched return "a base64 decode error", matched
}, },
}, },
{
name: "template 'eq' should not throw error for numbers",
template: "{{ eq .count 1}}",
obj: &v1.Event{
Count: 1,
},
expectOut: "true",
},
} }
for _, test := range testCase { for _, test := range testCase {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {