[apisix-ingress-controller] branch master updated: fix: correctly handle ingress in extensions/v1beta1 version (#366)

[to...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
     new fb5bb33  fix: correctly handle ingress in extensions/v1beta1 version (#366)
fb5bb33 is described below

commit fb5bb33d50f35503f6b7cbc009b75bd5b543478f
Author: Vincent <vi...@qq.com>
AuthorDate: Wed Apr 14 08:50:52 2021 +0800

    fix: correctly handle ingress in extensions/v1beta1 version (#366)
---
 pkg/ingress/ingress.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkg/ingress/ingress.go b/pkg/ingress/ingress.go
index a9034d2..fb3281e 100644
--- a/pkg/ingress/ingress.go
+++ b/pkg/ingress/ingress.go
@@ -16,6 +16,7 @@ package ingress
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"go.uber.org/zap"
@@ -91,10 +92,16 @@ func (c *ingressController) sync(ctx context.Context, ev *types.Event) error {
 	}
 
 	var ing kube.Ingress
-	if ingEv.GroupVersion == kube.IngressV1 {
+	switch ingEv.GroupVersion {
+	case kube.IngressV1:
 		ing, err = c.controller.ingressLister.V1(namespace, name)
-	} else {
+	case kube.IngressV1beta1:
 		ing, err = c.controller.ingressLister.V1beta1(namespace, name)
+	case kube.IngressExtensionsV1beta1:
+		ing, err = c.controller.ingressLister.ExtensionsV1beta1(namespace, name)
+	default:
+		err = fmt.Errorf("unsupported group version %s, one of (%s/%s/%s) is expected", ingEv.GroupVersion,
+			kube.IngressV1, kube.IngressV1beta1, kube.IngressExtensionsV1beta1)
 	}
 
 	if err != nil {