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

kubectl diff: Rename KUBERNETES_EXTERNAL_DIFF to KUBECTL_EXTERNAL_DIFF

pull/58/head
Antoine Pelisse 2018-10-12 10:56:16 -07:00
parent 6fc89ae92d
commit e31d14cb10
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/kubectl/cmd/diff/diff.go
View File

@ -26,7 +26,6 @@ import (
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/jonboulle/clockwork" "github.com/jonboulle/clockwork"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@ -50,7 +49,7 @@ var (
Output is always YAML. Output is always YAML.
KUBERNETES_EXTERNAL_DIFF environment variable can be used to select your own KUBECTL_EXTERNAL_DIFF environment variable can be used to select your own
diff command. By default, the "diff" command available in your path will be diff command. By default, the "diff" command available in your path will be
run with "-u" (unicode) and "-N" (treat new files as empty) options.`)) run with "-u" (unicode) and "-N" (treat new files as empty) options.`))
diffExample = templates.Examples(i18n.T(` diffExample = templates.Examples(i18n.T(`
@ -98,7 +97,7 @@ func NewCmdDiff(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.C
} }
// DiffProgram finds and run the diff program. The value of // DiffProgram finds and run the diff program. The value of
// KUBERNETES_EXTERNAL_DIFF environment variable will be used a diff // KUBECTL_EXTERNAL_DIFF environment variable will be used a diff
// program. By default, `diff(1)` will be used. // program. By default, `diff(1)` will be used.
type DiffProgram struct { type DiffProgram struct {
Exec exec.Interface Exec exec.Interface
@ -107,7 +106,7 @@ type DiffProgram struct {
func (d *DiffProgram) getCommand(args ...string) exec.Cmd { func (d *DiffProgram) getCommand(args ...string) exec.Cmd {
diff := "" diff := ""
if envDiff := os.Getenv("KUBERNETES_EXTERNAL_DIFF"); envDiff != "" { if envDiff := os.Getenv("KUBECTL_EXTERNAL_DIFF"); envDiff != "" {
diff = envDiff diff = envDiff
} else { } else {
diff = "diff" diff = "diff"

2
pkg/kubectl/cmd/diff/diff_test.go
View File

@ -52,7 +52,7 @@ func (f *FakeObject) Live() runtime.Object {
} }
func TestDiffProgram(t *testing.T) { func TestDiffProgram(t *testing.T) {
os.Setenv("KUBERNETES_EXTERNAL_DIFF", "echo") os.Setenv("KUBECTL_EXTERNAL_DIFF", "echo")
streams, _, stdout, _ := genericclioptions.NewTestIOStreams() streams, _, stdout, _ := genericclioptions.NewTestIOStreams()
diff := DiffProgram{ diff := DiffProgram{
IOStreams: streams, IOStreams: streams,