weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

three small goimports fixes against current HEAD

Browse Source 
rather than using the default suggested `v1` names for some imports, we
use more descriptive names

Signed-off-by: Ashley Davis <ashley.davis@jetstack.io>
This commit is contained in:
Ashley Davis 2021-10-29 16:34:06 +01:00
parent 381e4fecc4
commit 727e29a747
No known key found for this signature in database
GPG Key ID: DD14CC017E32BEB1
3 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/apis/meta/v1/conversion.go
View File

@ -20,41 +20,41 @@ import (
"k8s.io/apimachinery/pkg/conversion"
"github.com/jetstack/cert-manager/internal/apis/meta"
"github.com/jetstack/cert-manager/pkg/apis/meta/v1"
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
)
// Convert_meta_LocalObjectReference_To_v1_LocalObjectReference is explicitly defined to avoid issues in conversion-gen
// when referencing types in other API groups.
func Convert_meta_LocalObjectReference_To_v1_LocalObjectReference(in *meta.LocalObjectReference, out *v1.LocalObjectReference, s conversion.Scope) error {
func Convert_meta_LocalObjectReference_To_v1_LocalObjectReference(in *meta.LocalObjectReference, out *cmmeta.LocalObjectReference, s conversion.Scope) error {
return autoConvert_meta_LocalObjectReference_To_v1_LocalObjectReference(in, out, s)
}
// Convert_v1_LocalObjectReference_To_meta_LocalObjectReference is explicitly defined to avoid issues in conversion-gen
// when referencing types in other API groups.
func Convert_v1_LocalObjectReference_To_meta_LocalObjectReference(in *v1.LocalObjectReference, out *meta.LocalObjectReference, s conversion.Scope) error {
func Convert_v1_LocalObjectReference_To_meta_LocalObjectReference(in *cmmeta.LocalObjectReference, out *meta.LocalObjectReference, s conversion.Scope) error {
return autoConvert_v1_LocalObjectReference_To_meta_LocalObjectReference(in, out, s)
}
// Convert_meta_ObjectReference_To_v1_ObjectReference is explicitly defined to avoid issues in conversion-gen
// when referencing types in other API groups.
func Convert_meta_ObjectReference_To_v1_ObjectReference(in *meta.ObjectReference, out *v1.ObjectReference, s conversion.Scope) error {
func Convert_meta_ObjectReference_To_v1_ObjectReference(in *meta.ObjectReference, out *cmmeta.ObjectReference, s conversion.Scope) error {
return autoConvert_meta_ObjectReference_To_v1_ObjectReference(in, out, s)
}
// Convert_v1_ObjectReference_To_meta_ObjectReference is explicitly defined to avoid issues in conversion-gen
// when referencing types in other API groups.
func Convert_v1_ObjectReference_To_meta_ObjectReference(in *v1.ObjectReference, out *meta.ObjectReference, s conversion.Scope) error {
func Convert_v1_ObjectReference_To_meta_ObjectReference(in *cmmeta.ObjectReference, out *meta.ObjectReference, s conversion.Scope) error {
return autoConvert_v1_ObjectReference_To_meta_ObjectReference(in, out, s)
}
// Convert_meta_SecretKeySelector_To_v1_SecretKeySelector is explicitly defined to avoid issues in conversion-gen
// when referencing types in other API groups.
func Convert_meta_SecretKeySelector_To_v1_SecretKeySelector(in *meta.SecretKeySelector, out *v1.SecretKeySelector, s conversion.Scope) error {
func Convert_meta_SecretKeySelector_To_v1_SecretKeySelector(in *meta.SecretKeySelector, out *cmmeta.SecretKeySelector, s conversion.Scope) error {
return autoConvert_meta_SecretKeySelector_To_v1_SecretKeySelector(in, out, s)
}
// Convert_v1_SecretKeySelector_To_meta_SecretKeySelector is explicitly defined to avoid issues in conversion-gen
// when referencing types in other API groups.
func Convert_v1_SecretKeySelector_To_meta_SecretKeySelector(in *v1.SecretKeySelector, out *meta.SecretKeySelector, s conversion.Scope) error {
func Convert_v1_SecretKeySelector_To_meta_SecretKeySelector(in *cmmeta.SecretKeySelector, out *meta.SecretKeySelector, s conversion.Scope) error {
return autoConvert_v1_SecretKeySelector_To_meta_SecretKeySelector(in, out, s)
}

86
pkg/issuer/acme/http/ingress_test.go
View File

@ -22,7 +22,7 @@ import (
"reflect"
"testing"
"k8s.io/api/networking/v1"
networkingv1 "k8s.io/api/networking/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
@ -58,8 +58,8 @@ func TestGetIngressesForChallenge(t *testing.T) {
s.Builder.Sync()
},
CheckFn: func(t *testing.T, s *solverFixture, args ...interface{}) {
createdIngress := s.testResources[createdIngressKey].(*v1.Ingress)
resp := args[0].([]*v1.Ingress)
createdIngress := s.testResources[createdIngressKey].(*networkingv1.Ingress)
resp := args[0].([]*networkingv1.Ingress)
if len(resp) != 1 {
t.Errorf("expected one ingress to be returned, but got %d", len(resp))
t.Fail()
@ -91,8 +91,8 @@ func TestGetIngressesForChallenge(t *testing.T) {
s.Builder.Sync()
},
CheckFn: func(t *testing.T, s *solverFixture, args ...interface{}) {
createdIngress := s.testResources[createdIngressKey].(*v1.Ingress)
resp := args[0].([]*v1.Ingress)
createdIngress := s.testResources[createdIngressKey].(*networkingv1.Ingress)
resp := args[0].([]*networkingv1.Ingress)
if len(resp) != 1 {
t.Errorf("expected one ingress to be returned, but got %d", len(resp))
t.Fail()
@ -125,7 +125,7 @@ func TestGetIngressesForChallenge(t *testing.T) {
s.Builder.Sync()
},
CheckFn: func(t *testing.T, s *solverFixture, args ...interface{}) {
resp := args[0].([]*v1.Ingress)
resp := args[0].([]*networkingv1.Ingress)
if len(resp) != 0 {
t.Errorf("expected zero ingresses to be returned, but got %d", len(resp))
t.Fail()
@ -175,7 +175,7 @@ func TestCleanupIngresses(t *testing.T) {
s.Builder.Sync()
},
CheckFn: func(t *testing.T, s *solverFixture, args ...interface{}) {
createdIngress := s.testResources[createdIngressKey].(*v1.Ingress)
createdIngress := s.testResources[createdIngressKey].(*networkingv1.Ingress)
ing, err := s.Builder.FakeKubeClient().NetworkingV1().Ingresses(s.Challenge.Namespace).Get(context.TODO(), createdIngress.Name, metav1.GetOptions{})
if err != nil && !apierrors.IsNotFound(err) {
t.Errorf("error when getting test ingress, expected 'not found' but got: %v", err)
@ -209,7 +209,7 @@ func TestCleanupIngresses(t *testing.T) {
s.testResources[createdIngressKey] = ing
},
CheckFn: func(t *testing.T, s *solverFixture, args ...interface{}) {
createdIngress := s.testResources[createdIngressKey].(*v1.Ingress)
createdIngress := s.testResources[createdIngressKey].(*networkingv1.Ingress)
_, err := s.Builder.FakeKubeClient().NetworkingV1().Ingresses(s.Challenge.Namespace).Get(context.TODO(), createdIngress.Name, metav1.GetOptions{})
if apierrors.IsNotFound(err) {
t.Errorf("expected ingress resource %q to not be deleted, but it was deleted", createdIngress.Name)
@ -222,32 +222,32 @@ func TestCleanupIngresses(t *testing.T) {
"should clean up an ingress with a single challenge path inserted": {
Builder: &test.Builder{
KubeObjects: []runtime.Object{
&v1.Ingress{
&networkingv1.Ingress{
ObjectMeta: metav1.ObjectMeta{
Name: "testingress",
Namespace: defaultTestNamespace,
},
Spec: v1.IngressSpec{
DefaultBackend: &v1.IngressBackend{
Service: &v1.IngressServiceBackend{
Spec: networkingv1.IngressSpec{
DefaultBackend: &networkingv1.IngressBackend{
Service: &networkingv1.IngressServiceBackend{
Name: "",
Port: v1.ServiceBackendPort{
Port: networkingv1.ServiceBackendPort{
Number: 8080,
},
},
},
Rules: []v1.IngressRule{
Rules: []networkingv1.IngressRule{
{
Host: "example.com",
IngressRuleValue: v1.IngressRuleValue{
HTTP: &v1.HTTPIngressRuleValue{
Paths: []v1.HTTPIngressPath{
IngressRuleValue: networkingv1.IngressRuleValue{
HTTP: &networkingv1.HTTPIngressRuleValue{
Paths: []networkingv1.HTTPIngressPath{
{
Path: "/.well-known/acme-challenge/abcd",
Backend: v1.IngressBackend{
Service: &v1.IngressServiceBackend{
Backend: networkingv1.IngressBackend{
Service: &networkingv1.IngressServiceBackend{
Name: "solversvc",
Port: v1.ServiceBackendPort{
Port: networkingv1.ServiceBackendPort{
Number: 8081,
},
},
@ -282,7 +282,7 @@ func TestCleanupIngresses(t *testing.T) {
PreFn: func(t *testing.T, s *solverFixture) {
},
CheckFn: func(t *testing.T, s *solverFixture, args ...interface{}) {
expectedIng := s.KubeObjects[0].(*v1.Ingress).DeepCopy()
expectedIng := s.KubeObjects[0].(*networkingv1.Ingress).DeepCopy()
expectedIng.Spec.Rules = nil
actualIng, err := s.Builder.FakeKubeClient().NetworkingV1().Ingresses(s.Challenge.Namespace).Get(context.TODO(), expectedIng.Name, metav1.GetOptions{})
@ -301,32 +301,32 @@ func TestCleanupIngresses(t *testing.T) {
"should clean up an ingress with a single challenge path inserted without removing second HTTP rule": {
Builder: &test.Builder{
KubeObjects: []runtime.Object{
&v1.Ingress{
&networkingv1.Ingress{
ObjectMeta: metav1.ObjectMeta{
Name: "testingress",
Namespace: defaultTestNamespace,
},
Spec: v1.IngressSpec{
DefaultBackend: &v1.IngressBackend{
Service: &v1.IngressServiceBackend{
Spec: networkingv1.IngressSpec{
DefaultBackend: &networkingv1.IngressBackend{
Service: &networkingv1.IngressServiceBackend{
Name: "testsvc",
Port: v1.ServiceBackendPort{
Port: networkingv1.ServiceBackendPort{
Number: 8080,
},
},
},
Rules: []v1.IngressRule{
Rules: []networkingv1.IngressRule{
{
Host: "example.com",
IngressRuleValue: v1.IngressRuleValue{
HTTP: &v1.HTTPIngressRuleValue{
Paths: []v1.HTTPIngressPath{
IngressRuleValue: networkingv1.IngressRuleValue{
HTTP: &networkingv1.HTTPIngressRuleValue{
Paths: []networkingv1.HTTPIngressPath{
{
Path: "/.well-known/acme-challenge/abcd",
Backend: v1.IngressBackend{
Service: &v1.IngressServiceBackend{
Backend: networkingv1.IngressBackend{
Service: &networkingv1.IngressServiceBackend{
Name: "solversvc",
Port: v1.ServiceBackendPort{
Port: networkingv1.ServiceBackendPort{
Number: 8081,
},
},
@ -338,15 +338,15 @@ func TestCleanupIngresses(t *testing.T) {
},
{
Host: "a.example.com",
IngressRuleValue: v1.IngressRuleValue{
HTTP: &v1.HTTPIngressRuleValue{
Paths: []v1.HTTPIngressPath{
IngressRuleValue: networkingv1.IngressRuleValue{
HTTP: &networkingv1.HTTPIngressRuleValue{
Paths: []networkingv1.HTTPIngressPath{
{
Path: "/",
Backend: v1.IngressBackend{
Service: &v1.IngressServiceBackend{
Backend: networkingv1.IngressBackend{
Service: &networkingv1.IngressServiceBackend{
Name: "real-backend-svc",
Port: v1.ServiceBackendPort{
Port: networkingv1.ServiceBackendPort{
Number: 8081,
},
},
@ -381,8 +381,8 @@ func TestCleanupIngresses(t *testing.T) {
PreFn: func(t *testing.T, s *solverFixture) {
},
CheckFn: func(t *testing.T, s *solverFixture, args ...interface{}) {
expectedIng := s.KubeObjects[0].(*v1.Ingress).DeepCopy()
expectedIng.Spec.Rules = []v1.IngressRule{expectedIng.Spec.Rules[1]}
expectedIng := s.KubeObjects[0].(*networkingv1.Ingress).DeepCopy()
expectedIng.Spec.Rules = []networkingv1.IngressRule{expectedIng.Spec.Rules[1]}
actualIng, err := s.Builder.FakeKubeClient().NetworkingV1().Ingresses(s.Challenge.Namespace).Get(context.TODO(), expectedIng.Name, metav1.GetOptions{})
if apierrors.IsNotFound(err) {
@ -538,9 +538,9 @@ func TestMergeIngressObjectMetaWithIngressResourceTemplate(t *testing.T) {
s.Builder.Sync()
},
CheckFn: func(t *testing.T, s *solverFixture, args ...interface{}) {
expectedIngress := s.testResources[createdIngressKey].(*v1.Ingress)
expectedIngress := s.testResources[createdIngressKey].(*networkingv1.Ingress)
resp, ok := args[0].(*v1.Ingress)
resp, ok := args[0].(*networkingv1.Ingress)
if !ok {
t.Errorf("expected ingress to be returned, but got %v", args[0])
t.Fail()

6
test/e2e/framework/helper/describe.go
View File

@ -17,11 +17,13 @@ limitations under the License.
package helper
import (
cmscheme "github.com/jetstack/cert-manager/pkg/client/clientset/versioned/scheme"
"os"
"k8s.io/apimachinery/pkg/runtime"
runtimejson "k8s.io/apimachinery/pkg/runtime/serializer/json"
kubescheme "k8s.io/client-go/kubernetes/scheme"
"os"
cmscheme "github.com/jetstack/cert-manager/pkg/client/clientset/versioned/scheme"
)
func (h *Helper) describeKubeObject(object runtime.Object) error {