Merge branch 'release-v2-dev' into fix/match-port

Author: AlinsRan

.github/workflows/conformance-test.yml

@@ -32,6 +32,12 @@ jobs:
         run: |
           go install sigs.k8s.io/[email protected]
 
+      - name: Install Helm
+        run: |
+          curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
+          chmod 700 get_helm.sh
+          ./get_helm.sh
+
   conformance-test:
     needs: 
       - prepare
@@ -81,6 +87,10 @@ jobs:
         run: |
           make kind-load-images
 
+      - name: Install API7EE3
+        run: |
+          make download-api7ee3-chart
+
       - name: Run Conformance Test
         shell: bash
         env:

.github/workflows/e2e-test.yml

@@ -32,6 +32,12 @@ jobs:
         run: |
           go install sigs.k8s.io/[email protected]
 
+      - name: Install Helm
+        run: |
+          curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
+          chmod 700 get_helm.sh
+          ./get_helm.sh
+
   e2e-test:
     needs: 
       - prepare
@@ -72,6 +78,10 @@ jobs:
         run: |
           make install
 
+      - name: Download API7EE3 Chart
+        run: |
+          make download-api7ee3-chart
+
       - name: Loading Docker Image to Kind Cluster
         run: |
           make kind-load-images

.gitignore

@@ -34,3 +34,5 @@ api7-ingress-controller-conformance-report.yaml
 *.mdx
 .cursor/
 .env
+
+charts/api7ee3

.golangci.yml

@@ -1,33 +1,14 @@
+version: "2"
 run:
-  timeout: 5m
   allow-parallel-runners: true
-
-issues:
-  # don't skip warning about doc comments
-  # don't exclude the default set of lint
-  exclude-use-default: false
-  # restore some of the defaults
-  # (fill in the rest as needed)
-  exclude-rules:
-    - path: "api/*"
-      linters:
-        - lll
-    - path: "internal/*"
-      linters:
-        - dupl
-        - lll
 linters:
-  disable-all: true
+  default: none
   enable:
     - dupl
     - errcheck
-    - exportloopref
     - ginkgolinter
     - goconst
     - gocyclo
-    - gofmt
-    - goimports
-    - gosimple
     - govet
     - ineffassign
     - lll
@@ -36,12 +17,38 @@ linters:
     - prealloc
     - revive
     - staticcheck
-    - typecheck
     - unconvert
     - unparam
     - unused
-
-linters-settings:
-  revive:
+  settings:
+    revive:
+      rules:
+        - name: comment-spacings
+  exclusions:
+    generated: lax
     rules:
