Skip to content

Commit f86a08f

Browse files
Aias00Aias00
committed
fix(clienttrafficpolicy): sync forward proto field references
Signed-off-by: liuhy <liuhongyu@apache.org>
1 parent 7cf71f5 commit f86a08f

7 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎api/v1alpha1/zz_generated.deepcopy.go‎

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

‎internal/gatewayapi/clienttrafficpolicy.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -667,8 +667,8 @@ func (t *Translator) translateClientTrafficPolicyForListener(
667667
// ProxyProtocol field takes precedence when configured
668668
// Even if it's an empty object {}, we should enable proxy protocol with default settings
669669
proxyProtocol = &ir.ProxyProtocolSettings{
670-
Optional: ptr.Deref(policy.Spec.ProxyProtocol.Optional, false),
671-
ForwardProtoConfig: buildIRForwardProtoConfig(policy.Spec.ProxyProtocol.ForwardProtoConfig),
670+
Optional: ptr.Deref(policy.Spec.ProxyProtocol.Optional, false),
671+
ForwardProto: buildIRForwardProtoConfig(policy.Spec.ProxyProtocol.ForwardProto),
672672
}
673673
} else if ptr.Deref(policy.Spec.EnableProxyProtocol, false) {
674674
// Fallback to legacy EnableProxyProtocol field

‎internal/ir/xds.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ type ProxyProtocolSettings struct {
604604
// ForwardProtoConfig infers the x-forwarded-proto header from the PROXY protocol
605605
// destination port. Only takes effect when PROXY protocol is enabled.
606606
// +optional
607-
ForwardProtoConfig *ForwardProtoConfig `json:"forwardProtoConfig,omitempty" yaml:"forwardProtoConfig,omitempty"`
607+
ForwardProto *ForwardProtoConfig `json:"forwardProtoConfig,omitempty" yaml:"forwardProtoConfig,omitempty"`
608608
}
609609

610610
// ForwardProtoConfig holds configuration for inferring the x-forwarded-proto header

‎internal/ir/zz_generated.deepcopy.go‎

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

‎internal/xds/translator/listener.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ func (t *Translator) addHCMToXDSListener(
412412
// Set forward_proto_config to infer the x-forwarded-proto header from the PROXY protocol
413413
// destination port. Requires the PROXY protocol listener filter to be enabled, which is added
414414
// from the same irListener.ProxyProtocol field.
415-
if irListener.ProxyProtocol != nil && irListener.ProxyProtocol.ForwardProtoConfig != nil {
416-
fpc := irListener.ProxyProtocol.ForwardProtoConfig
415+
if irListener.ProxyProtocol != nil && irListener.ProxyProtocol.ForwardProto != nil {
416+
fpc := irListener.ProxyProtocol.ForwardProto
417417
mgr.ForwardProtoConfig = &hcmv3.ForwardProtoConfig{
418418
HttpsDestinationPorts: fpc.HTTPSDestinationPorts,
419419
HttpDestinationPorts: fpc.HTTPDestinationPorts,

‎internal/xds/translator/proxy_protocol_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func TestHCMForwardProtoConfig(t *testing.T) {
110110
{
111111
name: "forwardProtoConfig with both port lists",
112112
proxyProtocol: &ir.ProxyProtocolSettings{
113-
ForwardProtoConfig: &ir.ForwardProtoConfig{
113+
ForwardProto: &ir.ForwardProtoConfig{
114114
HTTPSDestinationPorts: []uint32{443, 8443},
115115
HTTPDestinationPorts: []uint32{80, 8080},
116116
},
@@ -122,7 +122,7 @@ func TestHCMForwardProtoConfig(t *testing.T) {
122122
{
123123
name: "forwardProtoConfig with only https ports",
124124
proxyProtocol: &ir.ProxyProtocolSettings{
125-
ForwardProtoConfig: &ir.ForwardProtoConfig{
125+
ForwardProto: &ir.ForwardProtoConfig{
126126
HTTPSDestinationPorts: []uint32{443},
127127
},
128128
},

‎test/cel-validation/clienttrafficpolicy_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ func TestClientTrafficPolicyTarget(t *testing.T) {
810810
},
811811
},
812812
ProxyProtocol: &egv1a1.ProxyProtocolSettings{
813-
ForwardProtoConfig: &egv1a1.ForwardProtoConfig{
813+
ForwardProto: &egv1a1.ForwardProtoConfig{
814814
HTTPSDestinationPorts: []int32{443, 8443},
815815
HTTPDestinationPorts: []int32{80, 8080},
816816
},
@@ -834,7 +834,7 @@ func TestClientTrafficPolicyTarget(t *testing.T) {
834834
},
835835
},
836836
ProxyProtocol: &egv1a1.ProxyProtocolSettings{
837-
ForwardProtoConfig: &egv1a1.ForwardProtoConfig{
837+
ForwardProto: &egv1a1.ForwardProtoConfig{
838838
HTTPSDestinationPorts: []int32{443},
839839
},
840840
},
@@ -857,7 +857,7 @@ func TestClientTrafficPolicyTarget(t *testing.T) {
857857
},
858858
},
859859
ProxyProtocol: &egv1a1.ProxyProtocolSettings{
860-
ForwardProtoConfig: &egv1a1.ForwardProtoConfig{},
860+
ForwardProto: &egv1a1.ForwardProtoConfig{},
861861
},
862862
}
863863
},
@@ -882,7 +882,7 @@ func TestClientTrafficPolicyTarget(t *testing.T) {
882882
},
883883
},
884884
ProxyProtocol: &egv1a1.ProxyProtocolSettings{
885-
ForwardProtoConfig: &egv1a1.ForwardProtoConfig{
885+
ForwardProto: &egv1a1.ForwardProtoConfig{
886886
HTTPSDestinationPorts: []int32{443, 8443},
887887
HTTPDestinationPorts: []int32{8443, 80},
888888
},

0 commit comments

Comments
 (0)