upstream/kubectl
1
0
Fork 0
mirror of https://github.com/kubernetes/kubectl.git synced 2026-05-28 04:35:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #134833 from rikatz/fix-panic-apiresources

Browse source 
Return error in case of discovery client failure

Kubernetes-commit: fb10a2995459c52238024adbb10ffdfbdafd2c4d
This commit is contained in:
Kubernetes Publisher 2025-10-25 01:37:33 -07:00
commit d1b399db57
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
go.mod
View file

@ -30,10 +30,10 @@ require (
golang.org/x/sys v0.35.0
golang.org/x/text v0.28.0
gopkg.in/evanphx/json-patch.v4 v4.13.0
k8s.io/api v0.0.0-20251023232015-f062bee65a09
k8s.io/api v0.0.0-20251024232012-60574e5a5b4b
k8s.io/apimachinery v0.0.0-20251022231703-e79daceaa31b
k8s.io/cli-runtime v0.0.0-20251023000555-9bc1713ceaa0
k8s.io/client-go v0.0.0-20251023232437-4953849642e8
k8s.io/client-go v0.0.0-20251024232440-91dcaf4e5c75
k8s.io/component-base v0.0.0-20251023233611-2dea70a75591
k8s.io/component-helpers v0.0.0-20251022233850-f6d7ac8ebaf9
k8s.io/klog/v2 v2.130.1
@ -91,3 +91,5 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/kustomize/api v0.20.1 // indirect
)
replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20251024191541-51476a45c689

8
go.sum
View file

@ -166,14 +166,14 @@ 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-20251023232015-f062bee65a09 h1:npzX9r9ZAssBH7xoBl36LrwRkT9B4agqfYmwIqbgypQ=
k8s.io/api v0.0.0-20251023232015-f062bee65a09/go.mod h1:frc7w2YHpDzAJ3C8vddzF8sjKxN5Ew1WgwYFHm3EsuY=
k8s.io/api v0.0.0-20251024232012-60574e5a5b4b h1:u6CZ1ErNK1smoKHk0zu0oDydrJbCLArwVwpif7az0KY=
k8s.io/api v0.0.0-20251024232012-60574e5a5b4b/go.mod h1:frc7w2YHpDzAJ3C8vddzF8sjKxN5Ew1WgwYFHm3EsuY=
k8s.io/apimachinery v0.0.0-20251022231703-e79daceaa31b h1:rLHJYu1GGh4U4g/rZ6P4WI22nM6UEqVYqubI3NjIgW0=
k8s.io/apimachinery v0.0.0-20251022231703-e79daceaa31b/go.mod h1:khYq6ZZ3qxhyKXYGU64a438RVSfpfZZ4Xept0x/H3Qw=
k8s.io/cli-runtime v0.0.0-20251023000555-9bc1713ceaa0 h1:W6dcKlSf82RLqXrgmpapxkdYLr5ADvR2rkTe/Ef/6PI=
k8s.io/cli-runtime v0.0.0-20251023000555-9bc1713ceaa0/go.mod h1:zZ1N56lBfM/Oa9LXbrjVvUSmJB745Lfbn85oXjoifk4=
k8s.io/client-go v0.0.0-20251023232437-4953849642e8 h1:35daRwAxzUWEXkfJGm95kPkQs+GxWNr5CAn5DCnp2vM=
k8s.io/client-go v0.0.0-20251023232437-4953849642e8/go.mod h1:7hFvFjEJ1ExaJVEUnve6h3qWtKxVHDVbvIxywTh8D8A=
k8s.io/client-go v0.0.0-20251024232440-91dcaf4e5c75 h1:9RffS4fEsHry56G9zBfh7yZr2UVrwUzSiztPOo/eYjw=
k8s.io/client-go v0.0.0-20251024232440-91dcaf4e5c75/go.mod h1:rOwzCKlDIZQrT7c27O2uAF9wLdyrLmFfK4YpOQelF1I=
k8s.io/component-base v0.0.0-20251023233611-2dea70a75591 h1:LiA59MYuQaW2iOXAMtQVvdc36pB5SooYSkJk3d4MJFs=
k8s.io/component-base v0.0.0-20251023233611-2dea70a75591/go.mod h1:pHTOd1rkuiLBKWad3zm+3i+FcYPXHEKjjWAi6044iMQ=
k8s.io/component-helpers v0.0.0-20251022233850-f6d7ac8ebaf9 h1:KiEu8gvGJ2kw14Z9tZe2WNdvVfZPnsu/MCTcA8R7PDk=

3
pkg/cmd/apiresources/apiresources.go
View file

@ -229,6 +229,9 @@ func (o *APIResourceOptions) RunAPIResources() error {
allResources = append(allResources, apiList)
}
if len(allResources) == 0 {
return utilerrors.NewAggregate(errs)
}
flatList := &metav1.APIResourceList{
TypeMeta: metav1.TypeMeta{
APIVersion: allResources[0].APIVersion,