Move codes to pkg (#46)

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
         run: make build 
 
       - name: "run go test and out codecov"
-        run: make prebuild; go test ./cmd/... ./ingress/... -race -coverprofile=coverage.out -covermode=atomic
+        run: make prebuild; go test ./cmd/... ./pkg/... -race -coverprofile=coverage.out -covermode=atomic
 
       - name: "upload coverage"
         uses: codecov/codecov-action@v3

cmd/higress/main.go

@@ -15,6 +15,7 @@
 package main
 
 import (
+	"fmt"
 	"os"
 	"time"
 
@@ -26,13 +27,10 @@ import (
 	"istio.io/pkg/log"
 	"istio.io/pkg/version"
 
-	"github.com/alibaba/higress/cmd/higress/bootstrap"
+	"github.com/alibaba/higress/pkg/bootstrap"
 )
 
 var (
-	probeAddr            string
-	enableLeaderElection bool
-
 	serverArgs     *bootstrap.ServerArgs
 	loggingOptions = log.DefaultOptions()
 
@@ -43,13 +41,10 @@ var (
 	serveCmd = &cobra.Command{
 		Use:     "serve",
 		Aliases: []string{"serve"},
-		Short:   "Starts the ingress controller",
+		Short:   "Starts the higress ingress controller",
 		Example: "higress serve",
 		PreRunE: func(c *cobra.Command, args []string) error {
-			if err := log.Configure(loggingOptions); err != nil {
+			return log.Configure(loggingOptions)
-				return err
-			}
-			return nil
 		},
 		RunE: func(c *cobra.Command, args []string) error {
 			cmd.PrintFlags(c.Flags())
@@ -59,10 +54,12 @@ var (
 
 			server, err := bootstrap.NewServer(serverArgs)
 			if err != nil {
-				return err
+				return fmt.Errorf("fail to create higress server: %v", err)
 			}
 
-			server.Start(stop)
+			if err := server.Start(stop); err != nil {
+				return fmt.Errorf("fail to start higress server: %v", err)
+			}
 
 			cmd.WaitSignal(stop)
 

pkg/bootstrap/server.go

@@ -20,7 +20,6 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/alibaba/higress/ingress/kube/common"
 	prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
@@ -46,8 +45,9 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 
-	ingressconfig "github.com/alibaba/higress/ingress/config"
+	ingressconfig "github.com/alibaba/higress/pkg/ingress/config"
-	"github.com/alibaba/higress/ingress/mcp"
+	"github.com/alibaba/higress/pkg/ingress/kube/common"
+	"github.com/alibaba/higress/pkg/ingress/mcp"
 )
 
 type XdsOptions struct {

pkg/ingress/config/ingress_config.go

@@ -37,13 +37,13 @@ import (
 	listersv1 "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/alibaba/higress/ingress/kube/annotations"
+	"github.com/alibaba/higress/pkg/ingress/kube/annotations"
-	"github.com/alibaba/higress/ingress/kube/common"
+	"github.com/alibaba/higress/pkg/ingress/kube/common"
-	"github.com/alibaba/higress/ingress/kube/ingress"
+	"github.com/alibaba/higress/pkg/ingress/kube/ingress"
-	"github.com/alibaba/higress/ingress/kube/ingressv1"
+	"github.com/alibaba/higress/pkg/ingress/kube/ingressv1"
-	secretkube "github.com/alibaba/higress/ingress/kube/secret/kube"
+	secretkube "github.com/alibaba/higress/pkg/ingress/kube/secret/kube"
-	"github.com/alibaba/higress/ingress/kube/util"
+	"github.com/alibaba/higress/pkg/ingress/kube/util"
-	. "github.com/alibaba/higress/ingress/log"
+	. "github.com/alibaba/higress/pkg/ingress/log"
 )
 
 var (

pkg/ingress/config/ingress_config_test.go

@@ -28,10 +28,10 @@ import (
 	ingress "k8s.io/api/networking/v1"
 	ingressv1beta1 "k8s.io/api/networking/v1beta1"
 
-	"github.com/alibaba/higress/ingress/kube/annotations"
+	"github.com/alibaba/higress/pkg/ingress/kube/annotations"
-	"github.com/alibaba/higress/ingress/kube/common"
+	"github.com/alibaba/higress/pkg/ingress/kube/common"
-	controllerv1beta1 "github.com/alibaba/higress/ingress/kube/ingress"
+	controllerv1beta1 "github.com/alibaba/higress/pkg/ingress/kube/ingress"
-	controllerv1 "github.com/alibaba/higress/ingress/kube/ingressv1"
+	controllerv1 "github.com/alibaba/higress/pkg/ingress/kube/ingressv1"
 )
 
 func TestNormalizeWeightedCluster(t *testing.T) {

pkg/ingress/kube/annotations/auth.go

@@ -21,8 +21,8 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/alibaba/higress/ingress/kube/util"
+	"github.com/alibaba/higress/pkg/ingress/kube/util"
-	. "github.com/alibaba/higress/ingress/log"
+	. "github.com/alibaba/higress/pkg/ingress/log"
 )
 
 const (

pkg/ingress/kube/annotations/auth_test.go

@@ -29,7 +29,7 @@ import (
 	listerv1 "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/alibaba/higress/ingress/kube/util"
+	"github.com/alibaba/higress/pkg/ingress/kube/util"
 )
 
 func TestAuthParse(t *testing.T) {

pkg/ingress/kube/annotations/default_backend.go

@@ -20,8 +20,8 @@ import (
 	networking "istio.io/api/networking/v1alpha3"
 	"istio.io/istio/pilot/pkg/model"
 
-	"github.com/alibaba/higress/ingress/kube/util"
+	"github.com/alibaba/higress/pkg/ingress/kube/util"
-	. "github.com/alibaba/higress/ingress/log"
+	. "github.com/alibaba/higress/pkg/ingress/log"
 )
 
 const (

pkg/ingress/kube/annotations/downstreamtls.go

@@ -18,12 +18,13 @@ import (
 	"strings"
 
 	networking "istio.io/api/networking/v1alpha3"
-	"github.com/alibaba/higress/ingress/kube/util"
-	. "github.com/alibaba/higress/ingress/log"
 	"istio.io/istio/pilot/pkg/credentials/kube"
 	"istio.io/istio/pilot/pkg/model"
 	gatewaytool "istio.io/istio/pkg/config/gateway"
 	"istio.io/istio/pkg/config/security"
+
+	"github.com/alibaba/higress/pkg/ingress/kube/util"
+	. "github.com/alibaba/higress/pkg/ingress/log"
 )
 
 const (

pkg/ingress/kube/annotations/header_control.go

@@ -19,7 +19,7 @@ import (
 
 	networking "istio.io/api/networking/v1alpha3"
 
-	. "github.com/alibaba/higress/ingress/log"
+	. "github.com/alibaba/higress/pkg/ingress/log"
 )
 
 const (

pkg/ingress/kube/annotations/upstreamtls.go

@@ -22,7 +22,7 @@ import (
 	networking "istio.io/api/networking/v1alpha3"
 	"istio.io/istio/pilot/pkg/model/credentials"
 
-	"github.com/alibaba/higress/ingress/kube/util"
+	"github.com/alibaba/higress/pkg/ingress/kube/util"
 )
 
 const (

pkg/ingress/kube/common/controller.go

@@ -24,7 +24,7 @@ import (
 	listerv1 "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/alibaba/higress/ingress/kube/annotations"
+	"github.com/alibaba/higress/pkg/ingress/kube/annotations"
 )
 
 type ServiceKey struct {

pkg/ingress/kube/common/model.go

@@ -28,7 +28,7 @@ import (
 	"istio.io/istio/pkg/config/schema/collections"
 	"k8s.io/apimachinery/pkg/labels"
 
-	. "github.com/alibaba/higress/ingress/log"
+	. "github.com/alibaba/higress/pkg/ingress/log"
 )
 
 type PathType string

pkg/ingress/kube/common/tool.go

@@ -28,7 +28,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/version"
 
-	. "github.com/alibaba/higress/ingress/log"
+	. "github.com/alibaba/higress/pkg/ingress/log"
 )
 
 // V1Available check if the "networking/v1" Ingress is available.

pkg/ingress/kube/common/tool_test.go

@@ -22,7 +22,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/alibaba/higress/ingress/kube/annotations"
+	"github.com/alibaba/higress/pkg/ingress/kube/annotations"
 )
 
 func TestConstructRouteName(t *testing.T) {

pkg/ingress/kube/ingress/controller.go

@@ -48,11 +48,11 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 
-	"github.com/alibaba/higress/ingress/kube/annotations"
+	"github.com/alibaba/higress/pkg/ingress/kube/annotations"
-	"github.com/alibaba/higress/ingress/kube/common"
+	"github.com/alibaba/higress/pkg/ingress/kube/common"
-	"github.com/alibaba/higress/ingress/kube/secret"
+	"github.com/alibaba/higress/pkg/ingress/kube/secret"
-	"github.com/alibaba/higress/ingress/kube/util"
+	"github.com/alibaba/higress/pkg/ingress/kube/util"
-	. "github.com/alibaba/higress/ingress/log"
+	. "github.com/alibaba/higress/pkg/ingress/log"
 )
 
 var (

pkg/ingress/kube/ingress/controller_test.go

@@ -20,7 +20,7 @@ import (
 	"k8s.io/api/networking/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/alibaba/higress/ingress/kube/common"
+	"github.com/alibaba/higress/pkg/ingress/kube/common"
 )
 
 func TestShouldProcessIngressUpdate(t *testing.T) {

pkg/ingress/kube/ingress/status.go

@@ -16,6 +16,8 @@ package ingress
 
 import (
 	"context"
+	common2 "github.com/alibaba/higress/pkg/ingress/kube/common"
+	. "github.com/alibaba/higress/pkg/ingress/log"
 	"reflect"
 	"sort"
 	"time"
@@ -28,9 +30,6 @@ import (
 	listerv1 "k8s.io/client-go/listers/core/v1"
 	ingresslister "k8s.io/client-go/listers/networking/v1beta1"
 	"k8s.io/client-go/tools/cache"
-
-	"github.com/alibaba/higress/ingress/kube/common"
-	. "github.com/alibaba/higress/ingress/log"
 )
 
 // statusSyncer keeps the status IP in each Ingress resource updated
@@ -62,7 +61,7 @@ func newStatusSyncer(localKubeClient, client kubelib.Client, controller *control
 func (s *statusSyncer) run(stopCh <-chan struct{}) {
 	cache.WaitForCacheSync(stopCh, s.controller.HasSynced)
 
-	ticker := time.NewTicker(common.DefaultStatusUpdateInterval)
+	ticker := time.NewTicker(common2.DefaultStatusUpdateInterval)
 	for {
 		select {
 		case <-stopCh:
@@ -77,14 +76,14 @@ func (s *statusSyncer) run(stopCh <-chan struct{}) {
 }
 
 func (s *statusSyncer) runUpdateStatus() error {
-	svcList, err := s.serviceLister.Services(s.watchedNamespace).List(common.SvcLabelSelector)
+	svcList, err := s.serviceLister.Services(s.watchedNamespace).List(common2.SvcLabelSelector)
 	if err != nil {
 		return err
 	}
 
 	IngressLog.Debugf("found number %d of svc", len(svcList))
 
-	lbStatusList := common.GetLbStatusList(svcList)
+	lbStatusList := common2.GetLbStatusList(svcList)
 	if len(lbStatusList) == 0 {
 		return nil
 	}
@@ -111,7 +110,7 @@ func (s *statusSyncer) updateStatus(status []coreV1.LoadBalancerIngress) error {
 		}
 
 		curIPs := ingress.Status.LoadBalancer.Ingress
-		sort.SliceStable(curIPs, common.SortLbIngressList(curIPs))
+		sort.SliceStable(curIPs, common2.SortLbIngressList(curIPs))
 
 		if reflect.DeepEqual(status, curIPs) {
 			IngressLog.Debugf("skipping update of Ingress %v/%v within cluster %s (no change)",

pkg/ingress/kube/ingressv1/controller.go

@@ -47,11 +47,11 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 
-	"github.com/alibaba/higress/ingress/kube/annotations"
+	"github.com/alibaba/higress/pkg/ingress/kube/annotations"
-	"github.com/alibaba/higress/ingress/kube/common"
+	"github.com/alibaba/higress/pkg/ingress/kube/common"
-	"github.com/alibaba/higress/ingress/kube/secret"
+	"github.com/alibaba/higress/pkg/ingress/kube/secret"
-	"github.com/alibaba/higress/ingress/kube/util"
+	"github.com/alibaba/higress/pkg/ingress/kube/util"
-	. "github.com/alibaba/higress/ingress/log"
+	. "github.com/alibaba/higress/pkg/ingress/log"
 )
 
 var (

pkg/ingress/kube/ingressv1/controller_test.go

@@ -20,7 +20,7 @@ import (
 	v1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/alibaba/higress/ingress/kube/common"
+	"github.com/alibaba/higress/pkg/ingress/kube/common"
 )
 
 func TestShouldProcessIngressUpdate(t *testing.T) {

pkg/ingress/kube/ingressv1/status.go

@@ -29,8 +29,8 @@ import (
 	ingresslister "k8s.io/client-go/listers/networking/v1"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/alibaba/higress/ingress/kube/common"
+	"github.com/alibaba/higress/pkg/ingress/kube/common"
-	. "github.com/alibaba/higress/ingress/log"
+	. "github.com/alibaba/higress/pkg/ingress/log"
 )
 
 // statusSyncer keeps the status IP in each Ingress resource updated

pkg/ingress/kube/secret/kube/controller.go

@@ -33,10 +33,10 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 
-	"github.com/alibaba/higress/ingress/kube/common"
+	"github.com/alibaba/higress/pkg/ingress/kube/common"
-	"github.com/alibaba/higress/ingress/kube/secret"
+	"github.com/alibaba/higress/pkg/ingress/kube/secret"
-	"github.com/alibaba/higress/ingress/kube/util"
+	"github.com/alibaba/higress/pkg/ingress/kube/util"
-	. "github.com/alibaba/higress/ingress/log"
+	. "github.com/alibaba/higress/pkg/ingress/log"
 )
 
 var _ secret.Controller = &controller{}

pkg/ingress/kube/secret/model.go

@@ -18,7 +18,7 @@ import (
 	listerv1 "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/alibaba/higress/ingress/kube/util"
+	"github.com/alibaba/higress/pkg/ingress/kube/util"
 )
 
 type Controller interface {