Merge pull request #115964 from atwamahmoud/fix-scale-crd-target-ref

Update ExistsInDiscovery to ignore 404 errors in autoscaling utils framework
This commit is contained in:
Kubernetes Prow Robot 2023-02-23 08:47:46 -08:00 committed by GitHub
commit f3bb101f54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -29,6 +29,7 @@ import (
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
crdclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
"k8s.io/apiextensions-apiserver/test/integration/fixtures"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -965,6 +966,10 @@ func CreateCustomResourceDefinition(ctx context.Context, c crdclientset.Interfac
func ExistsInDiscovery(crd *apiextensionsv1.CustomResourceDefinition, apiExtensionsClient crdclientset.Interface, version string) (bool, error) {
groupResource, err := apiExtensionsClient.Discovery().ServerResourcesForGroupVersion(crd.Spec.Group + "/" + version)
if err != nil {
// Ignore 404 errors as it means the resources doesn't exist
if apierrors.IsNotFound(err) {
return false, nil
}
return false, err
}
for _, g := range groupResource.APIResources {