ClusterNetworkPolicy: support generic protocols #11804
There are no files selected for viewing
This file contains hidden or 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 file contains hidden or 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 file contains hidden or 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 file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| // Copyright (c) 2025-2026 Tigera, Inc. All rights reserved. | ||
|
|
||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
|
|
@@ -165,15 +165,15 @@ func k8sClusterNetPolIngressRuleToCalico(rule clusternetpol.ClusterNetworkPolicy | |
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return combinePortsWithCNPIngressPeers(rule.Protocols, rule.From, rule.Name, action) | ||
| } | ||
|
|
||
| func k8sClusterNetPolEgressRuleToCalico(rule clusternetpol.ClusterNetworkPolicyEgressRule) ([]apiv3.Rule, error) { | ||
| action, err := K8sClusterNetworkPolicyActionToCalico(rule.Action) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return combinePortsWithCNPEgressPeers(rule.Protocols, rule.To, rule.Name, action) | ||
| } | ||
|
|
||
| func K8sClusterNetworkPolicyActionToCalico(action clusternetpol.ClusterNetworkPolicyRuleAction) (apiv3.Action, error) { | ||
|
|
@@ -189,12 +189,12 @@ func K8sClusterNetworkPolicyActionToCalico(action clusternetpol.ClusterNetworkPo | |
| } | ||
|
|
||
| func combinePortsWithCNPIngressPeers( | ||
| cnpProtocols []clusternetpol.ClusterNetworkPolicyProtocol, | ||
| cnpPeers []clusternetpol.ClusterNetworkPolicyIngressPeer, | ||
| ruleName string, | ||
| action apiv3.Action, | ||
| ) (rules []apiv3.Rule, err error) { | ||
| protocolPorts, sortedProtocols, err := unpackCNPProtocols(cnpProtocols) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
@@ -248,12 +248,12 @@ func combinePortsWithCNPIngressPeers( | |
| } | ||
|
|
||
| func combinePortsWithCNPEgressPeers( | ||
| cnpProtocols []clusternetpol.ClusterNetworkPolicyProtocol, | ||
| cnpPeers []clusternetpol.ClusterNetworkPolicyEgressPeer, | ||
| ruleName string, | ||
| action apiv3.Action, | ||
| ) (rules []apiv3.Rule, err error) { | ||
| protocolPorts, sortedProtocols, err := unpackCNPProtocols(cnpProtocols) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
@@ -317,20 +317,20 @@ func combinePortsWithCNPEgressPeers( | |
| return rules, nil | ||
| } | ||
|
|
||
| func unpackCNPProtocols(cnpProtocols []clusternetpol.ClusterNetworkPolicyProtocol) ( | ||
| map[string][]numorstring.Port, | ||
| []string, error, | ||
| ) { | ||
| // If there are no ports, represent that as zero struct. | ||
| protocols := []clusternetpol.ClusterNetworkPolicyProtocol{{}} | ||
| if cnpProtocols != nil && len(cnpProtocols) != 0 { | ||
| protocols = cnpProtocols | ||
| } | ||
|
|
||
| protocolPorts := map[string][]numorstring.Port{} | ||
|
|
||
| for _, p := range protocols { | ||
| protocol, calicoPort, err := k8sCNPPortToCalicoFields(&p) | ||
| if err != nil { | ||
| return nil, nil, fmt.Errorf("failed to parse k8s port: %s", err) | ||
| } | ||
|
|
@@ -354,61 +354,63 @@ func unpackCNPPorts(k8sPorts *[]clusternetpol.ClusterNetworkPolicyPort) ( | |
| } | ||
| } | ||
|
|
||
| protos := make([]string, 0, len(protocolPorts)) | ||
| for p := range protocolPorts { | ||
| protos = append(protos, p) | ||
| } | ||
| // Ensure deterministic output | ||
| sort.Strings(protos) | ||
| return protocolPorts, protos, nil | ||
| } | ||
|
|
||
| func k8sCNPPortToCalicoFields(cnpProto *clusternetpol.ClusterNetworkPolicyProtocol) ( | ||
| protocol *numorstring.Protocol, | ||
| dstPort *numorstring.Port, | ||
| err error, | ||
| ) { | ||
| // If no port info, return zero values for all fields (protocol, dstPorts). | ||
| if cnpProto == nil { | ||
| return | ||
| } | ||
|
|
||
| if cnpProto.TCP != nil { | ||
| dstPort, err = k8sCNPPortToCalico(cnpProto.TCP.DestinationPort) | ||
| p := numorstring.ProtocolFromString(numorstring.ProtocolTCP) | ||
| protocol = &p | ||
| return | ||
| } | ||
|
|
||
| if cnpProto.UDP != nil { | ||
| dstPort, err = k8sCNPPortToCalico(cnpProto.UDP.DestinationPort) | ||
| p := numorstring.ProtocolFromString(numorstring.ProtocolUDP) | ||
| protocol = &p | ||
| return | ||
| } | ||
|
Member
There was a problem hiding this comment. What about named ports? We should at least fail/skip the rule if the proto struct has an unknown field, I think.
Member
Author
There was a problem hiding this comment. As we discussed, I updated the code to return error for named ports for the moment. |
||
|
|
||
| if cnpProto.SCTP != nil { | ||
| dstPort, err = k8sCNPPortToCalico(cnpProto.SCTP.DestinationPort) | ||
| p := numorstring.ProtocolFromString(numorstring.ProtocolSCTP) | ||
|
mazdakn marked this conversation as resolved.
|
||
| protocol = &p | ||
| return | ||
| } | ||
|
|
||
| return | ||
| } | ||
|
|
||
| func k8sCNPPortToCalico(port *clusternetpol.Port) (*numorstring.Port, error) { | ||
| // Only one of the Number or Range is set. | ||
| if port.Number != 0 { | ||
| p := numorstring.SinglePort(uint16(port.Number)) | ||
| return &p, nil | ||
| } | ||
|
mazdakn marked this conversation as resolved.
|
||
| if port.Range != nil { | ||
| p, err := numorstring.PortFromRange(uint16(port.Range.Start), uint16(port.Range.End)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &p, nil | ||
| } | ||
| return nil, nil | ||
| } | ||
|
|
||
| func k8sClusterNetworkPolicyToCalicoMetadata(ruleName string) *apiv3.RuleMetadata { | ||
|
|
||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.