Skip to content

[19.03] revert controller: Check if IPTables is enabled for arrangeUserFilterRule ENGCORE-1114#2470

Merged
justincormack merged 2 commits intomoby:bump_19.03from
thaJeztah:19.03_revert_iptables_check
Oct 11, 2019
Merged

[19.03] revert controller: Check if IPTables is enabled for arrangeUserFilterRule ENGCORE-1114#2470
justincormack merged 2 commits intomoby:bump_19.03from
thaJeztah:19.03_revert_iptables_check

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Oct 11, 2019 •
edited by atlassian bot
Loading

@thaJeztah
[19.03] Revert "Move hasIPTablesEnabled check into firewall_linux.go"
8cdd5a3 
This reverts commit a232658.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
[19.03] Revert "controller: Check if IPTables is enabled for arrangeU…
5cbb5de 
…serFilterRule"

This reverts commit 5e34060.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@arkodg
Copy link
Copy Markdown
Contributor

arkodg commented Oct 11, 2019

PTAL @selansen @mavenugo

@kolyshkin
Copy link
Copy Markdown
Contributor

kolyshkin commented Oct 11, 2019

This is not a backport of #2466 to 19.03 branch, but it's identical, right? I look at the changes and they seem to be the same.

@kolyshkin
Copy link
Copy Markdown
Contributor

kolyshkin commented Oct 11, 2019

unit-tests CI fails:

read tcp 172.27.0.3:34670->104.196.25.67:2376: read: connection timed out
make: *** [Makefile:123: unit-tests] Error 1
Exited with code 2

not sure where it's coming from

@selansen
Copy link
Copy Markdown
Contributor

selansen commented Oct 11, 2019

Re running CI

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Oct 11, 2019

This is not a backport of #2466 to 19.03 branch, but it's identical, right? I look at the changes and they seem to be the same.

@kolyshkin ah, yes, you're right; also see #2467. Perhaps you have thought on that

@andrewhsu andrewhsu changed the title [19.03] revert controller: Check if IPTables is enabled for arrangeUserFilterRule [19.03] revert controller: Check if IPTables is enabled for arrangeUserFilterRule ENGCORE-1114 Oct 11, 2019
@selansen
Copy link
Copy Markdown
Contributor

selansen commented Oct 11, 2019

@kolyshkin , All green now

selansen
selansen approved these changes Oct 11, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@selansen selansen left a comment

Choose a reason for hiding this comment

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

LGTM

kolyshkin
kolyshkin approved these changes Oct 11, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

LGTM

@justincormack justincormack merged commit 3eb3938 into moby:bump_19.03 Oct 11, 2019
@thaJeztah thaJeztah deleted the 19.03_revert_iptables_check branch October 11, 2019 19:03
This was referenced Oct 11, 2019
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

3 more reviewers

@kolyshkin kolyshkin kolyshkin approved these changes

@arkodg arkodg arkodg approved these changes

@selansen selansen selansen approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@thaJeztah @arkodg @kolyshkin @selansen @justincormack