Skip to content

Commit

Permalink
fix(wasm): remove hardcoded isolation level
Browse files Browse the repository at this point in the history
This was added during local development to work around a bug but is no
longer desired and disallows setting the isolation level via kong.conf.
  • Loading branch information
flrgh authored and locao committed Aug 24, 2023
1 parent ef313ba commit dbacabb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
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
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
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

1 comment on commit dbacabb

@khcp-gha-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bazel Build

Docker image available kong/kong:dbacabb627edc50d69a05a773cfe6f304667991f
Artifacts available https://github.com/Kong/kong/actions/runs/5966724072

Please sign in to comment.