Determine fixedip during nodeup directly #9560
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
area/nodeup
area/provider/openstack
olemarkus
force-pushed
the
openstack-fixed-ip
branch
3 times, most recently
from
9288d1b to
63fa70a
Compare
|
First commit message has typo "defauls" |
johngmyers
reviewed
Jul 13, 2020
olemarkus
force-pushed
the
openstack-fixed-ip
branch
from
63fa70a to
1ec4a77
Compare
|
/hold |
k8s-ci-robot
added
the
do-not-merge/hold
olemarkus
force-pushed
the
openstack-fixed-ip
branch
from
1ec4a77 to
f26c9ef
Compare
zetaab
approved these changes
Jul 23, 2020
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: olemarkus, zetaab 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:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
|
Retrying the MacOS GHA job fixed the failure but there's now a merge conflict |
k8s-ci-robot
added
the
needs-rebase
olemarkus
force-pushed
the
openstack-fixed-ip
branch
from
f26c9ef to
7b45864
Compare
k8s-ci-robot
added
needs-rebase
olemarkus
force-pushed
the
openstack-fixed-ip
branch
from
7b45864 to
c143b18
Compare
k8s-ci-robot
removed
the
needs-rebase
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
rifelpet
reviewed
Aug 3, 2020
pkg/model/openstackmodel/network.go
Outdated
| @@ -50,6 +50,10 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error { | |||
| } | |||
|
|
|||
| needRouter := true | |||
| //Do not need router if there is no external network | |||
| if b.Cluster.Spec.CloudConfig.Openstack.Router.ExternalNetwork == nil { | |||
There was a problem hiding this comment.
I think you'll want to do additional checking here to avoid a nil pointer dereference
There was a problem hiding this comment.
Yep. Thanks for catching.
added 2 commits
August 4, 2020 08:22
added 4 commits
August 4, 2020 08:22
It takes some seconds for the node to be created and the (fixed) ip, so we need to retry this operation. Also need to increase the number of retries quite a bit in order to wait long enough.
olemarkus
force-pushed
the
openstack-fixed-ip
branch
from
c143b18 to
6b81916
Compare
|
/retest |
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
/retest |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed in #9554
This will break the task dependency cycle. It is a bit hackish with directly using protokube-code. That part should be moved to something shared, but perhaps best done in a followup PR?