Skip to content

Commit 73c4d9e

Browse files
ronethingronething
committed
Merge remote-tracking branch 'origin/release-v2-dev' into feat/ingressclass_controller
2 parents 9ba812c + f346ae3 commit 73c4d9e

Some content is hidden

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

41 files changed

+402
-217
lines changed

‎Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ conformance-test:
118118
DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test -v ./test/conformance -tags=conformance
119119

120120
.PHONY: lint
121-
lint: golangci-lint ## Run golangci-lint linter
121+
lint: sort-import golangci-lint ## Run golangci-lint linter
122122
$(GOLANGCI_LINT) run
123123

124124
.PHONY: lint-fix
@@ -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

‎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/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: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ import (
77

88
"github.com/go-logr/logr"
99
"github.com/pkg/errors"
10+
"golang.org/x/exp/slices"
1011
corev1 "k8s.io/api/core/v1"
1112
discoveryv1 "k8s.io/api/discovery/v1"
1213
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1314
"k8s.io/apimachinery/pkg/runtime"
1415
"k8s.io/apimachinery/pkg/types"
16+
"k8s.io/utils/ptr"
1517
ctrl "sigs.k8s.io/controller-runtime"
1618
"sigs.k8s.io/controller-runtime/pkg/builder"
1719
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -98,6 +100,9 @@ func (r *HTTPRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
98100
hr := new(gatewayv1.HTTPRoute)
99101
if err := r.Get(ctx, req.NamespacedName, hr); err != nil {
100102
if client.IgnoreNotFound(err) == nil {
103+
if err := r.updateHTTPRoutePolicyStatusOnDeleting(req.NamespacedName); err != nil {
104+
return ctrl.Result{}, err
105+
}
101106
hr.Namespace = req.Namespace
102107
hr.Name = req.Name
103108

@@ -514,21 +519,14 @@ func httpRoutePolicyPredicateFuncs(channel chan event.GenericEvent) predicate.Pr
514519
if !ok0 || !ok1 {
515520
return false
516521
}
517-
var discardsRefs = make(map[string]v1alpha2.LocalPolicyTargetReferenceWithSectionName)
518-
for _, ref := range oldPolicy.Spec.TargetRefs {
519-
key := indexer.GenHTTPRoutePolicyIndexKey(string(ref.Group), string(ref.Kind), e.ObjectOld.GetNamespace(), string(ref.Name), "")
520-
discardsRefs[key] = ref
521-
}
522-
for _, ref := range newPolicy.Spec.TargetRefs {
523-
key := indexer.GenHTTPRoutePolicyIndexKey(string(ref.Group), string(ref.Kind), e.ObjectOld.GetNamespace(), string(ref.Name), "")
524-
delete(discardsRefs, key)
525-
}
522+
discardsRefs := slices.DeleteFunc(oldPolicy.Spec.TargetRefs, func(oldRef v1alpha2.LocalPolicyTargetReferenceWithSectionName) bool {
523+
return slices.ContainsFunc(newPolicy.Spec.TargetRefs, func(newRef v1alpha2.LocalPolicyTargetReferenceWithSectionName) bool {
524+
return oldRef.LocalPolicyTargetReference == newRef.LocalPolicyTargetReference && ptr.Equal(oldRef.SectionName, newRef.SectionName)
525+
})
526+
})
526527
if len(discardsRefs) > 0 {
527528
dump := oldPolicy.DeepCopy()
528-
dump.Spec.TargetRefs = make([]v1alpha2.LocalPolicyTargetReferenceWithSectionName, 0, len(discardsRefs))
529-
for _, ref := range discardsRefs {
530-
dump.Spec.TargetRefs = append(dump.Spec.TargetRefs, ref)
531-
}
529+
dump.Spec.TargetRefs = discardsRefs
532530
channel <- event.GenericEvent{Object: dump}
533531
}
534532
return true

0 commit comments

Comments
 (0)