fixup

Signed-off-by: David L. Chandler <[email protected]>

Author: chandler-solo

pkg/deployer/deployer_test.go

@@ -563,7 +563,7 @@ var _ = Describe("Deployer", func() {
 				wellknown.DefaultAgwClassName,
 				scheme,
 				fakeClient,
-				gwParams.AgentgatewayHelmValuesGenerator(),
+				gwParams.AgentgatewayParametersHelmValuesGenerator(),
 			)
 			Expect(err).NotTo(HaveOccurred())
 			fakeClient.RunAndWait(context.Background().Done())

pkg/deployer/helm_values_generator.go

@@ -27,5 +27,3 @@ type ObjectPostProcessor interface {
 	// This is called after helm rendering but before deployment.
 	PostProcessObjects(ctx context.Context, obj client.Object, rendered []client.Object) error
 }
-
-

pkg/kgateway/controller/controller.go

@@ -134,7 +134,7 @@ func watchGw(
 		cfg.AgentgatewayClassName,
 		cfg.Mgr.GetScheme(),
 		cfg.Client,
-		gwParams.AgentgatewayHelmValuesGenerator(),
+		gwParams.AgentgatewayParametersHelmValuesGenerator(),
 	)
 	if err != nil {
 		return err

pkg/kgateway/deployer/agentgateway_parameters.go

@@ -152,7 +152,7 @@ type AgentgatewayParametersHelmValuesGenerator struct {
 	inputs         *deployer.Inputs
 }
 
-func newAgentgatewayParametersHelmValuesGenerator(cli apiclient.Client, inputs *deployer.Inputs) *AgentgatewayHelmValuesGenerator {
+func NewAgentgatewayParametersHelmValuesGenerator(cli apiclient.Client, inputs *deployer.Inputs) *AgentgatewayParametersHelmValuesGenerator {
 	return &AgentgatewayParametersHelmValuesGenerator{
 		agwParamClient: kclient.NewFilteredDelayed[*agentgateway.AgentgatewayParameters](cli, wellknown.AgentgatewayParametersGVR, kclient.Filter{ObjectFilter: cli.ObjectFilter()}),
 		gwClassClient:  kclient.NewFilteredDelayed[*gwv1.GatewayClass](cli, wellknown.GatewayClassGVR, kclient.Filter{ObjectFilter: cli.ObjectFilter()}),
@@ -161,7 +161,7 @@ func newAgentgatewayParametersHelmValuesGenerator(cli apiclient.Client, inputs *
 }
 
 // GetValues returns helm values derived from AgentgatewayParameters.
-func (g *AgentgatewayHelmValuesGenerator) GetValues(ctx context.Context, obj client.Object) (map[string]any, error) {
+func (g *AgentgatewayParametersHelmValuesGenerator) GetValues(ctx context.Context, obj client.Object) (map[string]any, error) {
 	gw, ok := obj.(*gwv1.Gateway)
 	if !ok {
 		return nil, fmt.Errorf("expected a Gateway resource, got %s", obj.GetObjectKind().GroupVersionKind().String())
@@ -211,7 +211,7 @@ type resolvedParameters struct {
 // resolveParameters resolves the AgentgatewayParameters for the Gateway.
 // It returns both GatewayClass-level and Gateway-level
 // separately to support ordered overlay merging (GatewayClass first, then Gateway).
-func (g *AgentgatewayHelmValuesGenerator) resolveParameters(gw *gwv1.Gateway) (*resolvedParameters, error) {
+func (g *AgentgatewayParametersHelmValuesGenerator) resolveParameters(gw *gwv1.Gateway) (*resolvedParameters, error) {
 	result := &resolvedParameters{}
 
 	// Get GatewayClass parameters first
@@ -258,15 +258,15 @@ func (g *AgentgatewayHelmValuesGenerator) resolveParameters(gw *gwv1.Gateway) (*
 	return result, nil
 }
 
-func (g *AgentgatewayHelmValuesGenerator) GetCacheSyncHandlers() []cache.InformerSynced {
+func (g *AgentgatewayParametersHelmValuesGenerator) GetCacheSyncHandlers() []cache.InformerSynced {
 	return []cache.InformerSynced{g.agwParamClient.HasSynced, g.gwClassClient.HasSynced}
 }
 
 // PostProcessObjects implements deployer.ObjectPostProcessor.
 // It applies AgentgatewayParameters overlays to the rendered objects.
 // When both GatewayClass and Gateway have AgentgatewayParameters, the overlays
 // are applied in order: GatewayClass first, then Gateway on top.
-func (g *AgentgatewayHelmValuesGenerator) PostProcessObjects(ctx context.Context, obj client.Object, rendered []client.Object) error {
+func (g *AgentgatewayParametersHelmValuesGenerator) PostProcessObjects(ctx context.Context, obj client.Object, rendered []client.Object) error {
 	gw, ok := obj.(*gwv1.Gateway)
 	if !ok {
 		return nil
@@ -298,11 +298,11 @@ func (g *AgentgatewayHelmValuesGenerator) PostProcessObjects(ctx context.Context
 // GetResolvedParametersForGateway returns both the GatewayClass-level and Gateway-level
 // AgentgatewayParameters for the given Gateway. This allows callers to apply overlays
 // in order (GatewayClass first, then Gateway).
-func (g *AgentgatewayHelmValuesGenerator) GetResolvedParametersForGateway(gw *gwv1.Gateway) (*resolvedParameters, error) {
+func (g *AgentgatewayParametersHelmValuesGenerator) GetResolvedParametersForGateway(gw *gwv1.Gateway) (*resolvedParameters, error) {
 	return g.resolveParameters(gw)
 }
 
-func (g *AgentgatewayHelmValuesGenerator) getDefaultAgentgatewayHelmValues(gw *gwv1.Gateway) (*deployer.AgentgatewayHelmConfig, error) {
+func (g *AgentgatewayParametersHelmValuesGenerator) getDefaultAgentgatewayHelmValues(gw *gwv1.Gateway) (*deployer.AgentgatewayHelmConfig, error) {
 	irGW := deployer.GetGatewayIR(gw, g.inputs.CommonCollections)
 	ports := deployer.GetPortsValues(irGW, nil, true) // true = agentgateway
 	if len(ports) == 0 {

pkg/kgateway/deployer/gateway_parameters.go

@@ -36,7 +36,7 @@ func NewGatewayParameters(cli apiclient.Client, inputs *deployer.Inputs) *Gatewa
 		inputs: inputs,
 		// build this once versus on every getHelmValuesGenerator call
 		kgwParameters:          NewEnvoyGatewayParameters(cli, inputs),
-		agwHelmValuesGenerator: NewAgentgatewayHelmValuesGenerator(cli, inputs),
+		agwHelmValuesGenerator: NewAgentgatewayParametersHelmValuesGenerator(cli, inputs),
 	}
 
 	return gp
@@ -46,7 +46,7 @@ type GatewayParameters struct {
 	inputs                      *deployer.Inputs
 	helmValuesGeneratorOverride deployer.HelmValuesGenerator
 	kgwParameters               *EnvoyGatewayParameters
-	agwHelmValuesGenerator      *AgentgatewayHelmValuesGenerator
+	agwHelmValuesGenerator      *AgentgatewayParametersHelmValuesGenerator
 }
 
 // EnvoyGatewayParameters generates helm values for Envoy-based gateways.
@@ -95,9 +95,9 @@ func (gp *GatewayParameters) EnvoyHelmValuesGenerator() deployer.HelmValuesGener
 	return gp.kgwParameters
 }
 
-// AgentgatewayHelmValuesGenerator returns the helm values generator for agentgateway-based gateways.
+// AgentgatewayParametersHelmValuesGenerator returns the helm values generator for agentgateway-based gateways.
 // If a helm values generator override is set, it returns that instead.
-func (gp *GatewayParameters) AgentgatewayHelmValuesGenerator() deployer.HelmValuesGenerator {
+func (gp *GatewayParameters) AgentgatewayParametersHelmValuesGenerator() deployer.HelmValuesGenerator {
 	if gp.helmValuesGeneratorOverride != nil {
 		return gp.helmValuesGeneratorOverride
 	}
@@ -371,7 +371,6 @@ func (k *EnvoyGatewayParameters) getGatewayParametersForGatewayClass(gwc *gwv1.G
 
 func (k *EnvoyGatewayParameters) getValues(gw *gwv1.Gateway, gwParam *kgateway.GatewayParameters) (*deployer.HelmConfig, error) {
 	irGW := deployer.GetGatewayIR(gw, k.inputs.CommonCollections)
-	// kgatewayParameters is only used for envoy gateways (agentgateway uses agentgatewayParametersHelmValuesGenerator)
 	ports := deployer.GetPortsValues(irGW, gwParam, false)
 	if len(ports) == 0 {
 		return nil, ErrNoValidPorts
@@ -466,8 +465,6 @@ func (k *EnvoyGatewayParameters) getValues(gw *gwv1.Gateway, gwParam *kgateway.G
 	gateway.ExtraVolumes = podConfig.GetExtraVolumes()
 	gateway.PriorityClassName = podConfig.GetPriorityClassName()
 
-	// kgatewayParameters is only used for envoy gateways (agentgateway uses agentgatewayParametersHelmValuesGenerator)
-	gateway.DataPlaneType = deployer.DataPlaneEnvoy
 	logLevel := envoyContainerConfig.GetBootstrap().GetLogLevel()
 	gateway.LogLevel = logLevel
 	compLogLevels := envoyContainerConfig.GetBootstrap().GetComponentLogLevels()

pkg/kgateway/deployer/tls.go

@@ -9,7 +9,8 @@ import (
 
 // injectXdsCACertificate reads the CA certificate from the control plane's mounted TLS Secret
 // and injects it into the Helm values so it can be used by the proxy templates.
-func injectXdsCACertificate(caCertPath string, vals *deployer.HelmConfig) error {
+// It accepts variadic HelmXds pointers to support both Envoy (single Xds) and agentgateway (Xds + AgwXds).
+func injectXdsCACertificate(caCertPath string, xdsConfigs ...*deployer.HelmXds) error {
 	if _, err := os.Stat(caCertPath); os.IsNotExist(err) {
 		return fmt.Errorf("xDS TLS is enabled but CA certificate file not found at %s. "+
 			"Ensure the xDS TLS secret is properly mounted and contains ca.crt", caCertPath,
@@ -25,11 +26,10 @@ func injectXdsCACertificate(caCertPath string, vals *deployer.HelmConfig) error
 	}
 
 	caCertStr := string(caCert)
-	if vals.Gateway.Xds != nil && vals.Gateway.Xds.Tls != nil {
-		vals.Gateway.Xds.Tls.CaCert = &caCertStr
-	}
-	if vals.Gateway.AgwXds != nil && vals.Gateway.AgwXds.Tls != nil {
-		vals.Gateway.AgwXds.Tls.CaCert = &caCertStr
+	for _, xds := range xdsConfigs {
+		if xds != nil && xds.Tls != nil {
+			xds.Tls.CaCert = &caCertStr
+		}
 	}
 
 	return nil

test/deployer/deployer_helm.go

@@ -182,7 +182,7 @@ func (dt DeployerTester) RunHelmChartTest(
 			dt.AgwClassName,
 			scheme,
 			fakeClient,
-			gwParams.AgentgatewayHelmValuesGenerator(),
+			gwParams.AgentgatewayParametersHelmValuesGenerator(),
 		)
 	} else {
 		deployer, err = internaldeployer.NewEnvoyGatewayDeployer(