Skip to content

Commit eb91e43

Browse files
authored
Merge pull request #5106 from npinaeva/mnp-endport
Multinetpol: update to the latest API version that adds endPort
2 parents ff971e2 + 042ac41 commit eb91e43

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1438
-124
lines changed

contrib/kind-common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ install_multus() {
413413

414414
install_mpolicy_crd() {
415415
echo "Installing multi-network-policy CRD ..."
416-
mpolicy_manifest="https://raw.githubusercontent.com/k8snetworkplumbingwg/multi-networkpolicy/master/scheme.yml"
416+
mpolicy_manifest="https://raw.githubusercontent.com/k8snetworkplumbingwg/multi-networkpolicy/refs/tags/v1.0.1/scheme.yml"
417417
run_kubectl apply -f "$mpolicy_manifest"
418418
}
419419

go-controller/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/gorilla/mux v1.8.0
2323
github.com/k8snetworkplumbingwg/govdpa v0.1.5-0.20230926073613-07c1031aea47
2424
github.com/k8snetworkplumbingwg/ipamclaims v0.4.0-alpha
25-
github.com/k8snetworkplumbingwg/multi-networkpolicy v0.0.0-20200914073308-0f33b9190170
25+
github.com/k8snetworkplumbingwg/multi-networkpolicy v1.0.1
2626
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.6.0
2727
github.com/k8snetworkplumbingwg/sriovnet v1.2.1-0.20230427090635-4929697df2dc
2828
github.com/mdlayher/arp v0.0.0-20220512170110-6706a2966875

go-controller/go.sum

Lines changed: 23 additions & 49 deletions
Large diffs are not rendered by default.

go-controller/pkg/ovn/base_network_controller_multipolicy.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ func convertMultiNetPolicyToNetPolicy(mpolicy *mnpapi.MultiNetworkPolicy, allowP
7777
ingress.Ports[j] = knet.NetworkPolicyPort{
7878
Protocol: mport.Protocol,
7979
Port: mport.Port,
80+
EndPort: mport.EndPort,
8081
}
8182
}
8283
ingress.From = make([]knet.NetworkPolicyPeer, len(mingress.From))
@@ -104,6 +105,7 @@ func convertMultiNetPolicyToNetPolicy(mpolicy *mnpapi.MultiNetworkPolicy, allowP
104105
egress.Ports[j] = knet.NetworkPolicyPort{
105106
Protocol: mport.Protocol,
106107
Port: mport.Port,
108+
EndPort: mport.EndPort,
107109
}
108110
}
109111
egress.To = make([]knet.NetworkPolicyPeer, len(megress.To))

go-controller/vendor/github.com/k8snetworkplumbingwg/multi-networkpolicy/NOTICE

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go-controller/vendor/github.com/k8snetworkplumbingwg/multi-networkpolicy/pkg/apis/k8s.cni.cncf.io/v1beta1/types.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go-controller/vendor/github.com/k8snetworkplumbingwg/multi-networkpolicy/pkg/apis/k8s.cni.cncf.io/v1beta1/zz_generated.deepcopy.go

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go-controller/vendor/github.com/k8snetworkplumbingwg/multi-networkpolicy/pkg/apis/k8s.cni.cncf.io/v1beta2/doc.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go-controller/vendor/github.com/k8snetworkplumbingwg/multi-networkpolicy/pkg/apis/k8s.cni.cncf.io/v1beta2/register.go

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go-controller/vendor/github.com/k8snetworkplumbingwg/multi-networkpolicy/pkg/apis/k8s.cni.cncf.io/v1beta2/types.go

Lines changed: 123 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)