[apisix-ingress-controller] branch master updated: fix: add v2beta1 logic (#615)

[zhangjintao]

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

zhangjintao 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 d12a900  fix: add v2beta1 logic (#615)
d12a900 is described below

commit d12a900976e9118fe1b5fd0df137426a294f7a97
Author: kv <gxt...@163.com>
AuthorDate: Wed Aug 4 14:48:36 2021 +0800

    fix: add v2beta1 logic (#615)
---
 pkg/ingress/status.go    | 16 ++++++++++++++++
 pkg/kube/apisix_route.go |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkg/ingress/status.go b/pkg/ingress/status.go
index cf68e8a..21bf972 100644
--- a/pkg/ingress/status.go
+++ b/pkg/ingress/status.go
@@ -25,6 +25,7 @@ import (
 
        configv1 
"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1"
        configv2alpha1 
"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2alpha1"
+       configv2beta1 
"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta1"
        "github.com/apache/apisix-ingress-controller/pkg/log"
 )
 
@@ -94,6 +95,21 @@ func (c *Controller) recordStatus(at interface{}, reason 
string, err error, stat
                                zap.String("namespace", v.Namespace),
                        )
                }
+       case *configv2beta1.ApisixRoute:
+               // set to status
+               if v.Status.Conditions == nil {
+                       conditions := make([]metav1.Condition, 0)
+                       v.Status.Conditions = conditions
+               }
+               meta.SetStatusCondition(&v.Status.Conditions, condition)
+               if _, errRecord := 
client.ApisixV2beta1().ApisixRoutes(v.Namespace).
+                       UpdateStatus(context.TODO(), v, 
metav1.UpdateOptions{}); errRecord != nil {
+                       log.Errorw("failed to record status change for 
ApisixRoute",
+                               zap.Error(errRecord),
+                               zap.String("name", v.Name),
+                               zap.String("namespace", v.Namespace),
+                       )
+               }
        case *configv2alpha1.ApisixConsumer:
                // set to status
                if v.Status.Conditions == nil {
diff --git a/pkg/kube/apisix_route.go b/pkg/kube/apisix_route.go
index e5274c1..3ac33ba 100644
--- a/pkg/kube/apisix_route.go
+++ b/pkg/kube/apisix_route.go
@@ -114,8 +114,10 @@ func (ar *apisixRoute) GroupVersion() string {
 func (ar *apisixRoute) ResourceVersion() string {
        if ar.groupVersion == ApisixRouteV1 {
                return ar.V1().ResourceVersion
+       } else if ar.groupVersion == ApisixRouteV2alpha1 {
+               return ar.V2alpha1().ResourceVersion
        }
-       return ar.V2alpha1().ResourceVersion
+       return ar.V2beta1().ResourceVersion
 }
 
 type apisixRouteLister struct {