This repository was archived by the owner on Jun 20, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 678
Fix weave-npc crash when named ports specified in the named ports #3375
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
Support for names ports in enhancement, but with this PR just adding more graceful failure. Fixes #3032
0f22ba9
to
d5e8647
Compare
bboreham
reviewed
Aug 10, 2018
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great! Couple of nits.
npc/analyser.go
Outdated
if !allPorts { | ||
for _, npProtocolPort := range ingressRule.Ports { | ||
if _, err := strconv.Atoi(port(npProtocolPort.Port)); err != nil { | ||
return nil, nil, nil, nil, errors.New("named ports in network policies in not support yet. Rejecting network policy from further processing") |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
npc/analyser.go
Outdated
if !allPorts { | ||
for _, npProtocolPort := range egressRule.Ports { | ||
if _, err := strconv.Atoi(port(npProtocolPort.Port)); err != nil { | ||
return nil, nil, nil, nil, errors.New("named ports in network policies in not support yet. Rejecting network policy from further processing") |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
brb
reviewed
Aug 14, 2018
npc/analyser.go
Outdated
@@ -50,6 +51,14 @@ func (ns *ns) analysePolicy(policy *networkingv1.NetworkPolicy) ( | |||
// If From is empty or missing, this rule matches all sources | |||
allSources := ingressRule.From == nil || len(ingressRule.From) == 0 | |||
|
|||
if !allPorts { | |||
for _, npProtocolPort := range ingressRule.Ports { |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
brb
approved these changes
Aug 17, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Support for names ports in enhancement, but with this PR just adding more graceful failure.
Fixes #3032