Skip to content

cherry-pick of #841: fix test failures on capz clusters #905

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
k8s-ci-robot merged 1 commit into from
Nov 17, 2021
Merged

cherry-pick of #841: fix test failures on capz clusters #905

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion tests/e2e/network/standard_lb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,9 @@ var _ = Describe("[StandardLoadBalancer] Standard load balancer", func() {
}
}
}
Expect(len(outboundRuleIPs)).NotTo(Equal(0))
if len(outboundRuleIPs) == 0 {
Skip("skip validating outbound IPs since outbound rules are not configured on SLB")
}

podTemplate := createPodGetIP()
err = utils.CreatePod(cs, ns.Name, podTemplate)
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/utils/network_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ func SelectAvailablePrivateIP(tc *AzureTestClient) (string, error) {
if len(*vNet.Subnets) > 1 {
for _, sn := range *vNet.Subnets {
// if there is more than one subnet, select the first one we find.
if !strings.Contains(*sn.Name, "controlplane") {
if !strings.Contains(*sn.Name, "controlplane") && !strings.Contains(*sn.Name, "control-plane") {
subnet = *sn.AddressPrefix
break
}
Expand Down