Skip to content
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.

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

Adding compatibility for marathon 1.5 #3505

Merged
merged 9 commits into from
Jul 3, 2018
Merged

Adding compatibility for marathon 1.5 #3505

merged 9 commits into from
Jul 3, 2018

Conversation

TrevinTeacutter
Copy link

@TrevinTeacutter TrevinTeacutter commented Jun 17, 2018

What does this PR do?

Committing changes we made in our private repo to support Marathon 1.5 in Traefik.
We have been using this with marathon 1.5 for since Traefik 1.5 (this also supports Marathon 1.4).

I have not been able to test that the backwards compatibility since we rebased these changes with 1.6 of Traefik.

Updating go-marathon is a requirement for this.

Motivation

Fixes #2115

More

  • Added/updated tests
  • Added/updated documentation

@mmatur
Copy link
Member

mmatur commented Jun 18, 2018

@containous/marathon WDYT ?

@timoreimann
Copy link
Contributor

Looks reasonable, but we should test it against both Marathon 1.5 and <1.5 -- ideally by having a dedicated integration test.

@TrevinTeacutter
Copy link
Author

Working on trying to get integration tests, but getting the containers to play nice since Marathon 1.5 increased the mesos version requirements is being a bit more painful that I expected.

For documentation, is there anything I need to add? Not sure whether there was anything around the fact that only Marathon <=1.4 is supported.

@timoreimann
Copy link
Contributor

@TrevinTeacutter

For documentation, is there anything I need to add? Not sure whether there was anything around the fact that only Marathon <=1.4 is supported.

I think the most important aspect we should check is whether there are any Marathon-specific parameters for which the behavior has changed with 1.5. Specifically, I'm wondering about forceTaskHostname.

Would you mind going over the Marathon backend documentation and the Marathon user guide and verify if anything might not be correct with 1.5 anymore?

@TrevinTeacutter
Copy link
Author

The only non-passive change that I know of was around networking related structures. I went over all the documentation and didn't notice anything that should be broken with 1.5 other than routing information.

Copy link
Member

@juliens juliens left a comment

Choose a reason for hiding this comment

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

👏

@@ -138,3 +138,51 @@ func (s *MarathonSuite) TestConfigurationUpdate(c *check.C) {
err = try.GetRequest("http://127.0.0.1:8000/app", 30*time.Second, try.StatusCodeIs(http.StatusOK))
c.Assert(err, checker.IsNil)
}

// func (s *MarathonSuite) TestHostNetwork(c *check.C) {
Copy link
Member

Choose a reason for hiding this comment

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

Could you remove this method or uncomment it?

Copy link
Member

@juliens juliens left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@mmatur mmatur left a comment

Choose a reason for hiding this comment

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

LGTM

@timoreimann timoreimann self-requested a review July 3, 2018 20:58
Copy link
Contributor

@timoreimann timoreimann left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants