fix: transfer resolveGranularity to ApisixUpstream to fix errors

.github/workflows/dependency-review.yml

@@ -22,6 +22,7 @@ on:
     branches:
       - master
       - 1.8.0
+      - release/1.8.2
 
 permissions:
   contents: read

.github/workflows/e2e-test-ci-v2-cron-dev.yml

@@ -26,6 +26,7 @@ on:
     branches:
       - master
       - 1.8.0
+      - release/1.8.2
 
 concurrency:
   group: ${{ github.workflow }}-dev

.github/workflows/e2e-test-ci-v2-cron.yml

@@ -25,6 +25,7 @@ on:
     branches:
       - master
       - 1.8.0
+      - release/1.8.2
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-v2

.github/workflows/e2e-test-ci.yml

@@ -26,6 +26,7 @@ on:
     branches:
       - master
       - 1.8.0
+      - release/1.8.2
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

.github/workflows/goimports-reviser.yml

@@ -26,6 +26,7 @@ on:
     branches:
       - master
       - 1.8.0
+      - release/1.8.2
 jobs:
   changes:
     runs-on: ubuntu-latest

.github/workflows/golangci-lint.yml

@@ -26,6 +26,7 @@ on:
     branches:
       - master
       - 1.8.0
+      - release/1.8.2
 
 jobs:
   changes:

.github/workflows/lint-checker.yml

@@ -26,6 +26,7 @@ on:
     branches:
       - master
       - 1.8.0
+      - release/1.8.2
 jobs:
   changes:
     runs-on: ubuntu-latest

.github/workflows/spell-checker.yml

@@ -25,6 +25,7 @@ on:
     branches:
       - master
       - 1.8.0
+      - release/1.8.2
 jobs:
   misspell:
     name: runner / misspell

.github/workflows/unit-test-ci.yml

@@ -26,6 +26,7 @@ on:
     branches:
       - master
       - 1.8.0
+      - release/1.8.2
 jobs:
   changes:
     runs-on: ubuntu-latest

.github/workflows/verify-codegen.yml

@@ -26,6 +26,7 @@ on:
     branches:
       - master
       - 1.8.0
+      - release/1.8.2
 jobs:
   changes:
     runs-on: ubuntu-latest

.github/workflows/yamllint-checker.yml

@@ -26,6 +26,7 @@ on:
     branches:
       - master
       - 1.8.0
+      - release/1.8.2
 jobs:
   changes:
     runs-on: ubuntu-latest

pkg/kube/apisix/apis/config/v2/types.go

