Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/v1.2] cherry pick bug fixes and IPv6 to v1.2.2 #4765

Merged
merged 6 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions api/v1alpha1/ext_auth_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ type ExtAuth struct {
// The authorization request message is defined in
// https://www.envoyproxy.io/docs/envoy/latest/api-v3/service/auth/v3/external_auth.proto
// +kubebuilder:validation:XValidation:message="backendRef or backendRefs needs to be set",rule="has(self.backendRef) || self.backendRefs.size() > 0"
// +kubebuilder:validation:XValidation:message="BackendRefs must be used, backendRef is not supported.",rule="!has(self.backendRef)"
// +kubebuilder:validation:XValidation:message="BackendRefs only supports Service and Backend kind.",rule="has(self.backendRefs) ? self.backendRefs.all(f, f.kind == 'Service' || f.kind == 'Backend') : true"
// +kubebuilder:validation:XValidation:message="BackendRefs only supports Core and gateway.envoyproxy.io group.",rule="has(self.backendRefs) ? (self.backendRefs.all(f, f.group == \"\" || f.group == 'gateway.envoyproxy.io')) : true"
type GRPCExtAuthService struct {
Expand All @@ -67,7 +66,6 @@ type GRPCExtAuthService struct {
// HTTPExtAuthService defines the HTTP External Authorization service
//
// +kubebuilder:validation:XValidation:message="backendRef or backendRefs needs to be set",rule="has(self.backendRef) || self.backendRefs.size() > 0"
// +kubebuilder:validation:XValidation:message="BackendRefs must be used, backendRef is not supported.",rule="!has(self.backendRef)"
// +kubebuilder:validation:XValidation:message="BackendRefs only supports Service and Backend kind.",rule="has(self.backendRefs) ? self.backendRefs.all(f, f.kind == 'Service' || f.kind == 'Backend') : true"
// +kubebuilder:validation:XValidation:message="BackendRefs only supports Core and gateway.envoyproxy.io group.",rule="has(self.backendRefs) ? (self.backendRefs.all(f, f.group == \"\" || f.group == 'gateway.envoyproxy.io')) : true"
type HTTPExtAuthService struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1204,8 +1204,6 @@ spec:
x-kubernetes-validations:
- message: backendRef or backendRefs needs to be set
rule: has(self.backendRef) || self.backendRefs.size() > 0
- message: BackendRefs must be used, backendRef is not supported.
rule: '!has(self.backendRef)'
- message: BackendRefs only supports Service and Backend kind.
rule: 'has(self.backendRefs) ? self.backendRefs.all(f, f.kind
== ''Service'' || f.kind == ''Backend'') : true'
Expand Down Expand Up @@ -2103,8 +2101,6 @@ spec:
x-kubernetes-validations:
- message: backendRef or backendRefs needs to be set
rule: has(self.backendRef) || self.backendRefs.size() > 0
- message: BackendRefs must be used, backendRef is not supported.
rule: '!has(self.backendRef)'
- message: BackendRefs only supports Service and Backend kind.
rule: 'has(self.backendRefs) ? self.backendRefs.all(f, f.kind
== ''Service'' || f.kind == ''Backend'') : true'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand All @@ -792,7 +792,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand All @@ -819,7 +819,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand All @@ -839,7 +839,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand All @@ -859,7 +859,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -891,7 +891,8 @@ xds:
path: /dev/stdout
address:
socketAddress:
address: 0.0.0.0
address: '::'
ipv4Compat: true
portValue: 10080
defaultFilterChain:
filters:
Expand Down Expand Up @@ -950,7 +951,8 @@ xds:
path: /dev/stdout
address:
socketAddress:
address: 0.0.0.0
address: '::'
ipv4Compat: true
portValue: 8080
defaultFilterChain:
filters:
Expand Down Expand Up @@ -1017,7 +1019,8 @@ xds:
path: /dev/stdout
address:
socketAddress:
address: 0.0.0.0
address: '::'
ipv4Compat: true
portValue: 1234
filterChains:
- filters:
Expand Down Expand Up @@ -1056,7 +1059,8 @@ xds:
path: /dev/stdout
address:
socketAddress:
address: 0.0.0.0
address: '::'
ipv4Compat: true
portValue: 8443
filterChains:
- filterChainMatch:
Expand Down Expand Up @@ -1102,7 +1106,8 @@ xds:
path: /dev/stdout
address:
socketAddress:
address: 0.0.0.0
address: '::'
ipv4Compat: true
portValue: 1234
protocol: UDP
listenerFilters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_ONLY",
"dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
Expand Down Expand Up @@ -488,7 +488,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_ONLY",
"dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
Expand Down Expand Up @@ -529,7 +529,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_ONLY",
"dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
Expand Down Expand Up @@ -559,7 +559,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_ONLY",
"dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
Expand Down Expand Up @@ -589,7 +589,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_ONLY",
"dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
Expand Down Expand Up @@ -637,7 +637,8 @@
],
"address": {
"socketAddress": {
"address": "0.0.0.0",
"address": "::",
"ipv4Compat": true,
"portValue": 10080
}
},
Expand Down Expand Up @@ -728,7 +729,8 @@
],
"address": {
"socketAddress": {
"address": "0.0.0.0",
"address": "::",
"ipv4Compat": true,
"portValue": 8080
}
},
Expand Down Expand Up @@ -833,7 +835,8 @@
],
"address": {
"socketAddress": {
"address": "0.0.0.0",
"address": "::",
"ipv4Compat": true,
"portValue": 1234
}
},
Expand Down Expand Up @@ -898,7 +901,8 @@
],
"address": {
"socketAddress": {
"address": "0.0.0.0",
"address": "::",
"ipv4Compat": true,
"portValue": 8443
}
},
Expand Down Expand Up @@ -976,7 +980,8 @@
],
"address": {
"socketAddress": {
"address": "0.0.0.0",
"address": "::",
"ipv4Compat": true,
"portValue": 1234,
"protocol": "UDP"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand All @@ -271,7 +271,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand All @@ -298,7 +298,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand All @@ -318,7 +318,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand All @@ -338,7 +338,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -370,7 +370,8 @@ xds:
path: /dev/stdout
address:
socketAddress:
address: 0.0.0.0
address: '::'
ipv4Compat: true
portValue: 10080
defaultFilterChain:
filters:
Expand Down Expand Up @@ -429,7 +430,8 @@ xds:
path: /dev/stdout
address:
socketAddress:
address: 0.0.0.0
address: '::'
ipv4Compat: true
portValue: 8080
defaultFilterChain:
filters:
Expand Down Expand Up @@ -496,7 +498,8 @@ xds:
path: /dev/stdout
address:
socketAddress:
address: 0.0.0.0
address: '::'
ipv4Compat: true
portValue: 1234
filterChains:
- filters:
Expand Down Expand Up @@ -535,7 +538,8 @@ xds:
path: /dev/stdout
address:
socketAddress:
address: 0.0.0.0
address: '::'
ipv4Compat: true
portValue: 8443
filterChains:
- filterChainMatch:
Expand Down Expand Up @@ -581,7 +585,8 @@ xds:
path: /dev/stdout
address:
socketAddress:
address: 0.0.0.0
address: '::'
ipv4Compat: true
portValue: 1234
protocol: UDP
listenerFilters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand All @@ -30,7 +30,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand All @@ -57,7 +57,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand All @@ -77,7 +77,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand All @@ -97,7 +97,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
Expand Down
Loading