Merge pull request kubernetes#127570 from soltysh/do_not_return_err

k8s-ci-robot · web-flow · commit 5973accf487e · 2024-09-24T10:20:01.000+01:00
Do not return error where it's not needed
diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/resources.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/resources.go
@@ -381,7 +381,7 @@ func waitForCRDReady(crd *apiextensionsv1.CustomResourceDefinition, apiExtension
 	if err != nil {
 		return nil, err
 	}
-	return v1CRD, err
+	return v1CRD, nil
 }
 
 // CreateNewV1CustomResourceDefinitionWatchUnsafe creates the CRD and makes sure
@@ -404,7 +404,7 @@ func CreateNewV1CustomResourceDefinitionWatchUnsafe(v1CRD *apiextensionsv1.Custo
 		}
 	}
 
-	return v1CRD, err
+	return v1CRD, nil
 }
 
 // CreateNewV1CustomResourceDefinition creates the given CRD and makes sure its watch cache is primed on the server.

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ func waitForCRDReady(crd *apiextensionsv1.CustomResourceDefinition, apiExtension`
`381`	`381`	`if err != nil {`
`382`	`382`	`return nil, err`
`383`	`383`	`}`
`384`		`- return v1CRD, err`
	`384`	`+ return v1CRD, nil`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`// CreateNewV1CustomResourceDefinitionWatchUnsafe creates the CRD and makes sure`
`@@ -404,7 +404,7 @@ func CreateNewV1CustomResourceDefinitionWatchUnsafe(v1CRD *apiextensionsv1.Custo`
`404`	`404`	`}`
`405`	`405`	`}`
`406`	`406`
`407`		`- return v1CRD, err`
	`407`	`+ return v1CRD, nil`
`408`	`408`	`}`
`409`	`409`
`410`	`410`	`// CreateNewV1CustomResourceDefinition creates the given CRD and makes sure its watch cache is primed on the server.`