Check the correct error in d.downloadAPIs

hoskeri · k8s-publishing-bot · commit a2ef32442ab1 · 2022-12-10T16:32:02.000-08:00
The error result of `d.downloadAPIs()` is set in `aerr`,
not `err`.

This prevents a nil-ptr dereference of apiGroups in the next step.

Signed-off-by: Abhijit Hoskeri &lt;abhijithoskeri@gmail.com&gt;

Kubernetes-commit: f8b99b1f09fb5d4d10b15e326c4b242cc705f007
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.`