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

ci-e2e: Add secondary network NodePort tests #27738

Merged
merged 2 commits into from
Sep 1, 2023
Merged

ci-e2e: Add secondary network NodePort tests #27738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01e988e
ci-e2e: Add secondary network
brb Aug 31, 2023
e13b3fb
ginkgo: Remove Tests with secondary NodePort device
brb Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/actions/ginkgo/main-focus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,8 @@ include:
# K8sDatapathServicesTest Checks N/S loadbalancing Tests NodePort with sessionAffinity from outside
# K8sDatapathServicesTest Checks N/S loadbalancing Tests security id propagation in N/S LB requests fwd-ed over tunnel
# K8sDatapathServicesTest Checks N/S loadbalancing Tests with direct routing and DSR
# K8sDatapathServicesTest Checks N/S loadbalancing Tests with secondary NodePort device
- focus: "f12-datapath-service-ns-misc"
cliFocus: "K8sDatapathServicesTest Checks N/S loadbalancing Tests externalIPs|K8sDatapathServicesTest Checks N/S loadbalancing Tests GH|K8sDatapathServicesTest Checks N/S loadbalancing Tests NodePort|K8sDatapathServicesTest Checks N/S loadbalancing Tests security|K8sDatapathServicesTest Checks N/S loadbalancing Tests with direct|K8sDatapathServicesTest Checks N/S loadbalancing Tests with secondary|K8sDatapathServicesTest Checks N/S loadbalancing with"
cliFocus: "K8sDatapathServicesTest Checks N/S loadbalancing Tests externalIPs|K8sDatapathServicesTest Checks N/S loadbalancing Tests GH|K8sDatapathServicesTest Checks N/S loadbalancing Tests NodePort|K8sDatapathServicesTest Checks N/S loadbalancing Tests security|K8sDatapathServicesTest Checks N/S loadbalancing Tests with direct|K8sDatapathServicesTest Checks N/S loadbalancing with"

###
# K8sDatapathServicesTest Checks N/S loadbalancing Tests with XDP, direct routing, DSR and Maglev
Expand Down
25 changes: 23 additions & 2 deletions .github/workflows/conformance-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ concurrency:

env:
# renovate: datasource=github-releases depName=cilium/cilium-cli
cilium_cli_version: v0.15.6
cilium_cli_version: v0.15.7
cilium_cli_ci_version:
check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

Expand Down Expand Up @@ -105,6 +105,8 @@ jobs:
kernel: '5.10-20230810.091425'
kube-proxy: 'iptables'
kpr: 'true'
devices: '{eth0,eth1}'
secondary-network: 'true'
tunnel: 'vxlan'
lb-mode: 'snat'
endpoint-routes: 'true'
Expand All @@ -115,6 +117,8 @@ jobs:
kernel: '5.15-20230810.091425'
kube-proxy: 'iptables'
kpr: 'true'
devices: '{eth0,eth1}'
secondary-network: 'true'
tunnel: 'disabled'
lb-mode: 'dsr'
endpoint-routes: 'true'
Expand All @@ -137,6 +141,8 @@ jobs:
kernel: 'bpf-next-20230810.091425'
kube-proxy: 'none'
kpr: 'true'
devices: '{eth0,eth1}'
secondary-network: 'true'
tunnel: 'disabled'
lb-mode: 'snat'
egress-gateway: 'true'
Expand All @@ -155,6 +161,8 @@ jobs:
kernel: '5.10-20230810.091425'
kube-proxy: 'iptables'
kpr: 'true'
devices: '{eth0,eth1}'
secondary-network: 'true'
tunnel: 'vxlan'
encryption: 'wireguard'
encryption-node: 'false'
Expand All @@ -167,6 +175,8 @@ jobs:
kernel: '5.15-20230810.091425'
kube-proxy: 'iptables'
kpr: 'true'
devices: '{eth0,eth1}'
secondary-network: 'true'
tunnel: 'disabled'
encryption: 'wireguard'
encryption-node: 'false'
Expand All @@ -179,6 +189,8 @@ jobs:
kernel: '6.0-20230810.091425'
kube-proxy: 'none'
kpr: 'true'
devices: '{eth0,eth1}'
secondary-network: 'true'
tunnel: 'vxlan'
encryption: 'wireguard'
encryption-node: 'true'
Expand All @@ -190,6 +202,8 @@ jobs:
kernel: 'bpf-next-20230810.091425'
kube-proxy: 'none'
kpr: 'true'
devices: '{eth0,eth1}'
secondary-network: 'true'
tunnel: 'disabled'
encryption: 'wireguard'
encryption-node: 'true'
Expand Down Expand Up @@ -224,6 +238,7 @@ jobs:
image-tag: ${{ steps.vars.outputs.sha }}
chart-dir: './install/kubernetes/cilium'
tunnel: ${{ matrix.tunnel }}
devices: ${{ matrix.devices }}
endpoint-routes: ${{ matrix.endpoint-routes }}
ipv6: ${{ matrix.ipv6 }}
kpr: ${{ matrix.kpr }}
Expand Down Expand Up @@ -310,11 +325,17 @@ jobs:
cmd: |
cd /host/

EXTRA=""
if [ "${{ matrix.secondary-network }}" = "true" ]; then
EXTRA="--secondary-network-iface=eth1"
fi

./cilium-cli connectivity test --include-unsafe-tests --collect-sysdump-on-failure \
--sysdump-hubble-flows-count=1000000 --sysdump-hubble-flows-timeout=5m \
--sysdump-output-filename "cilium-sysdump-${{ matrix.name }}-<ts>" \
--junit-file "cilium-junits/${{ env.job_name }} (${{ join(matrix.*, ', ') }}).xml" \
--junit-property github_job_step="Run tests (${{ join(matrix.*, ', ') }})"
--junit-property github_job_step="Run tests (${{ join(matrix.*, ', ') }})" \
\$EXTRA

./contrib/scripts/kind-down.sh

Expand Down
12 changes: 0 additions & 12 deletions test/k8s/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,18 +424,6 @@ Secondary Interface %s :: IPv4: (%s, %s), IPv6: (%s, %s)`,
}
})

SkipItIf(func() bool {
// Currently, KIND doesn't support multiple interfaces among nodes
return helpers.IsIntegration(helpers.CIIntegrationKind)
}, "Tests with secondary NodePort device", func() {
DeployCiliumOptionsAndDNS(kubectl, ciliumFilename, map[string]string{
"loadBalancer.mode": "snat",
"devices": fmt.Sprintf(`'{%s,%s}'`, ni.PrivateIface, helpers.SecondaryIface),
})

testNodePortExternal(kubectl, ni, true, false, false)
})

It("Tests with direct routing and DSR", func() {
DeployCiliumOptionsAndDNS(kubectl, ciliumFilename, map[string]string{
"loadBalancer.mode": "dsr",
Expand Down