[Backport] [1.11] bump mesos-module to include the fix for coreos 1800.7.0 #3357
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
|
This repo has @mesosphere-mergebot integration. You can interact with the following commands.
|
|
@mesosphere-mergebot bump-ee |
GoelDeepak
force-pushed
the
deepak/1.11/coreos-1800.x
branch
from
16b94f1
to
a3fa56b
Compare
|
@mesosphere-mergebot bump-ee |
|
Enterprise Bump PR: mesosphere/dcos-enterprise/pull/3395 |
GoelDeepak
force-pushed
the
deepak/1.11/coreos-1800.x
branch
from
4ecb813
to
01dc3ac
Compare
|
@mesosphere-mergebot bump-ee |
|
Enterprise Bump mesosphere/dcos-enterprise/pull/3395 updated. |
GoelDeepak
force-pushed
the
deepak/1.11/coreos-1800.x
branch
from
39111dc
to
f064ad4
Compare
|
@mesosphere-mergebot bump-ee |
|
Enterprise Bump mesosphere/dcos-enterprise/pull/3395 updated. |
GoelDeepak
force-pushed
the
deepak/1.11/coreos-1800.x
branch
from
3b85c61
to
924fdd3
Compare
GoelDeepak
changed the title
|
@mesosphere-mergebot bump-ee |
|
Enterprise Bump mesosphere/dcos-enterprise/pull/3395 updated. |
|
@mesosphere-mergebot label Ready For Review |
|
@mesosphere-mergebot override-status teamcity/dcos/test/dcos-docker/static https://jira.mesosphere.com/browse/DCOS_OSS-2115 |
|
@mesosphere-mergebot label ship it |
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.
High-level description
Coreos 1800.7.0 comes with default docker version of 18.x which has modified its iptables CHAIN names from DOCKER-ISOLATION to DOCKER-ISOLATION-STAGE-1 and DOCKER-ISOLATION-STAGE-2 which broke mesos overlay module. This patch detects the CHAIN name before applying the iptables rule so that it could work for both old and newer docker versions.
Corresponding DC/OS tickets (obligatory)
These DC/OS JIRA ticket(s) must be updated (ideally closed) in the moment this PR lands:
Checklist for all PRs
CHANGES.mdor explain why this is not a user-facing change:Checklist for component/package updates:
If you are changing components or packages in DC/OS (e.g. you are bumping the sha or ref of anything underneath
packages), then in addition to the above please also include:PLEASE FILL IN THE TEMPLATE ABOVE / DO NOT REMOVE ANY SECTIONS ABOVE THIS LINE
Instructions and review process
What is the review process and when will my changes land?
All PRs require 2 approvals using GitHub's pull request reviews.
Reviewers should be:
It is best to proactively ask for 2 reviews by @mentioning the candidate reviewers in the PR comments area. The responsibility is on the developer submitting the PR to follow-up with reviewers and make sure a PR is reviewed in a timely manner. Once a PR has 2 ship-it's, no red reviews, and all tests are green it will be included in the next train.