Skip to content

Commit d6dcead

Browse files
ronethingronething
committed
fix: r
Signed-off-by: ashing <[email protected]>
1 parent 90aff0b commit d6dcead

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+115
-157
lines changed

‎Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,3 +342,7 @@ helm-build-crds:
342342
$(KUSTOMIZE) build github.com/kubernetes-sigs/gateway-api/config/crd\?ref=${GATEAY_API_VERSION} > charts/crds/gwapi-crds.yaml
343343
@echo "build apisix ic crds"
344344
$(KUSTOMIZE) build config/crd > charts/crds/apisixic-crds.yaml
345+
346+
sort-import:
347+
@./scripts/goimports-reviser.sh >/dev/null 2>&1
348+
.PHONY: sort-import

‎cmd/main.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ limitations under the License.
1717
package main
1818

1919
import (
20-
"github.com/spf13/cobra"
21-
2220
"github.com/api7/api7-ingress-controller/cmd/root"
21+
"github.com/spf13/cobra"
2322
)
2423

2524
func main() {

‎cmd/root/root.go‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,17 @@ import (
2020
"fmt"
2121
"os"
2222

23-
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
24-
// to ensure that exec-entrypoint and run can make use of them.
25-
26-
"go.uber.org/zap/zapcore"
27-
"gopkg.in/yaml.v2"
28-
_ "k8s.io/client-go/plugin/pkg/client/auth"
29-
30-
"github.com/go-logr/zapr"
31-
"github.com/spf13/cobra"
32-
"go.uber.org/zap"
33-
ctrl "sigs.k8s.io/controller-runtime"
34-
35-
// +kubebuilder:scaffold:imports
36-
3723
"github.com/api7/api7-ingress-controller/internal/controller/config"
3824
"github.com/api7/api7-ingress-controller/internal/manager"
3925
"github.com/api7/api7-ingress-controller/internal/version"
4026
"github.com/api7/gopkg/pkg/log"
27+
"github.com/go-logr/zapr"
28+
"github.com/spf13/cobra"
29+
"go.uber.org/zap"
30+
"go.uber.org/zap/zapcore"
31+
"gopkg.in/yaml.v2"
32+
_ "k8s.io/client-go/plugin/pkg/client/auth"
33+
ctrl "sigs.k8s.io/controller-runtime"
4134
)
4235

4336
type GatewayConfigsFlag struct {

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ require (
2727
go.etcd.io/etcd/client/v3 v3.5.15
2828
go.uber.org/multierr v1.11.0
2929
go.uber.org/zap v1.27.0
30+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
3031
golang.org/x/net v0.28.0
3132
gopkg.in/yaml.v2 v2.4.0
3233
gorm.io/gorm v1.25.11
@@ -194,7 +195,6 @@ require (
194195
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
195196
golang.org/x/arch v0.6.0 // indirect
196197
golang.org/x/crypto v0.26.0 // indirect
197-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
198198
golang.org/x/mod v0.20.0 // indirect
199199
golang.org/x/oauth2 v0.21.0 // indirect
200200
golang.org/x/sync v0.8.0 // indirect

‎internal/controller/httproute_controller.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ import (
55
"fmt"
66
"strings"
77

8+
"github.com/api7/api7-ingress-controller/api/v1alpha1"
9+
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
10+
"github.com/api7/api7-ingress-controller/internal/provider"
811
"github.com/go-logr/logr"
912
"github.com/pkg/errors"
1013
"golang.org/x/exp/slices"
@@ -24,10 +27,6 @@ import (
2427
"sigs.k8s.io/controller-runtime/pkg/source"
2528
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
2629
"sigs.k8s.io/gateway-api/apis/v1alpha2"
27-
28-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
29-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
30-
"github.com/api7/api7-ingress-controller/internal/provider"
3130
)
3231

3332
// HTTPRouteReconciler reconciles a GatewayClass object.

‎internal/controller/httproutepolicy.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import (
44
"context"
55
"slices"
66

7+
"github.com/api7/api7-ingress-controller/api/v1alpha1"
8+
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
9+
"github.com/api7/api7-ingress-controller/internal/provider"
710
"github.com/go-logr/logr"
811
networkingv1 "k8s.io/api/networking/v1"
912
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -12,10 +15,6 @@ import (
1215
"sigs.k8s.io/controller-runtime/pkg/client"
1316
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
1417
"sigs.k8s.io/gateway-api/apis/v1alpha2"
15-
16-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
17-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
18-
"github.com/api7/api7-ingress-controller/internal/provider"
1918
)
2019

2120
func (r *HTTPRouteReconciler) processHTTPRoutePolicies(tctx *provider.TranslateContext, httpRoute *gatewayv1.HTTPRoute) error {

‎internal/controller/indexer/indexer.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ package indexer
33
import (
44
"context"
55

6+
"github.com/api7/api7-ingress-controller/api/v1alpha1"
67
networkingv1 "k8s.io/api/networking/v1"
78
"k8s.io/apimachinery/pkg/runtime/schema"
89
"k8s.io/apimachinery/pkg/types"
910
ctrl "sigs.k8s.io/controller-runtime"
1011
"sigs.k8s.io/controller-runtime/pkg/client"
1112
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
12-
13-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
1413
)
1514

1615
const (

‎internal/controller/ingress_controller.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ import (
66
"fmt"
77
"reflect"
88

9+
"github.com/api7/api7-ingress-controller/api/v1alpha1"
10+
"github.com/api7/api7-ingress-controller/internal/controller/config"
11+
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
12+
"github.com/api7/api7-ingress-controller/internal/provider"
13+
"github.com/api7/gopkg/pkg/log"
914
"github.com/go-logr/logr"
1015
"go.uber.org/zap"
1116
corev1 "k8s.io/api/core/v1"
@@ -24,12 +29,6 @@ import (
2429
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2530
"sigs.k8s.io/controller-runtime/pkg/source"
2631
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
27-
28-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
29-
"github.com/api7/api7-ingress-controller/internal/controller/config"
30-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
31-
"github.com/api7/api7-ingress-controller/internal/provider"
32-
"github.com/api7/gopkg/pkg/log"
3332
)
3433

3534
// IngressReconciler reconciles a Ingress object.

‎internal/controller/policies.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ package controller
33
import (
44
"fmt"
55

6+
"github.com/api7/api7-ingress-controller/api/v1alpha1"
7+
"github.com/api7/api7-ingress-controller/internal/controller/config"
8+
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
9+
"github.com/api7/api7-ingress-controller/internal/provider"
610
"github.com/go-logr/logr"
711
"k8s.io/apimachinery/pkg/api/meta"
812
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -14,11 +18,6 @@ import (
1418
"sigs.k8s.io/controller-runtime/pkg/predicate"
1519
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
1620
gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
17-
18-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
19-
"github.com/api7/api7-ingress-controller/internal/controller/config"
20-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
21-
"github.com/api7/api7-ingress-controller/internal/provider"
2221
)
2322

2423
type PolicyTargetKey struct {

‎internal/controller/suite_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,15 @@ import (
2222
"runtime"
2323
"testing"
2424

25+
gatewayapisixiov1alpha1 "github.com/api7/api7-ingress-controller/api/v1alpha1"
2526
. "github.com/onsi/ginkgo/v2"
2627
. "github.com/onsi/gomega"
27-
2828
"k8s.io/client-go/kubernetes/scheme"
2929
"k8s.io/client-go/rest"
3030
"sigs.k8s.io/controller-runtime/pkg/client"
3131
"sigs.k8s.io/controller-runtime/pkg/envtest"
3232
logf "sigs.k8s.io/controller-runtime/pkg/log"
3333
"sigs.k8s.io/controller-runtime/pkg/log/zap"
34-
35-
gatewayapisixiov1alpha1 "github.com/api7/api7-ingress-controller/api/v1alpha1"
36-
// +kubebuilder:scaffold:imports
3734
)
3835

3936
// These tests use Ginkgo (BDD-style Go testing framework). Refer to

0 commit comments

Comments
 (0)