fix: change the error when the defaul class and ingClassName are nill

kubernetes-sigs · Jan 9, 2023 · f0b82e3 · f0b82e3
1 parent b8641e1
commit f0b82e3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/d b/d
diff --git a/pkg/ingress/class_loader.go b/pkg/ingress/class_loader.go
@@ -78,7 +78,7 @@ func (l *defaultClassLoader) Load(ctx context.Context, ing *networking.Ingress)
 		if defaultClass != "" {
 			ing.Spec.IngressClassName = &defaultClass
 		} else {
-			return ClassConfiguration{}, err
+			return ClassConfiguration{}, nil
 		}
 	}
 

diff --git a/pkg/ingress/class_loader_test.go b/pkg/ingress/class_loader_test.go
@@ -2,6 +2,8 @@ package ingress
 
 import (
 	"context"
+	"testing"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/golang/mock/gomock"
 	"github.com/google/go-cmp/cmp"
@@ -18,7 +20,6 @@ import (
 	"sigs.k8s.io/aws-load-balancer-controller/pkg/webhook"
 	testclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
-	"testing"
 )
 
 func Test_defaultClassLoader_Load(t *testing.T) {
@@ -59,7 +60,7 @@ func Test_defaultClassLoader_Load(t *testing.T) {
 					},
 				},
 			},
-			wantErr: errors.New("invalid ingress class: spec.ingressClassName is nil"),
+			wantErr: nil,
 		},
 		{
 			name: "when IngressClass not found",

diff --git a/pkg/ingress/group_loader.go b/pkg/ingress/group_loader.go
@@ -206,29 +206,25 @@ func (m *defaultGroupLoader) classifyIngress(ctx context.Context, ing *networkin
 			IngClassConfig: ClassConfiguration{},
 		}, false, nil
 	}
+
 	ingClassConfig, err := m.classLoader.Load(ctx, ing)
 	if err != nil {
 		return ClassifiedIngress{
 			Ing:            ing,
 			IngClassConfig: ClassConfiguration{},
 		}, false, err
 	}
-	if matchesIngressClass := ingClassConfig.IngClass != nil; matchesIngressClass {
-		if ingClassConfig.IngClass.Spec.Controller == ingressClassControllerALB {
-			return ClassifiedIngress{
-				Ing:            ing,
-				IngClassConfig: ingClassConfig,
-			}, true, nil
-		}
+
+	if matchesIngressClass := ingClassConfig.IngClass != nil && ingClassConfig.IngClass.Spec.Controller == ingressClassControllerALB; matchesIngressClass {
 		return ClassifiedIngress{
 			Ing:            ing,
 			IngClassConfig: ingClassConfig,
-		}, false, nil
+		}, true, nil
 	}
 
 	return ClassifiedIngress{
 		Ing:            ing,
-		IngClassConfig: ClassConfiguration{},
+		IngClassConfig: ingClassConfig,
 	}, m.manageIngressesWithoutIngressClass, nil
 }