-
Notifications
You must be signed in to change notification settings - Fork 478
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'alibaba:main' into key-cluster-rate-limit
- Loading branch information
Showing
38 changed files
with
1,199 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| v1.4.0-rc.1 | ||
| v1.4.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| diff -Naur envoy/bazel/repository_locations.bzl envoy-new/bazel/repository_locations.bzl | ||
| --- envoy/bazel/repository_locations.bzl 2024-05-27 18:04:13.116443196 +0800 | ||
| +++ envoy-new/bazel/repository_locations.bzl 2024-05-27 18:02:24.812441069 +0800 | ||
| @@ -1031,8 +1031,8 @@ | ||
| project_name = "WebAssembly for Proxies (C++ host implementation)", | ||
| project_desc = "WebAssembly for Proxies (C++ host implementation)", | ||
| project_url = "https://github.com/higress-group/proxy-wasm-cpp-host", | ||
| - version = "cad2eb04d402dbf559101f3cb4f44da0d9c5b0b0", | ||
| - sha256 = "4efbcc97c58994fab92c9dc50c051ad16463647d4c0c6df36a7204d2984c1e63", | ||
| + version = "28a33a5a3e6c1ff8f53128a74e89aeca47850f68", | ||
| + sha256 = "1aaa5898c169aeff115eff2fedf58095b3509d2e59861ad498e661a990d78b3d", | ||
| strip_prefix = "proxy-wasm-cpp-host-{version}", | ||
| urls = ["https://github.com/higress-group/proxy-wasm-cpp-host/archive/{version}.tar.gz"], | ||
| use_category = ["dataplane_ext"], | ||
| diff -Naur envoy/source/extensions/filters/http/wasm/wasm_filter.h envoy-new/source/extensions/filters/http/wasm/wasm_filter.h | ||
| --- envoy/source/extensions/filters/http/wasm/wasm_filter.h 2024-05-27 18:04:13.112443196 +0800 | ||
| +++ envoy-new/source/extensions/filters/http/wasm/wasm_filter.h 2024-05-27 18:03:25.360442258 +0800 | ||
| @@ -51,6 +51,7 @@ | ||
| if (opt_ref->recover()) { | ||
| ENVOY_LOG(info, "wasm vm recover success"); | ||
| wasm = opt_ref->handle()->wasmHandle()->wasm().get(); | ||
| + handle = opt_ref->handle(); | ||
| } else { | ||
| ENVOY_LOG(info, "wasm vm recover failed"); | ||
| failed = true; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| dependencies: | ||
| - name: higress-core | ||
| repository: file://../core | ||
| version: 1.4.0-rc.1 | ||
| version: 1.4.0 | ||
| - name: higress-console | ||
| repository: https://higress.io/helm-charts/ | ||
| version: 1.4.0 | ||
| digest: sha256:320b1b3ed08fad56dff0d21faaffe41a0325fdcdb96847e53a588d6b0df7e73e | ||
| generated: "2024-05-19T17:52:19.676747+08:00" | ||
| digest: sha256:bf4c58ac28d4691907eab44a13eee398fc05ade95cdae07cb91d7e20ce4ba382 | ||
| generated: "2024-05-29T21:18:32.791995+08:00" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| diff -Naur istio/pilot/pkg/model/push_context.go istio-new/pilot/pkg/model/push_context.go | ||
| --- istio/pilot/pkg/model/push_context.go 2024-05-27 23:03:09.000000000 +0800 | ||
| +++ istio-new/pilot/pkg/model/push_context.go 2024-05-27 21:33:45.000000000 +0800 | ||
| @@ -1482,8 +1482,14 @@ | ||
| ns := virtualService.Namespace | ||
| rule := virtualService.Spec.(*networking.VirtualService) | ||
| // Added by ingress | ||
| - for _, host := range rule.Hosts { | ||
| - ps.virtualServiceIndex.byHost[host] = append(ps.virtualServiceIndex.byHost[host], virtualService) | ||
| + if len(rule.Gateways) > 0 { | ||
| + if len(rule.Hosts) == 0 { | ||
| + ps.virtualServiceIndex.byHost[constants.GlobalWildcardHost] = append(ps.virtualServiceIndex.byHost[constants.GlobalWildcardHost], virtualService) | ||
| + } else { | ||
| + for _, host := range rule.Hosts { | ||
| + ps.virtualServiceIndex.byHost[host] = append(ps.virtualServiceIndex.byHost[host], virtualService) | ||
| + } | ||
| + } | ||
| } | ||
| // End added by ingress | ||
| gwNames := getGatewayNames(rule) | ||
| diff -Naur istio/pilot/pkg/networking/core/v1alpha3/gateway.go istio-new/pilot/pkg/networking/core/v1alpha3/gateway.go | ||
| --- istio/pilot/pkg/networking/core/v1alpha3/gateway.go 2024-05-27 23:03:09.000000000 +0800 | ||
| +++ istio-new/pilot/pkg/networking/core/v1alpha3/gateway.go 2024-05-27 22:58:33.000000000 +0800 | ||
| @@ -376,8 +376,15 @@ | ||
| gatewayVirtualServices[gatewayName] = virtualServices | ||
| } | ||
| for _, virtualService := range virtualServices { | ||
| - for _, host := range virtualService.Spec.(*networking.VirtualService).Hosts { | ||
| - hostSet.Insert(host) | ||
| + rule := virtualService.Spec.(*networking.VirtualService) | ||
| + if len(rule.Gateways) > 0 { | ||
| + if len(rule.Hosts) == 0 { | ||
| + hostSet.Insert(constants.GlobalWildcardHost) | ||
| + break | ||
| + } | ||
| + for _, host := range rule.Hosts { | ||
| + hostSet.Insert(host) | ||
| + } | ||
| } | ||
| } | ||
| } | ||
| @@ -689,7 +696,7 @@ | ||
| vHost = &route.VirtualHost{ | ||
| Name: util.DomainName(hostRDSHost, port), | ||
| Domains: buildGatewayVirtualHostDomains(hostRDSHost, port), | ||
| - Routes: routes, | ||
| + Routes: append(routes[:0:0], routes...), | ||
| IncludeRequestAttemptCount: true, | ||
| TypedPerFilterConfig: mseingress.ConstructTypedPerFilterConfigForVHost(globalHTTPFilters, virtualService), | ||
| } | ||
| @@ -884,7 +891,7 @@ | ||
| newVHost := &route.VirtualHost{ | ||
| Name: util.DomainName(string(hostname), port), | ||
| Domains: buildGatewayVirtualHostDomains(string(hostname), port), | ||
| - Routes: routes, | ||
| + Routes: append(routes[:0:0], routes...), | ||
| IncludeRequestAttemptCount: true, | ||
| TypedPerFilterConfig: mseingress.ConstructTypedPerFilterConfigForVHost(globalHTTPFilters, virtualService), | ||
| } | ||
| diff -Naur istio/pkg/config/constants/constants.go istio-new/pkg/config/constants/constants.go | ||
| --- istio/pkg/config/constants/constants.go 2024-05-27 23:03:09.000000000 +0800 | ||
| +++ istio-new/pkg/config/constants/constants.go 2024-05-27 21:31:58.000000000 +0800 | ||
| @@ -145,5 +145,6 @@ | ||
| // Added by ingress | ||
| HigressHostRDSNamePrefix = "higress-rds-" | ||
| DefaultScopedRouteName = "scoped-route" | ||
| + GlobalWildcardHost = "*" | ||
| // End added by ingress | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| diff -Naur istio/pilot/pkg/model/push_context.go istio-new/pilot/pkg/model/push_context.go | ||
| --- istio/pilot/pkg/model/push_context.go 2024-05-29 19:29:45.000000000 +0800 | ||
| +++ istio-new/pilot/pkg/model/push_context.go 2024-05-29 19:11:03.000000000 +0800 | ||
| @@ -769,6 +769,13 @@ | ||
| for _, s := range svcs { | ||
| svcHost := string(s.Hostname) | ||
|
|
||
| + // Added by ingress | ||
| + if s.Attributes.Namespace == "mcp" { | ||
| + gwSvcs = append(gwSvcs, s) | ||
| + continue | ||
| + } | ||
| + // End added by ingress | ||
| + | ||
| if _, ok := hostsFromGateways[svcHost]; ok { | ||
| gwSvcs = append(gwSvcs, s) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.