fix: ingress_class configuration invalid(#475) (#477)

* fix: ingress_class configuration invalid(#475) * fix: ingress test case Co-authored-by: 董辉 <donghui@luojilab.com>
apache · May 25, 2021 · 6630aac · 6630aac
1 parent e8eddcc
commit 6630aac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pkg/ingress/ingress.go b/pkg/ingress/ingress.go
@@ -24,7 +24,6 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 
-	"github.com/apache/apisix-ingress-controller/pkg/config"
 	"github.com/apache/apisix-ingress-controller/pkg/kube"
 	"github.com/apache/apisix-ingress-controller/pkg/log"
 	"github.com/apache/apisix-ingress-controller/pkg/types"
@@ -318,10 +317,10 @@ func (c *ingressController) isIngressEffective(ing kube.Ingress) bool {
 
 	// kubernetes.io/ingress.class takes the precedence.
 	if ica != "" {
-		return ica == config.IngressClass
+		return ica == c.controller.cfg.Kubernetes.IngressClass
 	}
 	if ic != nil {
-		return *ic == config.IngressClass
+		return *ic == c.controller.cfg.Kubernetes.IngressClass
 	}
 	return false
 }
diff --git a/pkg/ingress/ingress_test.go b/pkg/ingress/ingress_test.go
@@ -23,11 +23,16 @@ import (
 	networkingv1beta1 "k8s.io/api/networking/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/apache/apisix-ingress-controller/pkg/config"
 	"github.com/apache/apisix-ingress-controller/pkg/kube"
 )
 
 func TestIsIngressEffective(t *testing.T) {
-	c := &ingressController{}
+	c := &ingressController{
+		controller: &Controller{
+			cfg: config.NewDefaultConfig(),
+		},
+	}
 	cn := "ingress"
 	ingV1 := &networkingv1.Ingress{
 		TypeMeta: metav1.TypeMeta{