8000 cli: bugfix connectivity perf command by marseel · Pull Request #35063 · cilium/cilium · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

cli: bugfix connectivity perf command #35063

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

Merged
merged 1 commit into from
Sep 28, 2024
Merged

cli: bugfix connectivity perf command #35063

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions cilium-cli/connectivity/check/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,13 +1157,7 @@ func (ct *ConnectivityTest) deployPerf(ctx context.Context) error {

// deploymentList returns 2 lists of Deployments to be used for running tests with.
func (ct *ConnectivityTest) deploymentList() (srcList []string, dstList []string) {
if !ct.params.Perf {
srcList = []string{clientDeploymentName, client2DeploymentName, echoSameNodeDeploymentName}
if ct.params.MultiCluster == "" && !ct.params.SingleNode {
srcList = append(srcList, client3DeploymentName)
}
} else if ct.params.TestNamespaceIndex == 0 {
srcList = []string{}
if ct.params.Perf && ct.params.TestNamespaceIndex == 0 {
if ct.params.PerfParameters.PodNet {
srcList = append(srcList, perfClientDeploymentName)
srcList = append(srcList, perfClientAcrossDeploymentName)
Expand All @@ -1174,6 +1168,14 @@ func (ct *ConnectivityTest) deploymentList() (srcList []string, dstList []string
srcList = append(srcList, perfClientHostNetAcrossDeploymentName)
srcList = append(srcList, perfServerHostNetDeploymentName)
}
// Return early, we can't run regular connectivity tests
// along perf test
return
}

srcList = []string{clientDeploymentName, client2DeploymentName, echoSameNodeDeploymentName}
if ct.params.MultiCluster == "" && !ct.params.SingleNode {
srcList = append(srcList, client3DeploymentName)
}

if ct.params.IncludeConnDisruptTest && ct.params.TestNamespaceIndex == 0 {
Expand All @@ -1187,7 +1189,7 @@ func (ct *ConnectivityTest) deploymentList() (srcList []string, dstList []string
dstList = append(dstList, testConnDisruptClientDeploymentName)
}

if (ct.params.MultiCluster != "" || !ct.params.SingleNode) && !ct.params.Perf {
if ct.params.MultiCluster != "" || !ct.params.SingleNode {
dstList = append(dstList, echoOtherNodeDeploymentName)
}

Expand Down
Loading
0