Merge pull request kubernetes#114415 from hoskeri/automated-cherry-pi…

…ck-of-#114404-upstream-release-1.26 Automated cherry pick of kubernetes#114404: Check the correct error in d.downloadAPIs
openshift · Dec 13, 2022 · dd0b0c0 · dd0b0c0
2 parents 7c0eb3b + f8b99b1
commit dd0b0c0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/staging/src/k8s.io/client-go/discovery/discovery_client.go b/staging/src/k8s.io/client-go/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.