@@ -3,6 +3,7 @@ package tests
3
3
import (
4
4
"crypto/tls"
5
5
"crypto/x509"
6
+ "errors"
6
7
"fmt"
7
8
"reflect"
8
9
"strings"
@@ -17,7 +18,7 @@ import (
17
18
apps "k8s.io/api/apps/v1"
18
19
core "k8s.io/api/core/v1"
19
20
rbac "k8s.io/api/rbac/v1"
20
- "k8s.io/apimachinery/pkg/api/errors"
21
+ k8serrors "k8s.io/apimachinery/pkg/api/errors"
21
22
"k8s.io/apimachinery/pkg/api/resource"
22
23
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
23
24
"k8s.io/apimachinery/pkg/runtime"
@@ -446,7 +447,7 @@ var _ = Describe("Template validator webhooks", func() {
446
447
AfterEach (func () {
447
448
if vm != nil {
448
449
err := apiClient .Delete (ctx , vm )
449
- if ! errors .IsNotFound (err ) {
450
+ if ! k8serrors .IsNotFound (err ) {
450
451
Expect (err ).ToNot (HaveOccurred (), "Failed to Delete VM" )
451
452
}
452
453
// Need to wait until VM is removed, otherwise the webhook may
@@ -456,7 +457,7 @@ var _ = Describe("Template validator webhooks", func() {
456
457
if template != nil {
457
458
Eventually (func (g Gomega ) {
458
459
if err := apiClient .Delete (ctx , template ); err != nil {
459
- g .Expect (errors .ReasonForError (err )).To (Equal (metav1 .StatusReasonNotFound ))
460
+ g .Expect (k8serrors .ReasonForError (err )).To (Equal (metav1 .StatusReasonNotFound ))
460
461
}
461
462
}, env .ShortTimeout (), time .Second ).Should (Succeed (), "Template should be deleted" )
462
463
}
@@ -823,7 +824,7 @@ var _ = Describe("Template validator webhooks", func() {
823
824
824
825
Eventually (func () metav1.StatusReason {
825
826
err := apiClient .Delete (ctx , template , client .DryRunAll )
826
- return errors .ReasonForError (err )
827
+ return k8serrors .ReasonForError (err )
827
828
}, env .ShortTimeout (), 1 * time .Second ).Should (Equal (metav1 .StatusReasonForbidden ), "Should have given forbidden error" )
828
829
})
829
830
@@ -936,7 +937,7 @@ func eventuallyFailToCreateVm(vm *kubevirtv1.VirtualMachine) bool {
936
937
}
937
938
return metav1 .StatusReasonUnknown , fmt .Errorf ("VM was created" )
938
939
}
939
- return errors .ReasonForError (err ), nil
940
+ return k8serrors .ReasonForError (err ), nil
940
941
}, env .ShortTimeout ()).Should (Equal (metav1 .StatusReasonInvalid ), "Should have given the invalid error" )
941
942
}
942
943
@@ -953,7 +954,7 @@ func failVmCreationToIncreaseRejectedVmsMetrics(template *templatev1.Template) {
953
954
eventuallyFailToCreateVm (vm )
954
955
Expect (totalRejectedVmsMetricsValue () - rejectedCountBefore ).To (Equal (1 ))
955
956
err := apiClient .Delete (ctx , vm )
956
- if ! errors .IsNotFound (err ) {
957
+ if ! k8serrors .IsNotFound (err ) {
957
958
Expect (err ).ToNot (HaveOccurred (), "Failed to Delete VM" )
958
959
}
959
960
waitForDeletion (client .ObjectKeyFromObject (vm ), vm )
@@ -1190,14 +1191,14 @@ func TemplateWithoutRules() *templatev1.Template {
1190
1191
return addObjectsToTemplates ("test-fedora-desktop-small-without-rules" , validations )
1191
1192
}
1192
1193
1193
- func getWebhookServerCertificates (validatorPod * core.Pod ) ([]* x509.Certificate , error ) {
1194
+ func getWebhookServerCertificates (validatorPod * core.Pod ) (certs []* x509.Certificate , err error ) {
1194
1195
conn , err := portForwarder .Connect (validatorPod , validator .ContainerPort )
1195
1196
if err != nil {
1196
1197
return nil , err
1197
1198
}
1198
1199
1199
1200
tlsConn := tls .Client (conn , & tls.Config {InsecureSkipVerify : true })
1200
- defer tlsConn .Close ()
1201
+ defer func () { err = errors . Join ( err , tlsConn .Close ()) } ()
1201
1202
1202
1203
err = tlsConn .Handshake ()
1203
1204
if err != nil {
0 commit comments