Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

kvm: flannel networking #1563

Merged
merged 1 commit into from Nov 27, 2015
Merged

kvm: flannel networking #1563

merged 1 commit into from Nov 27, 2015

Conversation

jellonek
Copy link
Contributor

@jellonek jellonek commented Oct 7, 2015

Based on #1530

Provides flannel networking support in kvm flavor.

@ppalucki
Copy link
Contributor

What I miss is "follow up TODO list"

  • unittests - loadFlannelNetConftranformation
  • functionall tests - flannel integration tests if possible

Mask: net.IPMask(n.runtime.Mask),
}, chain); err != nil {
return nil, err
time.Sleep(time.Second / 2) // HACKHACKHACK - without this delay below changes in routes are not persistent
Copy link
Contributor

Choose a reason for hiding this comment

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

Have you been able to find out why this hack is needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, I had no time for this... Also I'm now on conference, so i'm less accessible...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Today I can not reproduce this error, and also after removing call to Sleep - everything works flawlessly... without any additional work.
So at start this required 2 workdays to debug problem and find some workaround for problem which... magically disappeared.

@jonboulle jonboulle modified the milestones: v0.11.0, v0.10.0 Oct 21, 2015
@jonboulle
Copy link
Contributor

@jellonek let us know when you might have time to work on this or if we can help shepherd it through

@jellonek
Copy link
Contributor Author

This PR is follow up on #1530 so (hopefully) tomorrow i'll do rebase there after few hours.

@jonboulle
Copy link
Contributor

thanks!

@jellonek jellonek force-pushed the jell/kvm-flannel branch 2 times, most recently from 09512fc to 5492741 Compare October 22, 2015 11:31
@jellonek
Copy link
Contributor Author

Both PRs are rebased.

@alban
Copy link
Member

alban commented Nov 13, 2015

@steveej can you review this?

@jellonek
Copy link
Contributor Author

@steveej Could You look at this?

}
}

return "", fmt.Errorf("pod has no default network!")
Copy link
Contributor

Choose a reason for hiding this comment

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

This would be the case if --net=none is chosen, or are there other cases? Do we warn the user at this point?

Making sure: does the kvm flavor load the default-restricted network if the user passes in other network names?

@alban
Copy link
Member

alban commented Nov 27, 2015

It should be rebased again, now that #1530 is merged.

func (t testNetDescriber) Mask() net.IP { return t.mask }
func (t testNetDescriber) IfName() string { return t.ifName }
func (t testNetDescriber) IPMasq() bool { return t.ipMasq }
func (t testNetDescriber) HostIP() net.IP { return t.hostIP }
Copy link
Contributor

Choose a reason for hiding this comment

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

WRT my previous comment: could this be used instead of Gateway()?

@jellonek
Copy link
Contributor Author

@steveej Your comments are interesting (and I have to address them, but in separate issue IMO) but are disconnected from this PR. It's because this PR was based on #1530 where this comments would be more adequate.

I'll make a separate PR with cleanup in kvm flavor (docstrings are outdated, --net parameter handling in kvm flavor should be reworked, and so on).

@steveej
Copy link
Contributor

steveej commented Nov 27, 2015

ACK. If semaphoreci turns green so we know it doesn't break things we should merge it an iterate through the next PR(s) in short term.

@alban
Copy link
Member

alban commented Nov 27, 2015

@steveej @jellonek semaphoreci is green! Should we take it for the v0.12.0 release today as well?

@jellonek
Copy link
Contributor Author

IMO yes.

alban added a commit that referenced this pull request Nov 27, 2015
@alban alban merged commit f5b9f84 into rkt:master Nov 27, 2015
@jellonek jellonek deleted the jell/kvm-flannel branch November 27, 2015 15:10
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants