Skip to content

Commit

Permalink
Merge pull request #114415 from hoskeri/automated-cherry-pick-of-#114…
Browse files Browse the repository at this point in the history
…404-upstream-release-1.26

Automated cherry pick of #114404: Check the correct error in d.downloadAPIs

Kubernetes-commit: dd0b0c00e5a10352fa74a09fb32aca509c7f0c48
  • Loading branch information
k8s-publishing-bot committed Dec 13, 2022
2 parents 236db3c + a2ef324 commit b3fff46
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion discovery/discovery_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func (d *DiscoveryClient) GroupsAndMaybeResources() (*metav1.APIGroupList, map[s
}
// Discovery groups and (possibly) resources downloaded from /apis.
apiGroups, apiResources, aerr := d.downloadAPIs()
if err != nil {
if aerr != nil {
return nil, nil, aerr
}
// Merge apis groups into the legacy groups.
Expand Down

0 comments on commit b3fff46

Please sign in to comment.