Skip to content

Commit

Permalink
gh/workflows: re-enable masqueranding for EGW
Browse files Browse the repository at this point in the history
The #23283 should have been fixed by the 3e8f697 ("contrib/kind: set custom
DNS resolver for Kind nodes") commit, so we can re-enable masquerading by
default and re-enable fast routing.

Signed-off-by: Anton Protopopov <aspsk@isovalent.com>
  • Loading branch information
aspsk committed Apr 4, 2023
1 parent bce8d9e commit bc710b3
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/conformance-datapath.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,9 @@ jobs:
--rollback=false \
--config monitor-aggregation=none \
--nodes-without-cilium=kind-worker3 \
--helm-set-string=kubeProxyReplacement=${{ matrix.kpr }}"
--helm-set-string=kubeProxyReplacement=${{ matrix.kpr }} \
--helm-set=bpf.masquerade=true \
--helm-set=enableIPv6Masquerade=false"
TUNNEL="--helm-set-string=tunnel=${{ matrix.tunnel }}"
if [ "${{ matrix.tunnel }}" == "disabled" ]; then
TUNNEL="--helm-set-string=tunnel=disabled --helm-set-string=autoDirectNodeRoutes=true --helm-set-string=ipv4NativeRoutingCIDR=10.244.0.0/16"
Expand All @@ -311,13 +313,7 @@ jobs:
if [ "${{ matrix.ipv6 }}" != "false" ]; then
IPV6="--helm-set=ipv6.enabled=true"
fi
# We need to enable BPF masquerading for EGW so we keep the default
# here. masq is off due to https://github.com/cilium/cilium/issues/23283
EGRESS_GATEWAY="--helm-set=bpf.masquerade=false"
if [ "${{ matrix.egress-gateway }}" == "true" ]; then
EGRESS_GATEWAY="--helm-set=bpf.masquerade=true --helm-set=enableIPv6Masquerade=false"
# Force legacy host routing to work around #23283 with masq on.
EGRESS_GATEWAY+=" --helm-set=bpf.hostLegacyRouting=true"
EGRESS_GATEWAY+=" --helm-set=egressGateway.enabled=true"
fi
Expand Down

0 comments on commit bc710b3

Please sign in to comment.