Skip to content

Commit ac8078d

Browse files
committed
AgentgatewayParameters is now the only way
... to configure a Gateway that uses controller `kgateway.dev/agentgateway` Breaking change: agentgateway cannot be configured with GatewayParameters. If you want to use parameters, they must be AgentgatewayParameters. Signed-off-by: David L. Chandler <[email protected]>
1 parent af11f9b commit ac8078d

36 files changed

+250
-2189
lines changed

api/settings/settings.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,6 @@ type Settings struct {
238238
// EnableExperimentalGatewayAPIFeatures enables kgateway to support experimental features and APIs
239239
EnableExperimentalGatewayAPIFeatures bool `split_words:"true" default:"true"`
240240

241-
// GwpAgwpCompatibility controls whether agentgateway data plane Gateways can use
242-
// GatewayParameters. When set to false, only AgentgatewayParameters are allowed,
243-
// and using GatewayParameters will result in an error. Defaults to true for
244-
// backward compatibility.
245-
GwpAgwpCompatibility bool `split_words:"true" default:"true"`
246-
247241
// GatewayClassParametersRefs configures the GatewayParameters references to set on the default GatewayClasses.
248242
// Format: JSON map where keys are GatewayClass names and values are objects with "name" (required),
249243
// "namespace" (required), "group" (optional), and "kind" (optional) fields.

api/settings/settings_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ func allEnvVarsSet() map[string]string {
5151
"KGW_XDS_AUTH": "false",
5252
"KGW_XDS_TLS": "true",
5353
"KGW_ENABLE_EXPERIMENTAL_GATEWAY_API_FEATURES": "false",
54-
"KGW_GWP_AGWP_COMPATIBILITY": "false",
5554
}
5655
}
5756

@@ -105,7 +104,6 @@ func TestSettings(t *testing.T) {
105104
XdsAuth: true,
106105
XdsTLS: false,
107106
EnableExperimentalGatewayAPIFeatures: true,
108-
GwpAgwpCompatibility: true,
109107
GatewayClassParametersRefs: GatewayClassParametersRefs{},
110108
},
111109
},
@@ -145,7 +143,6 @@ func TestSettings(t *testing.T) {
145143
XdsAuth: false,
146144
XdsTLS: true,
147145
EnableExperimentalGatewayAPIFeatures: false,
148-
GwpAgwpCompatibility: false,
149146
GatewayClassParametersRefs: GatewayClassParametersRefs{
150147
"kgateway": {
151148
Name: "custom-gwp",
@@ -237,7 +234,6 @@ func TestSettings(t *testing.T) {
237234
XdsAuth: true,
238235
XdsTLS: false,
239236
EnableExperimentalGatewayAPIFeatures: true,
240-
GwpAgwpCompatibility: true,
241237
GatewayClassParametersRefs: GatewayClassParametersRefs{},
242238
},
243239
},

api/v1alpha1/kgateway/gateway_parameters_types.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -722,13 +722,6 @@ type Agentgateway struct {
722722
// +optional
723723
Env []corev1.EnvVar `json:"env,omitempty"`
724724

725-
// Name of the custom configmap to use instead of the default generated one.
726-
// When set, the agent gateway will use this configmap instead of creating the default one.
727-
// The configmap must contain a 'config.yaml' key with the agent gateway configuration.
728-
//
729-
// +optional
730-
CustomConfigMapName *string `json:"customConfigMapName,omitempty"`
731-
732725
// Additional volume mounts to add to the container. See
733726
// https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#volumemount-v1-core
734727
// for details.
@@ -771,10 +764,3 @@ func (in *Agentgateway) GetEnv() []corev1.EnvVar {
771764
}
772765
return in.Env
773766
}
774-
775-
func (in *Agentgateway) GetCustomConfigMapName() *string {
776-
if in == nil {
777-
return nil
778-
}
779-
return in.CustomConfigMapName
780-
}

api/v1alpha1/kgateway/zz_generated.deepcopy.go

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/helm/kgateway-crds/templates/gateway.kgateway.dev_gatewayparameters.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,6 @@ spec:
5858
EnvoyContainer values will be used by default to configure the data
5959
plane proxy.
6060
properties:
61-
customConfigMapName:
62-
description: |-
63-
Name of the custom configmap to use instead of the default generated one.
64-
When set, the agent gateway will use this configmap instead of creating the default one.
65-
The configmap must contain a 'config.yaml' key with the agent gateway configuration.
66-
type: string
6761
env:
6862
description: The container environment variables.
6963
items:

0 commit comments

Comments
 (0)