github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Update ExistsInDiscovery to ignore 404 & 403 errors in autoscaling utils framework

Browse Source
This commit is contained in:
Mahmoud Atwa 2023-02-22 13:41:41 +00:00
parent 7e40d6d04e
commit b1980b2f6b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/framework/autoscaling/autoscaling_utils.go
View File

@ -29,6 +29,7 @@ import (
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
crdclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" crdclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
"k8s.io/apiextensions-apiserver/test/integration/fixtures" "k8s.io/apiextensions-apiserver/test/integration/fixtures"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -965,6 +966,11 @@ func CreateCustomResourceDefinition(ctx context.Context, c crdclientset.Interfac
func ExistsInDiscovery(crd *apiextensionsv1.CustomResourceDefinition, apiExtensionsClient crdclientset.Interface, version string) (bool, error) { func ExistsInDiscovery(crd *apiextensionsv1.CustomResourceDefinition, apiExtensionsClient crdclientset.Interface, version string) (bool, error) {
groupResource, err := apiExtensionsClient.Discovery().ServerResourcesForGroupVersion(crd.Spec.Group + "/" + version) groupResource, err := apiExtensionsClient.Discovery().ServerResourcesForGroupVersion(crd.Spec.Group + "/" + version)
if err != nil { if err != nil {
// Ignore 404 & 403 errors
// As they're not ignored by `ServerResourcesForGroupVersion` because passed version is not equal to `v1`
if version == "v1" && (errors.IsNotFound(err) || errors.IsForbidden(err)) {
return false, nil
}
return false, err return false, err
} }
for _, g := range groupResource.APIResources { for _, g := range groupResource.APIResources {
@ -1001,7 +1007,7 @@ func CreateCustomSubresourceInstance(ctx context.Context, namespace, name string
} }
createdObjectMeta, err := meta.Accessor(instance) createdObjectMeta, err := meta.Accessor(instance)
if err != nil { if err != nil {
return nil, fmt.Errorf("Error while creating object meta: %w", err) return nil, fmt.Errorf("Error while creating object meta: %v", err)
} }
if len(createdObjectMeta.GetUID()) == 0 { if len(createdObjectMeta.GetUID()) == 0 {
return nil, fmt.Errorf("Missing UUID: %v", instance) return nil, fmt.Errorf("Missing UUID: %v", instance)