-      - name: comment-spacings
+      - linters:
+          - lll
+        path: api/*
+      - linters:
+          - dupl
+          - lll
+        path: internal/*
+      - linters:
+          - staticcheck
+        text: "ST1001:"
+        path: test/.*
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -106,6 +106,13 @@ e2e-test:
 	@kind get kubeconfig --name $(KIND_NAME) > $$KUBECONFIG
 	DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test ./test/e2e/ -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)"
 
+.PHONY: download-api7ee3-chart
+download-api7ee3-chart:
+	@helm repo add api7 https://charts.api7.ai || true
+	@helm repo update
+	@helm pull api7/api7ee3 --destination "$(shell helm env HELM_REPOSITORY_CACHE)"
+	@echo "Downloaded API7EE3 chart"
+
 .PHONY: conformance-test
 conformance-test:
 	DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test -v ./test/conformance -tags=conformance
@@ -278,7 +285,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
 KUSTOMIZE_VERSION ?= v5.4.2
 CONTROLLER_TOOLS_VERSION ?= v0.15.0
 ENVTEST_VERSION ?= release-0.18
-GOLANGCI_LINT_VERSION ?= v1.59.1
+GOLANGCI_LINT_VERSION ?= v2.1.5
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
@@ -298,7 +305,7 @@ $(ENVTEST): $(LOCALBIN)
 .PHONY: golangci-lint
 golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
 $(GOLANGCI_LINT): $(LOCALBIN)
-	$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s $(GOLANGCI_LINT_VERSION)
 
 gofmt: ## Apply go fmt
 	@gofmt -w -r 'interface{} -> any' .

api/dashboard/v1/types.go

@@ -730,9 +730,9 @@ func ComposeConsumerName(namespace, name string) string {
 	buf := bytes.NewBuffer(p)
 
 	// TODO If APISIX modifies the consumer name schema, we can drop this.
-	buf.WriteString(strings.Replace(namespace, "-", "_", -1))
+	buf.WriteString(strings.ReplaceAll(namespace, "-", "_"))
 	buf.WriteString("_")
-	buf.WriteString(strings.Replace(name, "-", "_", -1))
+	buf.WriteString(strings.ReplaceAll(name, "-", "_"))
 
 	return buf.String()
 }

internal/controller/consumer_controller.go

@@ -307,7 +307,7 @@ func (r *ConsumerReconciler) checkGatewayRef(object client.Object) bool {
 		return false
 	}
 	gatewayClass := &gatewayv1.GatewayClass{}
-	if err := r.Client.Get(context.Background(), client.ObjectKey{Name: string(gateway.Spec.GatewayClassName)}, gatewayClass); err != nil {
+	if err := r.Get(context.Background(), client.ObjectKey{Name: string(gateway.Spec.GatewayClassName)}, gatewayClass); err != nil {
 		r.Log.Error(err, "failed to get gateway class", "gateway", gateway.GetName(), "gatewayclass", gateway.Spec.GatewayClassName)
 		return false
 	}

internal/controller/gateway_controller.go

@@ -208,7 +208,7 @@ func (r *GatewayReconciler) listGatewayForGatewayClass(ctx context.Context, gate
 func (r *GatewayReconciler) checkGatewayClass(obj client.Object) bool {
 	gateway := obj.(*gatewayv1.Gateway)
 	gatewayClass := &gatewayv1.GatewayClass{}
-	if err := r.Client.Get(context.Background(), client.ObjectKey{Name: string(gateway.Spec.GatewayClassName)}, gatewayClass); err != nil {
+	if err := r.Get(context.Background(), client.ObjectKey{Name: string(gateway.Spec.GatewayClassName)}, gatewayClass); err != nil {
 		r.Log.Error(err, "failed to get gateway class", "gateway", gateway.GetName(), "gatewayclass", gateway.Spec.GatewayClassName)
 		return false
 	}

internal/controller/httproute_controller.go

@@ -7,11 +7,13 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
+	"golang.org/x/exp/slices"
 	corev1 "k8s.io/api/core/v1"
 	discoveryv1 "k8s.io/api/discovery/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -98,6 +100,9 @@ func (r *HTTPRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	hr := new(gatewayv1.HTTPRoute)
 	if err := r.Get(ctx, req.NamespacedName, hr); err != nil {
 		if client.IgnoreNotFound(err) == nil {
+			if err := r.updateHTTPRoutePolicyStatusOnDeleting(req.NamespacedName); err != nil {
+				return ctrl.Result{}, err
+			}
 			hr.Namespace = req.Namespace
 			hr.Name = req.Name
 
@@ -514,21 +519,14 @@ func httpRoutePolicyPredicateFuncs(channel chan event.GenericEvent) predicate.Pr
 			if !ok0 || !ok1 {
 				return false
 			}
-			var discardsRefs = make(map[string]v1alpha2.LocalPolicyTargetReferenceWithSectionName)
-			for _, ref := range oldPolicy.Spec.TargetRefs {
-				key := indexer.GenHTTPRoutePolicyIndexKey(string(ref.Group), string(ref.Kind), e.ObjectOld.GetNamespace(), string(ref.Name), "")
-				discardsRefs[key] = ref
-			}
-			for _, ref := range newPolicy.Spec.TargetRefs {
-				key := indexer.GenHTTPRoutePolicyIndexKey(string(ref.Group), string(ref.Kind), e.ObjectOld.GetNamespace(), string(ref.Name), "")
-				delete(discardsRefs, key)
-			}
+			discardsRefs := slices.DeleteFunc(oldPolicy.Spec.TargetRefs, func(oldRef v1alpha2.LocalPolicyTargetReferenceWithSectionName) bool {
+				return slices.ContainsFunc(newPolicy.Spec.TargetRefs, func(newRef v1alpha2.LocalPolicyTargetReferenceWithSectionName) bool {
+					return oldRef.LocalPolicyTargetReference == newRef.LocalPolicyTargetReference && ptr.Equal(oldRef.SectionName, newRef.SectionName)
+				})
+			})
 			if len(discardsRefs) > 0 {
 				dump := oldPolicy.DeepCopy()
-				dump.Spec.TargetRefs = make([]v1alpha2.LocalPolicyTargetReferenceWithSectionName, 0, len(discardsRefs))
-				for _, ref := range discardsRefs {
-					dump.Spec.TargetRefs = append(dump.Spec.TargetRefs, ref)
-				}
+				dump.Spec.TargetRefs = discardsRefs
 				channel <- event.GenericEvent{Object: dump}
 			}
 			return true