github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-06-26 07:02:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101174 from lojies/cleanupcertificate_manager_test

Browse Source 
code cleanup:remove repeated package import in client-go

Kubernetes-commit: 2c1b0573c479d213f64db0e83c7d93d7895b8b4b
This commit is contained in:
Kubernetes Publisher 2021-04-20 15:02:34 -07:00
commit db0131be28
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util/certificate/certificate_manager_test.go
View File

@ -29,10 +29,8 @@ import (
certificatesv1 "k8s.io/api/certificates/v1" certificatesv1 "k8s.io/api/certificates/v1"
certificatesv1beta1 "k8s.io/api/certificates/v1beta1" certificatesv1beta1 "k8s.io/api/certificates/v1beta1"
"k8s.io/apimachinery/pkg/api/errors"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@ -942,7 +940,7 @@ func TestServerHealth(t *testing.T) {
certs: currentCerts, certs: currentCerts,
failureType: createError, failureType: createError,
clientErr: errors.NewUnauthorized("unauthorized"), clientErr: apierrors.NewUnauthorized("unauthorized"),
expectRotateFail: true, expectRotateFail: true,
expectHealthy: true, expectHealthy: true,
}, },
@ -951,7 +949,7 @@ func TestServerHealth(t *testing.T) {
certs: currentCerts, certs: currentCerts,
failureType: createError, failureType: createError,
clientErr: errors.NewGenericServerResponse(401, "POST", schema.GroupResource{}, "", "", 0, true), clientErr: apierrors.NewGenericServerResponse(401, "POST", schema.GroupResource{}, "", "", 0, true),
expectRotateFail: true, expectRotateFail: true,
expectHealthy: true, expectHealthy: true,
}, },
@ -960,7 +958,7 @@ func TestServerHealth(t *testing.T) {
certs: currentCerts, certs: currentCerts,
failureType: createError, failureType: createError,
clientErr: errors.NewGenericServerResponse(404, "POST", schema.GroupResource{}, "", "", 0, true), clientErr: apierrors.NewGenericServerResponse(404, "POST", schema.GroupResource{}, "", "", 0, true),
expectRotateFail: true, expectRotateFail: true,
expectHealthy: false, expectHealthy: false,
}, },
@ -969,7 +967,7 @@ func TestServerHealth(t *testing.T) {
certs: currentCerts, certs: currentCerts,
failureType: createError, failureType: createError,
clientErr: errors.NewGenericServerResponse(404, "POST", schema.GroupResource{}, "", "", 0, false), clientErr: apierrors.NewGenericServerResponse(404, "POST", schema.GroupResource{}, "", "", 0, false),
expectRotateFail: true, expectRotateFail: true,
expectHealthy: true, expectHealthy: true,
}, },
@ -1136,12 +1134,12 @@ func newClientset(opts fakeClient) *fake.Clientset {
if opts.noV1 { if opts.noV1 {
return true, nil, apierrors.NewNotFound(certificatesv1.Resource("certificatesigningrequests"), "") return true, nil, apierrors.NewNotFound(certificatesv1.Resource("certificatesigningrequests"), "")
} }
return true, &certificatesv1.CertificateSigningRequestList{Items: []certificatesv1.CertificateSigningRequest{{ObjectMeta: v1.ObjectMeta{UID: "fake-uid"}}}}, nil return true, &certificatesv1.CertificateSigningRequestList{Items: []certificatesv1.CertificateSigningRequest{{ObjectMeta: metav1.ObjectMeta{UID: "fake-uid"}}}}, nil
case "v1beta1": case "v1beta1":
if opts.noV1beta1 { if opts.noV1beta1 {
return true, nil, apierrors.NewNotFound(certificatesv1.Resource("certificatesigningrequests"), "") return true, nil, apierrors.NewNotFound(certificatesv1.Resource("certificatesigningrequests"), "")
} }
return true, &certificatesv1beta1.CertificateSigningRequestList{Items: []certificatesv1beta1.CertificateSigningRequest{{ObjectMeta: v1.ObjectMeta{UID: "fake-uid"}}}}, nil return true, &certificatesv1beta1.CertificateSigningRequestList{Items: []certificatesv1beta1.CertificateSigningRequest{{ObjectMeta: metav1.ObjectMeta{UID: "fake-uid"}}}}, nil
default: default:
return false, nil, nil return false, nil, nil
} }