mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-07-27 17:09:06 +00:00
Change KYAML gate to on-by-default
This commit is contained in:
@@ -33,7 +33,7 @@ func (f *JSONYamlPrintFlags) AllowedFormats() []string {
|
||||
}
|
||||
formats := []string{"json", "yaml"}
|
||||
// We can't use the cmdutil pkg directly because of import cycle.
|
||||
if strings.ToLower(os.Getenv("KUBECTL_KYAML")) == "true" {
|
||||
if strings.ToLower(os.Getenv("KUBECTL_KYAML")) != "false" {
|
||||
formats = append(formats, "kyaml")
|
||||
}
|
||||
return formats
|
||||
|
||||
@@ -18,6 +18,7 @@ package apiresources
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
@@ -57,8 +58,8 @@ See 'kubectl api-resources -h' for help and examples`
|
||||
if err == nil {
|
||||
t.Fatalf("An error was expected but not returned")
|
||||
}
|
||||
expectedError = `unable to match a printer suitable for the output format "foo", allowed formats are: json,name,wide,yaml`
|
||||
if err.Error() != expectedError {
|
||||
expectedError = `unable to match a printer suitable for the output format "foo", allowed formats are:`
|
||||
if !strings.HasPrefix(err.Error(), expectedError) {
|
||||
t.Fatalf("Unexpected error: %v\n expected: %v", err, expectedError)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user