Bug 1906517: OpenStack: Skip collecting info for empty subnet IDs #4474

mandre · 2020-12-10T17:26:02Z

Some clouds may return a generic 404 error instead of an
ErrResourceNotFound error, causing the installer to fail with:

FATAL failed to fetch Install Config: failed to generate asset "Install Config": failed to generate OpenStack cloud info: failed to fetch machine subnet info: Resource not found

We need to not gather subnet information unless a machine subnet was
provided.

Some clouds may return a generic 404 error instead of an `ErrResourceNotFound` error, causing the installer to fail with: FATAL failed to fetch Install Config: failed to generate asset "Install Config": failed to generate OpenStack cloud info: failed to fetch machine subnet info: Resource not found We need to not gather subnet information unless a machine subnet was provided.

openshift-ci-robot · 2020-12-10T17:26:09Z

@mandre: This pull request references Bugzilla bug 1906517, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.0) matches configured target release for branch (4.7.0)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1906517: OpenStack: Skip collecting info for empty subnet IDs

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

mandre · 2020-12-10T17:27:50Z

/label platform/openstack

ghost · 2020-12-11T08:25:57Z

/test e2e-openstack

pierreprinetti

What do you think about checking for the zero value one level down the stack, on line 156?

if ic.OpenStack.MachinesSubnet != "" {
	ci.MachinesSubnet, err = ci.getSubnet(ic.OpenStack.MachinesSubnet)
	if err != nil {
		return errors.Wrap(err, "failed to fetch machine subnet info")
	}
}

It would make it more explicit that you're leaving ci.MachinesSubnet unchanged, IMHO.

However, that's just a nit, and LGTM otherwise

openshift-ci-robot · 2020-12-15T11:23:46Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pierreprinetti

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~pkg/asset/installconfig/openstack/OWNERS~~ [pierreprinetti]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

pierreprinetti · 2020-12-15T11:25:48Z

/lgtm
/hold - feel free to cancel the hold after you've read my comment.

mandre · 2020-12-15T12:35:09Z

What do you think about checking for the zero value one level down the stack, on line 156?
It would make it more explicit that you're leaving ci.MachinesSubnet unchanged, IMHO.

I considered it, but I have a slight preference for returning early on invalid values rather than having this logic implemented in the calling function. Plus we're already using this pattern in ci.getFloatingIP() so why not being consistent.

/hold cancel

openshift-bot · 2020-12-15T12:49:26Z

/retest