Skip to content

Commit

Permalink
Merge branch 'main' into envoypatchpolicy-translate
Browse files Browse the repository at this point in the history
  • Loading branch information
Xunzhuo authored Jul 20, 2023
2 parents 8aa818a + a028ec1 commit 8458a4b
Show file tree
Hide file tree
Showing 167 changed files with 912 additions and 909 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"xds": {
"envoy-gateway-system-eg": {
"envoy-gateway-system/eg": {
"configs": [
{
"@type": "type.googleapis.com/envoy.admin.v3.BootstrapConfigDump",
Expand Down Expand Up @@ -183,7 +183,7 @@
{
"endpointConfig": {
"@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
"clusterName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com",
"clusterName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com",
"endpoints": [
{
"lbEndpoints": [
Expand Down Expand Up @@ -222,9 +222,9 @@
"ads": {},
"resourceApiVersion": "V3"
},
"serviceName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com"
"serviceName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com"
},
"name": "envoy-gateway-system-backend-rule-0-match-0-www.example.com",
"name": "envoy-gateway-system/backend/rule/0/match/0-www.example.com",
"outlierDetection": {},
"perConnectionBufferLimitBytes": 32768,
"type": "EDS"
Expand Down Expand Up @@ -350,7 +350,7 @@
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication",
"providers": {
"envoy-gateway-system-backend-rule-0-match-0-www.example.com-example": {
"envoy-gateway-system/backend/rule/0/match/0-www.example.com-example": {
"remoteJwks": {
"cacheDuration": "300s",
"httpUri": {
Expand All @@ -362,8 +362,8 @@
}
},
"requirementMap": {
"envoy-gateway-system-backend-rule-0-match-0-www.example.com": {
"providerName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com-example"
"envoy-gateway-system/backend/rule/0/match/0-www.example.com": {
"providerName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com-example"
}
}
}
Expand All @@ -383,7 +383,7 @@
"ads": {},
"resourceApiVersion": "V3"
},
"routeConfigName": "envoy-gateway-system-eg-http"
"routeConfigName": "envoy-gateway-system/eg/http"
},
"statPrefix": "http",
"upgradeConfigs": [
Expand All @@ -396,7 +396,7 @@
}
]
},
"name": "envoy-gateway-system-eg-http",
"name": "envoy-gateway-system/eg/http",
"perConnectionBufferLimitBytes": 32768
}
}
Expand All @@ -410,13 +410,13 @@
"routeConfig": {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"ignorePortInHostMatching": true,
"name": "envoy-gateway-system-eg-http",
"name": "envoy-gateway-system/eg/http",
"virtualHosts": [
{
"domains": [
"*"
],
"name": "envoy-gateway-system-eg-http",
"name": "envoy-gateway-system/eg/http",
"routes": [
{
"match": {
Expand All @@ -430,14 +430,14 @@
],
"pathSeparatedPrefix": "/foo"
},
"name": "envoy-gateway-system-backend-rule-0-match-0-www.example.com",
"name": "envoy-gateway-system/backend/rule/0/match/0-www.example.com",
"route": {
"cluster": "envoy-gateway-system-backend-rule-0-match-0-www.example.com"
"cluster": "envoy-gateway-system/backend/rule/0/match/0-www.example.com"
},
"typedPerFilterConfig": {
"envoy.filters.http.jwt_authn": {
"@type": "type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig",
"requirementName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com"
"requirementName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
xds:
envoy-gateway-system-eg:
envoy-gateway-system/eg:
configs:
- '@type': type.googleapis.com/envoy.admin.v3.BootstrapConfigDump
bootstrap:
Expand Down Expand Up @@ -103,7 +103,7 @@ xds:
dynamicEndpointConfigs:
- endpointConfig:
'@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment
clusterName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
clusterName: envoy-gateway-system/backend/rule/0/match/0-www.example.com
endpoints:
- lbEndpoints:
- endpoint:
Expand All @@ -125,8 +125,8 @@ xds:
edsConfig:
ads: {}
resourceApiVersion: V3
serviceName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
name: envoy-gateway-system-backend-rule-0-match-0-www.example.com
serviceName: envoy-gateway-system/backend/rule/0/match/0-www.example.com
name: envoy-gateway-system/backend/rule/0/match/0-www.example.com
outlierDetection: {}
perConnectionBufferLimitBytes: 32768
type: EDS
Expand Down Expand Up @@ -208,16 +208,16 @@ xds:
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication
providers:
envoy-gateway-system-backend-rule-0-match-0-www.example.com-example:
envoy-gateway-system/backend/rule/0/match/0-www.example.com-example:
remoteJwks:
cacheDuration: 300s
httpUri:
cluster: raw_githubusercontent_com_443
timeout: 5s
uri: https://raw.githubusercontent.com/envoyproxy/gateway/main/examples/kubernetes/authn/jwks.json
requirementMap:
envoy-gateway-system-backend-rule-0-match-0-www.example.com:
providerName: envoy-gateway-system-backend-rule-0-match-0-www.example.com-example
envoy-gateway-system/backend/rule/0/match/0-www.example.com:
providerName: envoy-gateway-system/backend/rule/0/match/0-www.example.com-example
- name: envoy.filters.http.router
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
Expand All @@ -228,34 +228,34 @@ xds:
configSource:
ads: {}
resourceApiVersion: V3
routeConfigName: envoy-gateway-system-eg-http
routeConfigName: envoy-gateway-system/eg/http
statPrefix: http
upgradeConfigs:
- upgradeType: websocket
useRemoteAddress: true
name: envoy-gateway-system-eg-http
name: envoy-gateway-system/eg/http
perConnectionBufferLimitBytes: 32768
- '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump
dynamicRouteConfigs:
- routeConfig:
'@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration
ignorePortInHostMatching: true
name: envoy-gateway-system-eg-http
name: envoy-gateway-system/eg/http
virtualHosts:
- domains:
- '*'
name: envoy-gateway-system-eg-http
name: envoy-gateway-system/eg/http
routes:
- match:
headers:
- name: :authority
stringMatch:
exact: www.example.com
pathSeparatedPrefix: /foo
name: envoy-gateway-system-backend-rule-0-match-0-www.example.com
name: envoy-gateway-system/backend/rule/0/match/0-www.example.com
route:
cluster: envoy-gateway-system-backend-rule-0-match-0-www.example.com
cluster: envoy-gateway-system/backend/rule/0/match/0-www.example.com
typedPerFilterConfig:
envoy.filters.http.jwt_authn:
'@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig
requirementName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
requirementName: envoy-gateway-system/backend/rule/0/match/0-www.example.com
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
xds:
envoy-gateway-system-eg:
envoy-gateway-system/eg:
'@type': type.googleapis.com/envoy.admin.v3.BootstrapConfigDump
bootstrap:
admin:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
xds:
envoy-gateway-system-eg:
envoy-gateway-system/eg:
'@type': type.googleapis.com/envoy.admin.v3.ClustersConfigDump
dynamicActiveClusters:
- cluster:
Expand All @@ -12,8 +12,8 @@ xds:
edsConfig:
ads: {}
resourceApiVersion: V3
serviceName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
name: envoy-gateway-system-backend-rule-0-match-0-www.example.com
serviceName: envoy-gateway-system/backend/rule/0/match/0-www.example.com
name: envoy-gateway-system/backend/rule/0/match/0-www.example.com
outlierDetection: {}
perConnectionBufferLimitBytes: 32768
type: EDS
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
xds:
envoy-gateway-system-eg:
envoy-gateway-system/eg:
'@type': type.googleapis.com/envoy.admin.v3.ListenersConfigDump
dynamicListeners:
- activeState:
Expand Down Expand Up @@ -47,16 +47,16 @@ xds:
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication
providers:
envoy-gateway-system-backend-rule-0-match-0-www.example.com-example:
envoy-gateway-system/backend/rule/0/match/0-www.example.com-example:
remoteJwks:
cacheDuration: 300s
httpUri:
cluster: raw_githubusercontent_com_443
timeout: 5s
uri: https://raw.githubusercontent.com/envoyproxy/gateway/main/examples/kubernetes/authn/jwks.json
requirementMap:
envoy-gateway-system-backend-rule-0-match-0-www.example.com:
providerName: envoy-gateway-system-backend-rule-0-match-0-www.example.com-example
envoy-gateway-system/backend/rule/0/match/0-www.example.com:
providerName: envoy-gateway-system/backend/rule/0/match/0-www.example.com-example
- name: envoy.filters.http.router
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
Expand All @@ -67,10 +67,10 @@ xds:
configSource:
ads: {}
resourceApiVersion: V3
routeConfigName: envoy-gateway-system-eg-http
routeConfigName: envoy-gateway-system/eg/http
statPrefix: http
upgradeConfigs:
- upgradeType: websocket
useRemoteAddress: true
name: envoy-gateway-system-eg-http
name: envoy-gateway-system/eg/http
perConnectionBufferLimitBytes: 32768
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
xds:
envoy-gateway-system-eg:
envoy-gateway-system/eg:
'@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump
dynamicRouteConfigs:
- routeConfig:
'@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration
ignorePortInHostMatching: true
name: envoy-gateway-system-eg-http
name: envoy-gateway-system/eg/http
virtualHosts:
- domains:
- '*'
name: envoy-gateway-system-eg-http
name: envoy-gateway-system/eg/http
routes:
- match:
headers:
- name: :authority
stringMatch:
exact: www.example.com
pathSeparatedPrefix: /foo
name: envoy-gateway-system-backend-rule-0-match-0-www.example.com
name: envoy-gateway-system/backend/rule/0/match/0-www.example.com
route:
cluster: envoy-gateway-system-backend-rule-0-match-0-www.example.com
cluster: envoy-gateway-system/backend/rule/0/match/0-www.example.com
typedPerFilterConfig:
envoy.filters.http.jwt_authn:
'@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig
requirementName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
requirementName: envoy-gateway-system/backend/rule/0/match/0-www.example.com
Loading

0 comments on commit 8458a4b

Please sign in to comment.