Merge pull request #19676 from deads2k/cli-36-vanitypatch

openshift-merge-robot · web-flow · commit d569ca95d298 · 2018-05-10T12:06:41.000-07:00
start collapsing onto upstream env vars
diff --git a/pkg/oc/cli/util/clientcmd/factory_client_access.go b/pkg/oc/cli/util/clientcmd/factory_client_access.go
@@ -270,7 +270,7 @@ func (f *ring0Factory) CanBeAutoscaled(kind schema.GroupKind) error {
 }
 
 func (f *ring0Factory) EditorEnvs() []string {
-	return []string{"OC_EDITOR", "EDITOR"}
+	return []string{"OC_EDITOR", "KUBE_EDITOR", "EDITOR"}
 }
 
 func getPorts(spec kapi.PodSpec) []string {

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ func (f *ring0Factory) CanBeAutoscaled(kind schema.GroupKind) error {`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`func (f *ring0Factory) EditorEnvs() []string {`
`273`		`- return []string{"OC_EDITOR", "EDITOR"}`
	`273`	`+ return []string{"OC_EDITOR", "KUBE_EDITOR", "EDITOR"}`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`func getPorts(spec kapi.PodSpec) []string {`