github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 13:57:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #136575 from enj/enj/i/agg_dis_npe

Browse Source 
Prevent nil pointer exception in aggregated discovery
This commit is contained in:
Kubernetes Prow Robot
2026-01-29 02:13:52 +05:30
committed by GitHub
parent 6dfae1df46 e7de8ba856
commit 0d4d8a0cb2
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/apiserver/pkg/endpoints/discovery/aggregated/handler.go
View File

@@ -559,9 +559,13 @@ func writeDiscoveryResponse(
return
}
var targetGV schema.GroupVersion
if mediaType.Convert == nil ||
(mediaType.Convert.GroupVersion() != apidiscoveryv2.SchemeGroupVersion &&
mediaType.Convert.GroupVersion() != apidiscoveryv2beta1.SchemeGroupVersion) {
if mediaType.Convert == nil {
utilruntime.HandleError(fmt.Errorf("expected aggregated discovery group version, got unknown group and version"))
w.WriteHeader(http.StatusInternalServerError)
return
}
if mediaType.Convert.GroupVersion() != apidiscoveryv2.SchemeGroupVersion &&
mediaType.Convert.GroupVersion() != apidiscoveryv2beta1.SchemeGroupVersion {
utilruntime.HandleError(fmt.Errorf("expected aggregated discovery group version, got group: %s, version %s", mediaType.Convert.Group, mediaType.Convert.Version))
w.WriteHeader(http.StatusInternalServerError)
return