@@ -87,11 +87,6 @@ type ApisixRouteHTTPBackend struct {
 	ServiceName string `json:"serviceName" yaml:"serviceName"`
 	// The service port, could be the name or the port number.
 	ServicePort intstr.IntOrString `json:"servicePort" yaml:"servicePort"`
-	// The resolve granularity, can be "endpoints" or "service",
-	// when set to "endpoints", the pod ips will be used; other
-	// wise, the service ClusterIP or ExternalIP will be used,
-	// default is endpoints.
-	ResolveGranularity string `json:"resolveGranularity,omitempty" yaml:"resolveGranularity,omitempty"`
 	// Weight of this backend.
 	Weight *int `json:"weight" yaml:"weight"`
 	// Subset specifies a subset for the target Service. The subset should be pre-defined
@@ -257,11 +252,6 @@ type ApisixRouteStreamBackend struct {
 	ServiceName string `json:"serviceName" yaml:"serviceName"`
 	// The service port, could be the name or the port number.
 	ServicePort intstr.IntOrString `json:"servicePort" yaml:"servicePort"`
-	// The resolve granularity, can be "endpoints" or "service",
-	// when set to "endpoints", the pod ips will be used; other
-	// wise, the service ClusterIP or ExternalIP will be used,
-	// default is endpoints.
-	ResolveGranularity string `json:"resolveGranularity,omitempty" yaml:"resolveGranularity,omitempty"`
 	// Subset specifies a subset for the target Service. The subset should be pre-defined
 	// in ApisixUpstream about this service.
 	Subset string `json:"subset,omitempty" yaml:"subset,omitempty"`
@@ -515,6 +505,7 @@ type ApisixUpstreamSpec struct {
 // ApisixUpstreamConfig contains rich features on APISIX Upstream, for instance
 // load balancer, health check, etc.
 type ApisixUpstreamConfig struct {
+	Granularity string `json:"granularity,omitempty" yaml:"scheme,omitempty"`
 	// LoadBalancer represents the load balancer configuration for Kubernetes Service.
 	// The default strategy is round robin.
 	// +optional

pkg/providers/apisix/apisix_upstream.go

@@ -16,6 +16,7 @@ package apisix
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"reflect"
 	"strconv"
@@ -191,6 +192,12 @@ func (c *apisixUpstreamController) sync(ctx context.Context, ev *types.Event) er
 		if au.Spec == nil {
 			return nil
 		}
+		svc, err := c.SvcLister.Services(namespace).Get(name)
+		if err != nil {
+			log.Errorf("failed to get service %s: %s", key, err)
+			errRecord = err
+			goto updateStatus
+		}
 
 		// We will prioritize ExternalNodes and Discovery.
 		if len(au.Spec.ExternalNodes) != 0 || au.Spec.Discovery != nil {
@@ -221,7 +228,7 @@ func (c *apisixUpstreamController) sync(ctx context.Context, ev *types.Event) er
 			}
 			// updateUpstream for real
 			upsName := apisixv1.ComposeExternalUpstreamName(au.Namespace, au.Name)
-			errRecord = c.updateUpstream(ctx, upsName, &au.Spec.ApisixUpstreamConfig, ev.Type.IsSyncEvent())
+			errRecord = c.updateUpstream(ctx, upsName, &au.Spec.ApisixUpstreamConfig, ev.Type.IsSyncEvent(), svc.Spec.ClusterIP)
 			if err == apisix.ErrNotFound {
 				errRecord = fmt.Errorf("%s", "upstream doesn't exist. It will be created after ApisixRoute is created referencing it.")
 			}
@@ -235,14 +242,6 @@ func (c *apisixUpstreamController) sync(ctx context.Context, ev *types.Event) er
 				portLevelSettings[port.Port] = port.ApisixUpstreamConfig
 			}
 		}
-
-		svc, err := c.SvcLister.Services(namespace).Get(name)
-		if err != nil {
-			log.Errorf("failed to get service %s: %s", key, err)
-			errRecord = err
-			goto updateStatus
-		}
-
 		var subsets []configv2.ApisixUpstreamSubset
 		subsets = append(subsets, configv2.ApisixUpstreamSubset{})
 		if len(au.Spec.Subsets) > 0 {
@@ -258,16 +257,7 @@ func (c *apisixUpstreamController) sync(ctx context.Context, ev *types.Event) er
 						cfg = au.Spec.ApisixUpstreamConfig
 					}
 				}
-				err := c.updateUpstream(ctx, apisixv1.ComposeUpstreamName(namespace, name, subset.Name, port.Port, types.ResolveGranularity.Endpoint), &cfg, ev.Type.IsSyncEvent())
-				if err != nil {
-					if err == apisix.ErrNotFound {
-						errRecord = fmt.Errorf("%s", "upstream doesn't exist. It will be created after ApisixRoute is created referencing it.")
-					} else {
-						errRecord = err
-					}
-					goto updateStatus
-				}
-				err = c.updateUpstream(ctx, apisixv1.ComposeUpstreamName(namespace, name, subset.Name, port.Port, types.ResolveGranularity.Service), &cfg, ev.Type.IsSyncEvent())
+				err := c.updateUpstream(ctx, apisixv1.ComposeUpstreamName(namespace, name, subset.Name, port.Port), &cfg, ev.Type.IsSyncEvent(), svc.Spec.ClusterIP)
 				if err != nil {
 					if err == apisix.ErrNotFound {
 						errRecord = fmt.Errorf("%s", "upstream doesn't exist. It will be created after ApisixRoute is created referencing it.")
@@ -335,7 +325,7 @@ func (c *apisixUpstreamController) updateStatus(obj kube.ApisixUpstream, statusE
 	}
 }
 
-func (c *apisixUpstreamController) updateUpstream(ctx context.Context, upsName string, cfg *configv2.ApisixUpstreamConfig, shouldCompare bool) error {
+func (c *apisixUpstreamController) updateUpstream(ctx context.Context, upsName string, cfg *configv2.ApisixUpstreamConfig, shouldCompare bool, svcClusterIP string) error {
 	// TODO: multi cluster
 	clusterName := c.Config.APISIX.DefaultClusterName
 
@@ -358,7 +348,24 @@ func (c *apisixUpstreamController) updateUpstream(ctx context.Context, upsName s
 	}
 
 	newUps.Metadata = ups.Metadata
-	newUps.Nodes = ups.Nodes
+
+	if cfg.Granularity == types.ResolveGranularity.Service {
+		if svcClusterIP == "" {
+			log.Errorw("ApisixRoute refers to a headless service but want to use the service level resolve granularity",
+				zap.String("ApisixUpstream name", upsName),
+			)
+			return errors.New("conflict headless service and backend resolve granularity")
+		}
+		for _, node := range ups.Nodes {
+			newUps.Nodes = append(newUps.Nodes, apisixv1.UpstreamNode{
+				Host:   svcClusterIP,
+				Port:   node.Port,
+				Weight: node.Weight,
+			})
+		}
+	} else {
+		newUps.Nodes = ups.Nodes
+	}
 	log.Debugw("updating upstream since ApisixUpstream changed",
 		zap.Any("upstream", newUps),
 		zap.String("ApisixUpstream name", upsName),

pkg/providers/apisix/translation/apisix_plugin.go

@@ -49,7 +49,7 @@ func (t *translator) translateTrafficSplitPlugin(ctx *translation.TranslateConte
 		if err != nil {
 			return nil, err
 		}
-		ups, err := t.translateService(ns, backend.ServiceName, backend.Subset, backend.ResolveGranularity, svcClusterIP, svcPort)
+		ups, err := t.translateService(ns, backend.ServiceName, backend.Subset, svcClusterIP, svcPort)
 		if err != nil {
 			return nil, err
 		}