Merge pull request #114415 from hoskeri/automated-cherry-pick-of-#114404-upstream-release-1.26

k8s-publishing-bot · k8s-publishing-bot · commit b3fff46496f1 · 2022-12-13T17:06:47.000Z
Automated cherry pick of #114404: Check the correct error in d.downloadAPIs

Kubernetes-commit: dd0b0c00e5a10352fa74a09fb32aca509c7f0c48
diff --git a/discovery/discovery_client.go b/discovery/discovery_client.go
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ func (d DiscoveryClient) GroupsAndMaybeResources() (metav1.APIGroupList, map[s`
`196`	`196`	`}`
`197`	`197`	`// Discovery groups and (possibly) resources downloaded from /apis.`
`198`	`198`	`apiGroups, apiResources, aerr := d.downloadAPIs()`
`199`		`- if err != nil {`
	`199`	`+ if aerr != nil {`
`200`	`200`	`return nil, nil, aerr`
`201`	`201`	`}`
`202`	`202`	`// Merge apis groups into the legacy groups.`