Skip to content

Commit

Permalink
envoy: Bump envoy image to fix SO_REUSEPORT with BPF TPROXY
Browse files Browse the repository at this point in the history
Currently, if BPF TPROXY is enabled (`bpf.tproxy=true`), the BPF
socket lookup for the proxy port fails because Envoys Proxy listener
socket is always configured with the socket option `SO_REUSEPORT`.

It ignores the fact that port reuse on the Listener socket is
explicitly disabled via Envoy Listener API (`enable_reuse_port=false`)
if BPF TPROXY is enabled (due to incompatibilities).

Therefore, this commit bumps the envoy image to the latest version
that doesn't set the socket option `SO_REUSEPORT` on the Listener
socket.

Relates: cilium/proxy#505
Fixes: cilium#27498

Signed-off-by: Marco Hofstetter <[email protected]>
  • Loading branch information
mhofstetter committed Jan 24, 2024
1 parent 945ad0c commit dc36c73
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Documentation/helm-values.rst

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion images/cilium/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:e2dc02fe9b2871b1f9a7468698abd536531af086@sha256:8eb964e2da3ffdaa92189d4e3161cf31c4e72300378411b69d99ff1121ced6bf
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:98dea50d165d236ffd2c829196ab58df9326c495@sha256:5e307ffbdc5552dc3d6f94d7ba1e5afe6a22c19af765777f4ea48f0522baf147
ARG CILIUM_ENVOY_IMAGE=quay.io/cilium/cilium-envoy:v1.27.2-6d609cf1559365fe9e8db5a7774a313f1861e143@sha256:90c280221e269952b0fe70c2e0c7fcafe7b51e713c8a4b60eb318c5d626f0553
ARG CILIUM_ENVOY_IMAGE=quay.io/cilium/cilium-envoy:v1.27.2-4366a60cb693c38ab1917d924f5b1d26f1e58b1e@sha256:debc09c066c11a756234ba3482f301e20ca0f99fd7f4a41fe01e49ca2fa9c50a

# cilium-envoy from github.com/cilium/proxy
#
Expand Down
4 changes: 2 additions & 2 deletions install/kubernetes/Makefile.values
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ export CILIUM_NODEINIT_REPO:=quay.io/cilium/startup-script
export CILIUM_NODEINIT_VERSION:=62093c5c233ea914bfa26a10ba41f8780d9b737f

export CILIUM_ENVOY_REPO:=quay.io/cilium/cilium-envoy
export CILIUM_ENVOY_VERSION:=v1.27.2-6d609cf1559365fe9e8db5a7774a313f1861e143
export CILIUM_ENVOY_DIGEST:=sha256:90c280221e269952b0fe70c2e0c7fcafe7b51e713c8a4b60eb318c5d626f0553
export CILIUM_ENVOY_VERSION:=v1.27.2-4366a60cb693c38ab1917d924f5b1d26f1e58b1e
export CILIUM_ENVOY_DIGEST:=sha256:debc09c066c11a756234ba3482f301e20ca0f99fd7f4a41fe01e49ca2fa9c50a

export HUBBLE_UI_BACKEND_REPO:=quay.io/cilium/hubble-ui-backend
export HUBBLE_UI_BACKEND_VERSION:=v0.12.1
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/cilium/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions install/kubernetes/cilium/values.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit dc36c73

Please sign in to comment.