diff --git a/internal/ingress/controller/backend_ssl_test.go b/internal/ingress/controller/backend_ssl_test.go index 16892da62..7c0de477d 100644 --- a/internal/ingress/controller/backend_ssl_test.go +++ b/internal/ingress/controller/backend_ssl_test.go @@ -31,7 +31,6 @@ import ( "k8s.io/ingress-nginx/internal/ingress" "k8s.io/ingress-nginx/internal/ingress/store" "k8s.io/ingress-nginx/internal/task" - "k8s.io/kubernetes/pkg/api" ) const ( @@ -76,7 +75,7 @@ func buildSecretForBackendSSL() *apiv1.Secret { return &apiv1.Secret{ ObjectMeta: metav1.ObjectMeta{ Name: "foo_secret", - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, } } @@ -153,8 +152,8 @@ func TestSyncSecret(t *testing.T) { Data map[string][]byte expectSuccess bool }{ - {"getPemCertificate_error", "default/foo_secret", map[string][]byte{api.TLSPrivateKeyKey: dKey}, false}, - {"normal_test", "default/foo_secret", map[string][]byte{api.TLSCertKey: dCrt, api.TLSPrivateKeyKey: dKey, tlscaName: dCa}, true}, + {"getPemCertificate_error", "default/foo_secret", map[string][]byte{apiv1.TLSPrivateKeyKey: dKey}, false}, + {"normal_test", "default/foo_secret", map[string][]byte{apiv1.TLSCertKey: dCrt, apiv1.TLSPrivateKeyKey: dKey, tlscaName: dCa}, true}, } for _, foo := range foos { @@ -200,12 +199,12 @@ func TestGetPemCertificate(t *testing.T) { }{ {"sceret_not_exist", "default/foo_secret_not_exist", nil, true}, {"data_not_complete_all_not_exist", "default/foo_secret", map[string][]byte{}, true}, - {"data_not_complete_TLSCertKey_not_exist", "default/foo_secret", map[string][]byte{api.TLSPrivateKeyKey: dKey, tlscaName: dCa}, false}, - {"data_not_complete_TLSCertKeyAndCA_not_exist", "default/foo_secret", map[string][]byte{api.TLSPrivateKeyKey: dKey}, true}, - {"data_not_complete_TLSPrivateKeyKey_not_exist", "default/foo_secret", map[string][]byte{api.TLSCertKey: dCrt, tlscaName: dCa}, false}, - {"data_not_complete_TLSPrivateKeyKeyAndCA_not_exist", "default/foo_secret", map[string][]byte{api.TLSCertKey: dCrt}, true}, - {"data_not_complete_CA_not_exist", "default/foo_secret", map[string][]byte{api.TLSCertKey: dCrt, api.TLSPrivateKeyKey: dKey}, false}, - {"normal_test", "default/foo_secret", map[string][]byte{api.TLSCertKey: dCrt, api.TLSPrivateKeyKey: dKey, tlscaName: dCa}, false}, + {"data_not_complete_TLSCertKey_not_exist", "default/foo_secret", map[string][]byte{apiv1.TLSPrivateKeyKey: dKey, tlscaName: dCa}, false}, + {"data_not_complete_TLSCertKeyAndCA_not_exist", "default/foo_secret", map[string][]byte{apiv1.TLSPrivateKeyKey: dKey}, true}, + {"data_not_complete_TLSPrivateKeyKey_not_exist", "default/foo_secret", map[string][]byte{apiv1.TLSCertKey: dCrt, tlscaName: dCa}, false}, + {"data_not_complete_TLSPrivateKeyKeyAndCA_not_exist", "default/foo_secret", map[string][]byte{apiv1.TLSCertKey: dCrt}, true}, + {"data_not_complete_CA_not_exist", "default/foo_secret", map[string][]byte{apiv1.TLSCertKey: dCrt, apiv1.TLSPrivateKeyKey: dKey}, false}, + {"normal_test", "default/foo_secret", map[string][]byte{apiv1.TLSCertKey: dCrt, apiv1.TLSPrivateKeyKey: dKey, tlscaName: dCa}, false}, } for _, foo := range foos { diff --git a/internal/ingress/status/status_test.go b/internal/ingress/status/status_test.go index 4fe246abd..b03fe9bbb 100644 --- a/internal/ingress/status/status_test.go +++ b/internal/ingress/status/status_test.go @@ -26,7 +26,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" testclient "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/cache" - "k8s.io/kubernetes/pkg/api" "k8s.io/ingress-nginx/internal/ingress/annotations/class" "k8s.io/ingress-nginx/internal/ingress/store" @@ -82,7 +81,7 @@ func buildSimpleClientSet() *testclient.Clientset { { ObjectMeta: metav1.ObjectMeta{ Name: "foo3", - Namespace: api.NamespaceSystem, + Namespace: metav1.NamespaceSystem, Labels: map[string]string{ "lable_sig": "foo_pod", }, @@ -183,7 +182,7 @@ func buildExtensionsIngresses() []extensions.Ingress { { ObjectMeta: metav1.ObjectMeta{ Name: "foo_ingress_different_class", - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, Annotations: map[string]string{ class.IngressKey: "no-nginx", }, @@ -308,7 +307,7 @@ func TestStatusActions(t *testing.T) { t.Fatalf("returned %v but expected %v", fooIngress2CurIPs, newIPs2) } - oic, err := fk.Client.ExtensionsV1beta1().Ingresses(api.NamespaceDefault).Get("foo_ingress_different_class", metav1.GetOptions{}) + oic, err := fk.Client.ExtensionsV1beta1().Ingresses(metav1.NamespaceDefault).Get("foo_ingress_different_class", metav1.GetOptions{}) if err != nil { t.Fatalf("unexpected error") }