Adjust field name

Signed-off-by: jukie <[email protected]>

Author: jukie

internal/infrastructure/host/proxy_infra.go

@@ -8,7 +8,8 @@ package host
 import (
 	"context"
 	"errors"
-	"github.com/envoyproxy/gateway/internal/infrastructure/kubernetes/proxy"
+	"fmt"
+	"github.com/envoyproxy/gateway/internal/envoygateway/config"
 	"io"
 	"os"
 	"path/filepath"
@@ -70,10 +71,10 @@ func (i *Infra) CreateOrUpdateProxyInfra(ctx context.Context, infra *ir.Infra) e
 			Certificate: filepath.Join(i.sdsConfigPath, common.SdsCertFilename),
 			TrustedCA:   filepath.Join(i.sdsConfigPath, common.SdsCAFilename),
 		},
-		XdsServerHost:   ptr.To("0.0.0.0"),
-		AdminServerPort: ptr.To(int32(0)),
-		StatsServerPort: ptr.To(int32(0)),
-		ProxyInfraName:  ptr.To(proxy.ExpectedResourceHashedName(proxyInfra.Name)),
+		XdsServerHost:    ptr.To("0.0.0.0"),
+		AdminServerPort:  ptr.To(int32(0)),
+		StatsServerPort:  ptr.To(int32(0)),
+		LocalClusterName: ptr.To(fmt.Sprintf("%s-%s", config.EnvoyPrefix, proxyName)),
 	}
 
 	args, err := common.BuildProxyArgs(proxyInfra, proxyConfig.Spec.Shutdown, bootstrapConfigOptions, proxyName, false)

internal/infrastructure/kubernetes/proxy/resource.go

@@ -109,7 +109,7 @@ func expectedProxyContainers(infra *ir.ProxyInfra,
 		},
 		MaxHeapSizeBytes: maxHeapSizeBytes,
 		XdsServerHost:    ptr.To(fmt.Sprintf("%s.%s.svc.%s", config.EnvoyGatewayServiceName, controllerNamespace, dnsDomain)),
-		ProxyInfraName:   ptr.To(ExpectedResourceHashedName(infra.Name)),
+		LocalClusterName: ptr.To(fmt.Sprintf("%s-%s", config.EnvoyPrefix, utils.GetHashedName(infra.Name, 64))),
 	}
 
 	args, err := common.BuildProxyArgs(infra, shutdownConfig, bootstrapConfigOptions, fmt.Sprintf("$(%s)", envoyPodEnvVar), gatewayNamespaceMode)

internal/xds/bootstrap/bootstrap.go

@@ -97,8 +97,8 @@ type bootstrapParameters struct {
 	IPFamily string
 	// GatewayNamespaceMode defines whether to use the Envoy Gateway namespace mode.
 	GatewayNamespaceMode bool
-	// ProxyInfraName is the name of the ProxyInfra and used as the internal local_cluster name.
-	ProxyInfraName string
+	// LocalClusterName is the generated name of the Envoy ProxyInfra.
+	LocalClusterName string
 }
 
 type serverParameters struct {
@@ -139,7 +139,7 @@ type RenderBootstrapConfigOptions struct {
 	IPFamily             *egv1a1.IPFamily
 	ProxyMetrics         *egv1a1.ProxyMetrics
 	SdsConfig            SdsConfigPath
-	ProxyInfraName       *string
+	LocalClusterName     *string
 	XdsServerHost        *string
 	XdsServerPort        *int32
 	AdminServerPort      *int32
@@ -259,7 +259,7 @@ func GetRenderedBootstrapConfig(opts *RenderBootstrapConfigOptions) (string, err
 			EnablePrometheusCompression:  enablePrometheusCompression,
 			PrometheusCompressionLibrary: prometheusCompressionLibrary,
 			OtelMetricSinks:              metricSinks,
-			ProxyInfraName:               defaultLocalClusterName,
+			LocalClusterName:             defaultLocalClusterName,
 		},
 	}
 
@@ -304,8 +304,8 @@ func GetRenderedBootstrapConfig(opts *RenderBootstrapConfigOptions) (string, err
 		}
 		cfg.parameters.GatewayNamespaceMode = opts.GatewayNamespaceMode
 		cfg.parameters.OverloadManager.MaxHeapSizeBytes = opts.MaxHeapSizeBytes
-		if opts.ProxyInfraName != nil {
-			cfg.parameters.ProxyInfraName = *opts.ProxyInfraName
+		if opts.LocalClusterName != nil {
+			cfg.parameters.LocalClusterName = *opts.LocalClusterName
 		}
 	}
 

internal/xds/bootstrap/bootstrap.yaml.tpl

@@ -9,7 +9,7 @@ admin:
       address: {{ .AdminServer.Address }}
       port_value: {{ .AdminServer.Port }}
 cluster_manager:
-  local_cluster_name: {{ .ProxyInfraName }}
+  local_cluster_name: {{ .LocalClusterName }}
 node:
   locality:
     zone: $(ENVOY_SERVICE_ZONE)
@@ -174,7 +174,7 @@ static_resources:
   - connect_timeout: 10s
     lb_policy: ROUND_ROBIN
     load_assignment:
-      cluster_name: {{ .ProxyInfraName }}
+      cluster_name: {{ .LocalClusterName }}
       endpoints:
       - lb_endpoints:
         - endpoint:
@@ -187,7 +187,7 @@ static_resources:
         load_balancing_weight: 1
         locality:
           zone: $(ENVOY_SERVICE_ZONE)
-    name: {{ .ProxyInfraName }}
+    name: {{ .LocalClusterName }}
     type: STATIC
   - connect_timeout: 10s
     load_assignment: