Merge pull request #133327 from thockin/kyaml
Change KYAML gate to on-by-default Kubernetes-commit: d9c4a092f5325ab0a4832b72111f1f0fa5966518
This commit is contained in:
commit
ceae52f082
2
go.mod
2
go.mod
|
|
@ -31,7 +31,7 @@ require (
|
||||||
gopkg.in/evanphx/json-patch.v4 v4.12.0
|
gopkg.in/evanphx/json-patch.v4 v4.12.0
|
||||||
k8s.io/api v0.0.0-20250828034831-a2bc45aa612a
|
k8s.io/api v0.0.0-20250828034831-a2bc45aa612a
|
||||||
k8s.io/apimachinery v0.0.0-20250828034517-c9de3735ccce
|
k8s.io/apimachinery v0.0.0-20250828034517-c9de3735ccce
|
||||||
k8s.io/cli-runtime v0.0.0-20250816070916-f536649dab67
|
k8s.io/cli-runtime v0.0.0-20250828082246-ff4a62cf660e
|
||||||
k8s.io/client-go v0.0.0-20250828035318-17baf3d70572
|
k8s.io/client-go v0.0.0-20250828035318-17baf3d70572
|
||||||
k8s.io/component-base v0.0.0-20250828040533-e5d5aef6084e
|
k8s.io/component-base v0.0.0-20250828040533-e5d5aef6084e
|
||||||
k8s.io/component-helpers v0.0.0-20250816064315-d154920f3a99
|
k8s.io/component-helpers v0.0.0-20250816064315-d154920f3a99
|
||||||
|
|
|
||||||
4
go.sum
4
go.sum
|
|
@ -202,8 +202,8 @@ k8s.io/api v0.0.0-20250828034831-a2bc45aa612a h1:FH86WxTGrb9dqjJ75JSpOb59o6TgbbF
|
||||||
k8s.io/api v0.0.0-20250828034831-a2bc45aa612a/go.mod h1:PYNaSRltPFDIKHyMPIv4IOBffwD90akrHimMsmejH68=
|
k8s.io/api v0.0.0-20250828034831-a2bc45aa612a/go.mod h1:PYNaSRltPFDIKHyMPIv4IOBffwD90akrHimMsmejH68=
|
||||||
k8s.io/apimachinery v0.0.0-20250828034517-c9de3735ccce h1:ImeNHhltHVrZj0AjDWpfZ/aoWT3hSbSvoePdkcXyEYI=
|
k8s.io/apimachinery v0.0.0-20250828034517-c9de3735ccce h1:ImeNHhltHVrZj0AjDWpfZ/aoWT3hSbSvoePdkcXyEYI=
|
||||||
k8s.io/apimachinery v0.0.0-20250828034517-c9de3735ccce/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
|
k8s.io/apimachinery v0.0.0-20250828034517-c9de3735ccce/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
|
||||||
k8s.io/cli-runtime v0.0.0-20250816070916-f536649dab67 h1:p6C/SYa7jZ4HpdNRIU/xJbY4lkMwl95iS6WkYmL3jE8=
|
k8s.io/cli-runtime v0.0.0-20250828082246-ff4a62cf660e h1:IgeByUIx0zPTJMlsctKofcKAYSRdHEIY5kd2xoPhZbU=
|
||||||
k8s.io/cli-runtime v0.0.0-20250816070916-f536649dab67/go.mod h1:HIyOYCeQzm69fJySABxiMZ3Jw+tMJfIKesAiuPd+3No=
|
k8s.io/cli-runtime v0.0.0-20250828082246-ff4a62cf660e/go.mod h1:l3xvdzvsaPsRbsl+WY9GbrxGbzYh5rH0vaWXjuYz2FU=
|
||||||
k8s.io/client-go v0.0.0-20250828035318-17baf3d70572 h1:T6/Ss+bbqkeqRSdc/hkmkP63ALrGWo6YvW62vDqDbfc=
|
k8s.io/client-go v0.0.0-20250828035318-17baf3d70572 h1:T6/Ss+bbqkeqRSdc/hkmkP63ALrGWo6YvW62vDqDbfc=
|
||||||
k8s.io/client-go v0.0.0-20250828035318-17baf3d70572/go.mod h1:UseP5xEAWy0TL2ksUP6ulzXQXseHBfU4yRfnIO+IgKU=
|
k8s.io/client-go v0.0.0-20250828035318-17baf3d70572/go.mod h1:UseP5xEAWy0TL2ksUP6ulzXQXseHBfU4yRfnIO+IgKU=
|
||||||
k8s.io/component-base v0.0.0-20250828040533-e5d5aef6084e h1:7uVrTH4yHY6dAhZdBdNfsw9JhwIUWBkwKk09HbEprBc=
|
k8s.io/component-base v0.0.0-20250828040533-e5d5aef6084e h1:7uVrTH4yHY6dAhZdBdNfsw9JhwIUWBkwKk09HbEprBc=
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ package apiresources
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
@ -57,8 +58,8 @@ See 'kubectl api-resources -h' for help and examples`
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Fatalf("An error was expected but not returned")
|
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`
|
expectedError = `unable to match a printer suitable for the output format "foo", allowed formats are:`
|
||||||
if err.Error() != expectedError {
|
if !strings.HasPrefix(err.Error(), expectedError) {
|
||||||
t.Fatalf("Unexpected error: %v\n expected: %v", err, expectedError)
|
t.Fatalf("Unexpected error: %v\n expected: %v", err, expectedError)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue