chore: drop v2beta1 api version (apache#928)

cmd/ingress/ingress.go

@@ -161,7 +161,7 @@ For example, no available LB exists in the bare metal environment.`)
 	cmd.PersistentFlags().StringVar(&cfg.Kubernetes.IngressClass, "ingress-class", config.IngressClass, "the class of an Ingress object is set using the field IngressClassName in Kubernetes clusters version v1.18.0 or higher or the annotation \"kubernetes.io/ingress.class\" (deprecated)")
 	cmd.PersistentFlags().StringVar(&cfg.Kubernetes.ElectionID, "election-id", config.IngressAPISIXLeader, "election id used for campaign the controller leader")
 	cmd.PersistentFlags().StringVar(&cfg.Kubernetes.IngressVersion, "ingress-version", config.IngressNetworkingV1, "the supported ingress api group version, can be \"networking/v1beta1\", \"networking/v1\" (for Kubernetes version v1.19.0 or higher) and \"extensions/v1beta1\"")
-	cmd.PersistentFlags().StringVar(&cfg.Kubernetes.ApisixRouteVersion, "apisix-route-version", config.ApisixRouteV2beta3, "the supported apisixroute api group version, can be \"apisix.apache.org/v2beta1\" or \"apisix.apache.org/v2beta2\" or \"apisix.apache.org/v2beta3\"")
+	cmd.PersistentFlags().StringVar(&cfg.Kubernetes.ApisixRouteVersion, "apisix-route-version", config.ApisixRouteV2beta3, "the supported apisixroute api group version, can be \"apisix.apache.org/v2beta2\" or \"apisix.apache.org/v2beta3\"")
 	cmd.PersistentFlags().BoolVar(&cfg.Kubernetes.WatchEndpointSlices, "watch-endpointslices", false, "whether to watch endpointslices rather than endpoints")
 	cmd.PersistentFlags().BoolVar(&cfg.Kubernetes.EnableGatewayAPI, "enable-gateway-api", false, "whether to enable support for Gateway API")
 	cmd.PersistentFlags().StringVar(&cfg.APISIX.DefaultClusterBaseURL, "default-apisix-cluster-base-url", "", "the base URL of admin api / manager api for the default APISIX cluster")

pkg/api/validation/apisix_consumer.go

@@ -26,7 +26,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/apache/apisix-ingress-controller/pkg/apisix"
-	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta1"
 	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta2"
 	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta3"
 	"github.com/apache/apisix-ingress-controller/pkg/log"
@@ -44,8 +43,6 @@ var ApisixConsumerValidator = kwhvalidating.ValidatorFunc(
 		var spec interface{}
 
 		switch ac := object.(type) {
-		case *v2beta1.ApisixRoute:
-			spec = ac.Spec
 		case *v2beta2.ApisixRoute:
 			spec = ac.Spec
 		case *v2beta3.ApisixRoute:

pkg/api/validation/apisix_route.go

@@ -28,7 +28,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/apache/apisix-ingress-controller/pkg/apisix"
-	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta1"
 	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta2"
 	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta3"
 	"github.com/apache/apisix-ingress-controller/pkg/log"
@@ -67,18 +66,6 @@ var ApisixRouteValidator = kwhvalidating.ValidatorFunc(
 					}
 				}
 			}
-		case *v2beta1.ApisixRoute:
-			spec = ar.Spec
-
-			for _, h := range ar.Spec.HTTP {
-				for _, p := range h.Plugins {
-					if p.Enable {
-						plugins = append(plugins, apisixRoutePlugin{
-							p.Name, p.Config,
-						})
-					}
-				}
-			}
 		case *v2beta3.ApisixRoute:
 			spec = ar.Spec
 

pkg/api/validation/apisix_route_test.go

@@ -21,7 +21,6 @@ import (
 	"testing"
 
 	"github.com/apache/apisix-ingress-controller/pkg/apisix"
-	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta1"
 	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta2"
 	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta3"
 	api "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
@@ -124,12 +123,7 @@ func Test_validatePlugin(t *testing.T) {
 	fakeClient := newFakeSchemaClient()
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			gotValid, _ := validatePlugin(fakeClient, tt.pluginName, v2beta1.ApisixRouteHTTPPluginConfig(tt.pluginConfig))
-			if gotValid != tt.wantValid {
-				t.Errorf("validatePlugin() gotValid = %v, want %v", gotValid, tt.wantValid)
-			}
-
-			gotValid, _ = validatePlugin(fakeClient, tt.pluginName, v2beta3.ApisixRouteHTTPPluginConfig(tt.pluginConfig))
+			gotValid, _ := validatePlugin(fakeClient, tt.pluginName, v2beta3.ApisixRouteHTTPPluginConfig(tt.pluginConfig))
 			if gotValid != tt.wantValid {
 				t.Errorf("validatePlugin() gotValid = %v, want %v", gotValid, tt.wantValid)
 			}

pkg/api/validation/apisix_tls.go

@@ -26,7 +26,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/apache/apisix-ingress-controller/pkg/apisix"
-	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta1"
 	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta2"
 	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta3"
 	"github.com/apache/apisix-ingress-controller/pkg/log"
@@ -44,8 +43,6 @@ var ApisixTlsValidator = kwhvalidating.ValidatorFunc(
 		var spec interface{}
 
 		switch at := object.(type) {
-		case *v2beta1.ApisixRoute:
-			spec = at.Spec
 		case *v2beta2.ApisixRoute:
 			spec = at.Spec
 		case *v2beta3.ApisixRoute:

pkg/api/validation/apisix_upstream.go

@@ -26,7 +26,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/apache/apisix-ingress-controller/pkg/apisix"
-	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta1"
 	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta2"
 	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta3"
 	"github.com/apache/apisix-ingress-controller/pkg/log"
@@ -44,8 +43,6 @@ var ApisixUpstreamValidator = kwhvalidating.ValidatorFunc(
 		var spec interface{}
 
 		switch au := object.(type) {
-		case *v2beta1.ApisixRoute:
-			spec = au.Spec
 		case *v2beta2.ApisixRoute:
 			spec = au.Spec
 		case *v2beta3.ApisixRoute:

pkg/config/config.go

@@ -51,8 +51,6 @@ const (
 	// WARNING: ingress.extensions/v1beta1 is deprecated in v1.14+, and will be unavilable
 	// in v1.22.
 	IngressExtensionsV1beta1 = "extensions/v1beta1"
-	// ApisixRouteV2beta1 represents apisixroute.apisix.apache.org/v2beta1
-	ApisixRouteV2beta1 = "apisix.apache.org/v2beta1"
 	// ApisixRouteV2beta2 represents apisixroute.apisix.apache.org/v2beta2
 	ApisixRouteV2beta2 = "apisix.apache.org/v2beta2"
 	// ApisixRouteV2beta3 represents apisixroute.apisix.apache.org/v2beta3

pkg/ingress/apisix_route.go

@@ -97,8 +97,6 @@ func (c *apisixRouteController) sync(ctx context.Context, ev *types.Event) error
 		tctx *translation.TranslateContext
 	)
 	switch obj.GroupVersion {
-	case kube.ApisixRouteV2beta1:
-		ar, err = c.controller.apisixRouteLister.V2beta1(namespace, name)
 	case kube.ApisixRouteV2beta2:
 		ar, err = c.controller.apisixRouteLister.V2beta2(namespace, name)
 	case kube.ApisixRouteV2beta3:
@@ -136,19 +134,6 @@ func (c *apisixRouteController) sync(ctx context.Context, ev *types.Event) error
 	}
 
 	switch obj.GroupVersion {
-	case kube.ApisixRouteV2beta1:
-		if ev.Type != types.EventDelete {
-			tctx, err = c.controller.translator.TranslateRouteV2beta1(ar.V2beta1())
-		} else {
-			tctx, err = c.controller.translator.TranslateRouteV2beta1NotStrictly(ar.V2beta1())
-		}
-		if err != nil {
-			log.Errorw("failed to translate ApisixRoute v2beta1",
-				zap.Error(err),
-				zap.Any("object", ar),
-			)
-			return err
-		}
 	case kube.ApisixRouteV2beta2:
 		if ev.Type != types.EventDelete {
 			tctx, err = c.controller.translator.TranslateRouteV2beta2(ar.V2beta2())
@@ -206,8 +191,6 @@ func (c *apisixRouteController) sync(ctx context.Context, ev *types.Event) error
 	} else {
 		var oldCtx *translation.TranslateContext
 		switch obj.GroupVersion {
-		case kube.ApisixRouteV2beta1:
-			oldCtx, err = c.controller.translator.TranslateRouteV2beta1(obj.OldObject.V2beta1())
 		case kube.ApisixRouteV2beta2:
 			oldCtx, err = c.controller.translator.TranslateRouteV2beta2(obj.OldObject.V2beta2())
 		case kube.ApisixRouteV2beta3:
@@ -279,18 +262,13 @@ func (c *apisixRouteController) handleSyncErr(obj interface{}, errOrigin error)
 	switch event.GroupVersion {
 	case kube.ApisixRouteV2beta3:
 		ar, errLocal = c.controller.apisixRouteLister.V2beta3(namespace, name)
-	case kube.ApisixRouteV2beta1:
-		ar, errLocal = c.controller.apisixRouteLister.V2beta1(namespace, name)
 	case kube.ApisixRouteV2beta2:
 		ar, errLocal = c.controller.apisixRouteLister.V2beta2(namespace, name)
 	}
 	if errOrigin == nil {
 		if ev.Type != types.EventDelete {
 			if errLocal == nil {
 				switch ar.GroupVersion() {
-				case kube.ApisixRouteV2beta1:
-					c.controller.recorderEvent(ar.V2beta1(), v1.EventTypeNormal, _resourceSynced, nil)
-					c.controller.recordStatus(ar.V2beta1(), _resourceSynced, nil, metav1.ConditionTrue, ar.V2beta1().GetGeneration())
 				case kube.ApisixRouteV2beta2:
 					c.controller.recorderEvent(ar.V2beta2(), v1.EventTypeNormal, _resourceSynced, nil)
 					c.controller.recordStatus(ar.V2beta2(), _resourceSynced, nil, metav1.ConditionTrue, ar.V2beta2().GetGeneration())
@@ -316,9 +294,6 @@ func (c *apisixRouteController) handleSyncErr(obj interface{}, errOrigin error)
 	)
 	if errLocal == nil {
 		switch ar.GroupVersion() {
-		case kube.ApisixRouteV2beta1:
-			c.controller.recorderEvent(ar.V2beta1(), v1.EventTypeWarning, _resourceSyncAborted, errOrigin)
-			c.controller.recordStatus(ar.V2beta1(), _resourceSyncAborted, errOrigin, metav1.ConditionFalse, ar.V2beta1().GetGeneration())
 		case kube.ApisixRouteV2beta2:
 			c.controller.recorderEvent(ar.V2beta2(), v1.EventTypeWarning, _resourceSyncAborted, errOrigin)
 			c.controller.recordStatus(ar.V2beta2(), _resourceSyncAborted, errOrigin, metav1.ConditionFalse, ar.V2beta2().GetGeneration())

pkg/ingress/controller.go

@@ -219,7 +219,6 @@ func (c *Controller) initWhenStartLeading() {
 	)
 	c.secretLister = kubeFactory.Core().V1().Secrets().Lister()
 	c.apisixRouteLister = kube.NewApisixRouteLister(
-		apisixFactory.Apisix().V2beta1().ApisixRoutes().Lister(),
 		apisixFactory.Apisix().V2beta2().ApisixRoutes().Lister(),
 		apisixFactory.Apisix().V2beta3().ApisixRoutes().Lister(),
 	)
@@ -253,8 +252,6 @@ func (c *Controller) initWhenStartLeading() {
 	c.gatewayInformer = gatewayFactory.Gateway().V1alpha2().Gateways().Informer()
 
 	switch c.cfg.Kubernetes.ApisixRouteVersion {
-	case config.ApisixRouteV2beta1:
-		apisixRouteInformer = apisixFactory.Apisix().V2beta1().ApisixRoutes().Informer()
 	case config.ApisixRouteV2beta2:
 		apisixRouteInformer = apisixFactory.Apisix().V2beta2().ApisixRoutes().Informer()
 	case config.ApisixRouteV2beta3:

pkg/ingress/status.go

@@ -32,7 +32,6 @@ import (
 	"k8s.io/client-go/tools/cache"
 	gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 
-	configv2beta1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta1"
 	configv2beta2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta2"
 	configv2beta3 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta3"
 	"github.com/apache/apisix-ingress-controller/pkg/log"
@@ -109,23 +108,6 @@ func (c *Controller) recordStatus(at interface{}, reason string, err error, stat
 				)
 			}
 		}
-	case *configv2beta1.ApisixRoute:
-		// set to status
-		if v.Status.Conditions == nil {
-			conditions := make([]metav1.Condition, 0)
-			v.Status.Conditions = conditions
-		}
-		if c.verifyGeneration(&v.Status.Conditions, condition) {
-			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 *configv2beta2.ApisixRoute:
 		// set to status
 		if v.Status.Conditions == nil {