Skip to content

Commit 4179098

Browse files
ronethingronething
committed
fix: r
Signed-off-by: ashing <[email protected]>
1 parent 3885e95 commit 4179098

Some content is hidden

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

61 files changed

+189
-129
lines changed

‎cmd/main.go‎

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

1919
import (
20-
"github.com/api7/api7-ingress-controller/cmd/root"
2120
"github.com/spf13/cobra"
21+
22+
"github.com/api7/api7-ingress-controller/cmd/root"
2223
)
2324

2425
func main() {

‎cmd/root/root.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ import (
2020
"fmt"
2121
"os"
2222

23-
"github.com/api7/api7-ingress-controller/internal/controller/config"
24-
"github.com/api7/api7-ingress-controller/internal/manager"
25-
"github.com/api7/api7-ingress-controller/internal/version"
2623
"github.com/api7/gopkg/pkg/log"
2724
"github.com/go-logr/zapr"
2825
"github.com/spf13/cobra"
@@ -31,6 +28,10 @@ import (
3128
"gopkg.in/yaml.v2"
3229
_ "k8s.io/client-go/plugin/pkg/client/auth"
3330
ctrl "sigs.k8s.io/controller-runtime"
31+
32+
"github.com/api7/api7-ingress-controller/internal/controller/config"
33+
"github.com/api7/api7-ingress-controller/internal/manager"
34+
"github.com/api7/api7-ingress-controller/internal/version"
3435
)
3536

3637
type GatewayConfigsFlag struct {

‎internal/controller/config/config.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import (
99
"text/template"
1010
"time"
1111

12-
"github.com/api7/api7-ingress-controller/internal/types"
1312
"gopkg.in/yaml.v2"
13+
14+
"github.com/api7/api7-ingress-controller/internal/types"
1415
)
1516

1617
var (

‎internal/controller/consumer_controller.go‎

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

6-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
7-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
8-
"github.com/api7/api7-ingress-controller/internal/provider"
96
"github.com/go-logr/logr"
107
corev1 "k8s.io/api/core/v1"
118
"k8s.io/apimachinery/pkg/api/meta"
@@ -20,6 +17,10 @@ import (
2017
"sigs.k8s.io/controller-runtime/pkg/predicate"
2118
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2219
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
20+
21+
"github.com/api7/api7-ingress-controller/api/v1alpha1"
22+
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
23+
"github.com/api7/api7-ingress-controller/internal/provider"
2324
)
2425

2526
// ConsumerReconciler reconciles a Gateway object.

‎internal/controller/gateway_controller.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ import (
55
"fmt"
66
"reflect"
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"
118
"github.com/api7/gopkg/pkg/log"
129
"github.com/go-logr/logr"
1310
corev1 "k8s.io/api/core/v1"
@@ -21,6 +18,10 @@ import (
2118
"sigs.k8s.io/controller-runtime/pkg/predicate"
2219
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2320
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
21+
22+
"github.com/api7/api7-ingress-controller/api/v1alpha1"
23+
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
24+
"github.com/api7/api7-ingress-controller/internal/provider"
2425
)
2526

2627
// GatewayReconciler reconciles a Gateway object.

‎internal/controller/gatewayclass_congroller.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/api7/api7-ingress-controller/internal/controller/config"
87
"github.com/go-logr/logr"
98
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
109
"k8s.io/apimachinery/pkg/runtime"
1110
ctrl "sigs.k8s.io/controller-runtime"
1211
"sigs.k8s.io/controller-runtime/pkg/client"
1312
"sigs.k8s.io/controller-runtime/pkg/predicate"
1413
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
14+
15+
"github.com/api7/api7-ingress-controller/internal/controller/config"
1516
)
1617

1718
// +kubebuilder:rbac:groups=gateway.networking.k8s.io,resources=gatewayclasses,verbs=get;list;watch;update

‎internal/controller/httproute_controller.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ 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"
118
"github.com/go-logr/logr"
129
"github.com/pkg/errors"
1310
"golang.org/x/exp/slices"
@@ -27,6 +24,10 @@ import (
2724
"sigs.k8s.io/controller-runtime/pkg/source"
2825
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
2926
"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"
3031
)
3132

3233
// HTTPRouteReconciler reconciles a GatewayClass object.

‎internal/controller/httproutepolicy.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ 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"
107
"github.com/go-logr/logr"
118
networkingv1 "k8s.io/api/networking/v1"
129
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -15,6 +12,10 @@ import (
1512
"sigs.k8s.io/controller-runtime/pkg/client"
1613
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
1714
"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"
1819
)
1920

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

‎internal/controller/indexer/indexer.go‎

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

6-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
76
networkingv1 "k8s.io/api/networking/v1"
87
"k8s.io/apimachinery/pkg/runtime/schema"
98
"k8s.io/apimachinery/pkg/types"
109
ctrl "sigs.k8s.io/controller-runtime"
1110
"sigs.k8s.io/controller-runtime/pkg/client"
1211
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
12+
13+
"github.com/api7/api7-ingress-controller/api/v1alpha1"
1314
)
1415

1516
const (

‎internal/controller/ingress_controller.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ 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"
139
"github.com/api7/gopkg/pkg/log"
1410
"github.com/go-logr/logr"
1511
"go.uber.org/zap"
@@ -29,6 +25,11 @@ import (
2925
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3026
"sigs.k8s.io/controller-runtime/pkg/source"
3127
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
28+
29+
"github.com/api7/api7-ingress-controller/api/v1alpha1"
30+
"github.com/api7/api7-ingress-controller/internal/controller/config"
31+
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
32+
"github.com/api7/api7-ingress-controller/internal/provider"
3233
)
3334

3435
// IngressReconciler reconciles a Ingress object.

0 commit comments

Comments
 (0)