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.

Sign up for GitHub

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

Jump to bottom

fix(wasm): remove hardcoded isolation level #11407

Merged
merged 1 commit into from
Aug 24, 2023
Merged

fix(wasm): remove hardcoded isolation level #11407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
[#11328](https://github.com/Kong/kong/pull/11328)
- Fix an issue that response status code is not real upstream status when using kong.response function.
[#11437](https://github.com/Kong/kong/pull/11437)
- Removed a hardcoded proxy-wasm isolation level setting that was preventing the
`nginx_http_proxy_wasm_isolation` configuration value from taking effect.
[#11407](https://github.com/Kong/kong/pull/11407)

#### Plugins

Expand Down
1 change: 0 additions & 1 deletion kong.conf.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2062,7 +2062,6 @@
# - `wasm_call`
# - `module`
# - `proxy_wasm`
# - `proxy_wasm_isolation`
# - `resolver_add`
# - `proxy_wasm_request_headers_in_access`
# - `shm_queue`
4 changes: 1 addition & 3 deletions kong/runloop/wasm.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ local sha256 = utils.sha256_bin

local VERSION_KEY = "filter_chains:version"
local TTL_ZERO = { ttl = 0 }
local ATTACH_OPTS = {}


---
Expand Down Expand Up @@ -576,7 +575,6 @@ local function enable(kong_config)
_G.dns_client = _G.dns_client or dns(kong_config)

proxy_wasm = proxy_wasm or require "resty.wasmx.proxy_wasm"
ATTACH_OPTS.isolation = proxy_wasm.isolations.FILTER

ENABLED = true
STATUS = STATUS_ENABLED
Expand Down Expand Up @@ -670,7 +668,7 @@ function _M.attach(ctx)

ctx.ran_wasm = true

local ok, err = proxy_wasm.attach(chain.c_plan, ATTACH_OPTS)
local ok, err = proxy_wasm.attach(chain.c_plan)
if not ok then
log(CRIT, "failed attaching ", chain.label, " filter chain to request: ", err)
return kong.response.error(500)
Expand Down
Loading