From a9a2c3e1674127c5db3ce92be39822bcde2a0d76 Mon Sep 17 00:00:00 2001 From: Sebastian Wicki Date: Mon, 28 Aug 2023 16:29:17 +0200 Subject: [PATCH] ci/multi-pool: Use nonMasqueradeCIDRs for all pod CIDRs With the previous commit, we removed the restriction that the user must set a native routing CIDR. This commit adjusts the multi-pool workflow to make use of that change (and incidentally also tests that the previous commit via CI). Signed-off-by: Sebastian Wicki --- .github/workflows/conformance-multi-pool.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/conformance-multi-pool.yaml b/.github/workflows/conformance-multi-pool.yaml index b6629ce861a9..9392be641bc0 100644 --- a/.github/workflows/conformance-multi-pool.yaml +++ b/.github/workflows/conformance-multi-pool.yaml @@ -91,9 +91,8 @@ jobs: --helm-set=kubeProxyReplacement=strict \ --helm-set=bpf.masquerade=true \ --helm-set=bpf.hostLegacyRouting=true\ - --helm-set=ipv4NativeRoutingCIDR=10.0.0.0/8 \ --helm-set=ipMasqAgent.enabled=true \ - --helm-set=ipMasqAgent.config.nonMasqueradeCIDRs='{192.168.0.0/16}' \ + --helm-set=ipMasqAgent.config.nonMasqueradeCIDRs='{10.0.0.0/8,192.168.0.0/16}' \ --helm-set=ipam.mode=multi-pool \ --helm-set=ipam.operator.autoCreateCiliumPodIPPools.default.ipv4.cidrs='{10.10.0.0/16}' \ --helm-set=ipam.operator.autoCreateCiliumPodIPPools.default.ipv4.maskSize=24 \