upstream/kubectl
1
0
Fork 0
mirror of https://github.com/kubernetes/kubectl.git synced 2026-06-09 08:51:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #138480 from xigang/errors_format

Browse source 
fix: properly format DebugError output in kubectl StandardErrorMessage

Kubernetes-commit: 44aaa8e169f7cd6a8b8c3ac38ab660240bbe2a5f
This commit is contained in:
Kubernetes Publisher 2026-04-23 07:22:01 +05:30
commit ef67d87dbf
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
go.mod
View file

@ -30,11 +30,11 @@ require (
golang.org/x/sys v0.40.0
golang.org/x/text v0.33.0
gopkg.in/evanphx/json-patch.v4 v4.13.0
k8s.io/api v0.0.0-20260422222041-738ad2fc7666
k8s.io/apimachinery v0.0.0-20260414135623-72791e98891a
k8s.io/api v0.0.0-20260423021924-2dd166de3fa1
k8s.io/apimachinery v0.0.0-20260423021553-a31c3dcb1f8b
k8s.io/cli-runtime v0.0.0-20260423030031-7c0741a165e2
k8s.io/client-go v0.0.0-20260423022421-9dcacd934a99
k8s.io/component-base v0.0.0-20260414155923-12f6271c1572
k8s.io/component-base v0.0.0-20260423023547-92e5a83b5564
k8s.io/component-helpers v0.0.0-20260414161221-0a0fc66e1d14
k8s.io/klog/v2 v2.140.0
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a
@ -94,4 +94,4 @@ require (
sigs.k8s.io/kustomize/api v0.21.1 // indirect
)
replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20260423023312-0e27eb201126
replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20260423023316-486ae0a17277

12
go.sum
View file

@ -191,16 +191,16 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.0.0-20260422222041-738ad2fc7666 h1:d4xRHtlzeu5W4t4BBWA7wylPf9TORY2pnILk48cjkcU=
k8s.io/api v0.0.0-20260422222041-738ad2fc7666/go.mod h1:0MHCnfE89X5hpXeB0MmNRJy2DP3MVFqj2JGtSte5YBs=
k8s.io/apimachinery v0.0.0-20260414135623-72791e98891a h1:fGTRW0wFSkwIK6xpLqCLXcZnpMVA/d/z4/VY1+V6sck=
k8s.io/apimachinery v0.0.0-20260414135623-72791e98891a/go.mod h1:Fqsi1zDY7A12KBcrFdhpzVHlFskhmS7gwXYeqzTa3zY=
k8s.io/api v0.0.0-20260423021924-2dd166de3fa1 h1:036MCyoiEGhChth6Y9l0GoXCltaXPWLpNPKlSO6PpQE=
k8s.io/api v0.0.0-20260423021924-2dd166de3fa1/go.mod h1:0MHCnfE89X5hpXeB0MmNRJy2DP3MVFqj2JGtSte5YBs=
k8s.io/apimachinery v0.0.0-20260423021553-a31c3dcb1f8b h1:GNNOB6lznNy9RJyrE/ZHTUnf5+55LFFyHOMb19nZfyw=
k8s.io/apimachinery v0.0.0-20260423021553-a31c3dcb1f8b/go.mod h1:Fqsi1zDY7A12KBcrFdhpzVHlFskhmS7gwXYeqzTa3zY=
k8s.io/cli-runtime v0.0.0-20260423030031-7c0741a165e2 h1:MGVKogg4hAshw1hSCTWeXiBCJ4tFMCFMRYvcofLhIYQ=
k8s.io/cli-runtime v0.0.0-20260423030031-7c0741a165e2/go.mod h1:D5m/+ttE0nrDwgy8vHjKzgUh8AuZXS2MSnW6KuLtY7E=
k8s.io/client-go v0.0.0-20260423022421-9dcacd934a99 h1:CIF82JDCtRI1931B+/tAjKmwxikgNphE01ePM/FBtOQ=
k8s.io/client-go v0.0.0-20260423022421-9dcacd934a99/go.mod h1:kfiBH+h75s//ryif9TITxBG2rnYzMgmq6za1H8TscRs=
k8s.io/component-base v0.0.0-20260414155923-12f6271c1572 h1:WM0qw3ym5gwD/kn1QhvrxCcpJF5Jx8Ast2SHCi/2MtE=
k8s.io/component-base v0.0.0-20260414155923-12f6271c1572/go.mod h1:HROKPX7+BzMrtAugq8w74ZI2WOWqSwXpIkyn/w9N65s=
k8s.io/component-base v0.0.0-20260423023547-92e5a83b5564 h1:kdKCe2KWY7EIDkobJrOdlwzDtf0tXuYX6mYmVHL8zkE=
k8s.io/component-base v0.0.0-20260423023547-92e5a83b5564/go.mod h1:RMJMh51HQSbGaMrEzzI5AWvuTjgtfPNFLxn1ncKvTpQ=
k8s.io/component-helpers v0.0.0-20260414161221-0a0fc66e1d14 h1:6Yz+oSEqY90oYkzcgaoA5xWu8Pus6d2TUtCG4sZ6YXU=
k8s.io/component-helpers v0.0.0-20260414161221-0a0fc66e1d14/go.mod h1:y6zmwAlehipM9qKLOzLMjoz1CV6EmYbITlHMMmf8soU=
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=

3
pkg/cmd/util/helpers.go
View file

@ -243,7 +243,8 @@ func statusCausesToAggrError(scs []metav1.StatusCause) utilerrors.Aggregate {
// commands.
func StandardErrorMessage(err error) (string, bool) {
if debugErr, ok := err.(debugError); ok {
klog.V(4).Info(debugErr.DebugError())
msg, args := debugErr.DebugError()
klog.V(4).Infof(msg, args...)
}
status, isStatus := err.(apierrors.APIStatus)
switch {