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

daemon: fix panic for cilium status in IPv6 only cluster #12221

Merged
merged 1 commit into from Jun 22, 2020

Conversation

rolinh
Copy link
Member

@rolinh rolinh commented Jun 22, 2020

This commit fixes a panic that occurs when calling getMasqueradingStatus() in IPv6 only clusters. It's a regression that
was introduced in 4197021 as datapath.RemoteSNATDstAddrExclusionCIDR() returns <nil> on IPv6 only clusters.

@rolinh rolinh added area/daemon Impacts operation of the Cilium daemon. release-note/bug This PR fixes an issue in a previous release of Cilium. needs-backport/1.8 labels Jun 22, 2020
@rolinh rolinh requested review from borkmann and a team June 22, 2020 11:20
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.8.0 Jun 22, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.8.0 Jun 22, 2020
@rolinh
Copy link
Member Author

rolinh commented Jun 22, 2020

test-me-please

@coveralls
Copy link

coveralls commented Jun 22, 2020

Coverage Status

Coverage increased (+0.04%) to 37.172% when pulling 9431adf on pr/rolinh/daemon-fix-masquerade-status-ipv6-only into 6501817 on master.

This commit fixes a panic that occurs when calling
`getMasqueradingStatus()` in IPv6 only clusters. It fixes a regression
that was introduced in `4197021` as
`datapath.RemoteSNATDstAddrExclusionCIDR()` returns `<nil>` on IPv6 only
clusters.

Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
@rolinh rolinh force-pushed the pr/rolinh/daemon-fix-masquerade-status-ipv6-only branch from b150d64 to 9431adf Compare June 22, 2020 12:45
@rolinh
Copy link
Member Author

rolinh commented Jun 22, 2020

test-me-please

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 22, 2020
@borkmann borkmann merged commit 01754bb into master Jun 22, 2020
1.8.0 automation moved this from In progress to Merged Jun 22, 2020
@borkmann borkmann deleted the pr/rolinh/daemon-fix-masquerade-status-ipv6-only branch June 22, 2020 18:35
This was referenced Jun 24, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.8 in 1.8.0 Jun 24, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.8 to Backport done to v1.8 in 1.8.0 Jun 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/daemon Impacts operation of the Cilium daemon. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
No open projects
1.8.0
  
Merged
1.8.0
Backport done to v1.8
Development

Successfully merging this pull request may close these issues.

None yet

5 participants