Skip to content

Improve nil pointer checks and consider VPC overlay networks for Nutanix #1193

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
Feb 18, 2022
Merged

Improve nil pointer checks and consider VPC overlay networks for Nutanix #1193

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
24 changes: 10 additions & 14 deletions pkg/cloudprovider/provider/nutanix/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,11 @@ func getSubnetByName(client *ClientSet, name, clusterID string) (*nutanixv3.Subn
}

for _, subnet := range subnets.Entities {
if *subnet.Status.Name == name && *subnet.Status.ClusterReference.UUID == clusterID {
return subnet, nil
if subnet != nil && subnet.Status != nil && subnet.Status.Name != nil && *subnet.Status.Name == name {
// some subnet types (e.g. VPC overlays) do not come with a cluster reference; we don't need to check them
if subnet.Status.ClusterReference == nil || (subnet.Status.ClusterReference.UUID != nil && *subnet.Status.ClusterReference.UUID == clusterID) {
return subnet, nil
}
}
}

Expand All @@ -260,15 +263,7 @@ func getProjectByName(client *ClientSet, name string) (*nutanixv3.Project, error
}

for _, project := range projects.Entities {
if project == nil {
return nil, errors.New("project is nil")
}

if project.Status == nil {
return nil, errors.New("project status is nil")
}

if project.Status.Name == name {
if project != nil && project.Status != nil && project.Status.Name == name {
return project, nil
}
}
Expand All @@ -295,7 +290,7 @@ func getClusterByName(client *ClientSet, name string) (*nutanixv3.ClusterIntentR
}

for _, cluster := range clusters.Entities {
if *cluster.Status.Name == name {
if cluster.Status != nil && cluster.Status.Name != nil && *cluster.Status.Name == name {
return cluster, nil
}
}
Expand All @@ -322,7 +317,7 @@ func getImageByName(client *ClientSet, name string) (*nutanixv3.ImageIntentRespo
}

for _, image := range images.Entities {
if *image.Status.Name == name {
if image.Status != nil && image.Status.Name != nil && *image.Status.Name == name {
return image, nil
}
}
Expand All @@ -343,7 +338,8 @@ func getVMByName(client *ClientSet, name string, projectID *string) (*nutanixv3.

for _, vm := range vms.Entities {
if *vm.Status.Name == name {
if projectID != nil && *vm.Metadata.ProjectReference.UUID != *projectID {
if projectID != nil && vm.Metadata != nil && vm.Metadata.ProjectReference != nil &&
vm.Metadata.ProjectReference.UUID != nil && *vm.Metadata.ProjectReference.UUID != *projectID {
continue
}
return vm, nil
Expand Down
4 changes: 4 additions & 0 deletions pkg/cloudprovider/provider/nutanix/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,10 @@ func (p *provider) cleanup(machine *clusterv1alpha1.Machine, data *cloudprovider
return false, err
}

if vm.Metadata == nil || vm.Metadata.UUID == nil {
return false, fmt.Errorf("failed to get valid VM metadata for machine '%s'", machine.Name)
}

// TODO: figure out if VM is already in deleting state

resp, err := client.Prism.V3.DeleteVM(*vm.Metadata.UUID)
Expand Down