Skip to content

fix for pr590 wrong parameter for a user provider network #594

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

Closed
wants to merge 6 commits into from
Closed

fix for pr590 wrong parameter for a user provider network #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a3188f4
fix for pr590 wrong parameter for a user provider network
pramchan Jul 20, 2020
32c161f
nit: Add default egress rule description
jichenjc Jul 13, 2020
edb84c1
Merge pull request #585 from jichenjc/add_description
k8s-ci-robot Jul 22, 2020
4fd3003
Merge https://github.com/pramchan/cluster-api-provider-openstack
pramchan Jul 22, 2020
8b30361
re-fixing for pr590 wrong parameter fora user provider newtork #594
pramchan Jul 22, 2020
7cee975
refix for pr590 wrong parameter for a user provider network #594
pramchan Jul 22, 2020
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
11 changes: 10 additions & 1 deletion controllers/openstackcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,18 @@ func (r *OpenStackClusterReconciler) reconcileNetworkComponents(log logr.Logger,

netOpts := networks.ListOpts(openStackCluster.Spec.Network)
networkList, err := networkingService.GetNetworksByFilter(&netOpts)
if err != nil && len(networkList) == 0 {
Copy link
Contributor

@jichenjc jichenjc Jul 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this change really fix the nil reference in the bug?

<<<<<<< Updated upstream
if len(networkList) == 0 {
return errors.Errorf("failed to find any network: %v", err)
}
=======
>>>>>>> Stashed changes
if err != nil {
Copy link
Contributor

@hidekazuna hidekazuna Jul 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is better to check err is nil or not before checking networkList == 0.

return errors.Errorf("failed to find network: %v", err)
}
if len(networkList) == 0 {
return errors.Errorf("failed to find any network: %v", err)
}
if len(networkList) > 1 {
return errors.Errorf("failed to find only one network (result: %v): %v", networkList, err)
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/cloud/services/networking/securitygroups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const (
var defaultRules = []infrav1.SecurityGroupRule{
{
Direction: "egress",
Description: "Full open",
EtherType: "IPv4",
PortRangeMin: 0,
PortRangeMax: 0,
Expand All @@ -43,6 +44,7 @@ var defaultRules = []infrav1.SecurityGroupRule{
},
{
Direction: "egress",
Description: "Full open",
EtherType: "IPv6",
PortRangeMin: 0,
PortRangeMax: 0,
Expand Down