Avoid allocating NPL port if Host Port is defined #2024
Merged
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
Codecov Report
@@ Coverage Diff @@
## main #2024 +/- ##
==========================================
+ Coverage 55.20% 62.33% +7.13%
==========================================
Files 268 268
Lines 20237 20241 +4
==========================================
+ Hits 11172 12618 +1446
+ Misses 7873 6315 -1558
- Partials 1192 1308 +116
Flags with carried forward coverage won't be shown. Click here to find out more.
|
jianjuns
reviewed
Apr 5, 2021
antoninbas
reviewed
Apr 5, 2021
| @@ -370,6 +370,24 @@ func TestPodAddMultiPort(t *testing.T) { | |||
| assert.True(t, testData.portTable.RuleExists(defaultPodIP, newPort)) | |||
| } | |||
|
|
|||
| // TestPodAdHostPort creates a Pod with host ports and verifies that the Pod's NPL annotation | |||
There was a problem hiding this comment.
typo: s/TestPodAdHostPort/TestPodAddHostPort
| if err != nil { | ||
| return fmt.Errorf("failed to add rule for Pod %s: %v", key, err) | ||
| if int(cport.HostPort) > 0 { | ||
| klog.V(2).Infof("Host Port is defined for Pod, thus extra NPL port is not allocated: %s", key) |
There was a problem hiding this comment.
maybe this should be V(4)
| if err != nil { | ||
| return fmt.Errorf("failed to add rule for Pod %s: %v", key, err) | ||
| if int(cport.HostPort) > 0 { | ||
| klog.V(2).Infof("Host Port is defined for Pod, thus extra NPL port is not allocated: %s", key) |
There was a problem hiding this comment.
maybe a bit more context is needed in the log message (e.g. the container port), since a Pod can have multiple containers, with multiple ports, and hostPort is specific to a given port?
There was a problem hiding this comment.
Added container name
|
/test-all |
|
Fixes: #1930 |
|
/test-all |
antoninbas
previously approved these changes
Apr 8, 2021
When Host Port is defined, use same port in NPL annotation, without reserving port from NPL port range. Avoid adding redundant IP table entry in NPL code. Fixes: #1930
|
/skip-all The diff is the same, but the author information for the commit had to be updated |
antoninbas
approved these changes
Apr 8, 2021
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.
When Host Port is defined, use same port in NPL annotation, without
reserving port from NPL port range. Avoid adding redundant IP table
entry in NPL code.