From 8c792a73110eed116dd31b4a895566224503fb57 Mon Sep 17 00:00:00 2001 From: rejain456 Date: Wed, 8 Jan 2025 16:43:50 -0800 Subject: [PATCH 1/4] added an additional field in network contract from cns to cni --- cns/NetworkContainerContract.go | 3 +++ common/config.go | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/cns/NetworkContainerContract.go b/cns/NetworkContainerContract.go index 394f871f09..fee93c5b1e 100644 --- a/cns/NetworkContainerContract.go +++ b/cns/NetworkContainerContract.go @@ -8,6 +8,7 @@ import ( "strings" "github.com/Azure/azure-container-networking/cns/types" + acn "github.com/Azure/azure-container-networking/common" "github.com/Azure/azure-container-networking/crd/nodenetworkconfig/api/v1alpha" "github.com/google/uuid" "github.com/pkg/errors" @@ -503,6 +504,8 @@ type PodIpInfo struct { Routes []Route // PnpId is set for backend interfaces, Pnp Id identifies VF. Plug and play id(pnp) is also called as PCI ID PnPID string + // Default Deny ACL's to configure on HNS endpoints for Swiftv2 window nodes + DefaultDenyACL []acn.KVPair } type HostIPInfo struct { diff --git a/common/config.go b/common/config.go index 3434c2e2e1..87ec27ae11 100644 --- a/common/config.go +++ b/common/config.go @@ -3,6 +3,8 @@ package common +import "encoding/json" + // Command line options. const ( // Operating environment. @@ -146,3 +148,9 @@ const ( // OptCNIConflistScenarioAlias "shorthand" for the cni conflist scenairo, see above OptCNIConflistScenarioAlias = "cniconflistscenario" ) + +// KVPair represents a K-V pair of a json object. +type KVPair struct { + Name string `json:"name"` + Value json.RawMessage `json:"value"` +} From 0b75325f48e489b88fc4295e4027cbd334a63b32 Mon Sep 17 00:00:00 2001 From: rejain456 Date: Wed, 8 Jan 2025 18:47:46 -0800 Subject: [PATCH 2/4] updated default deny acl type --- cns/NetworkContainerContract.go | 4 ++-- common/config.go | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/cns/NetworkContainerContract.go b/cns/NetworkContainerContract.go index fee93c5b1e..f32492b373 100644 --- a/cns/NetworkContainerContract.go +++ b/cns/NetworkContainerContract.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/Azure/azure-container-networking/cns/types" - acn "github.com/Azure/azure-container-networking/common" "github.com/Azure/azure-container-networking/crd/nodenetworkconfig/api/v1alpha" + "github.com/Azure/azure-container-networking/network/policy" "github.com/google/uuid" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" @@ -505,7 +505,7 @@ type PodIpInfo struct { // PnpId is set for backend interfaces, Pnp Id identifies VF. Plug and play id(pnp) is also called as PCI ID PnPID string // Default Deny ACL's to configure on HNS endpoints for Swiftv2 window nodes - DefaultDenyACL []acn.KVPair + DefaultDenyACL []policy.Policy } type HostIPInfo struct { diff --git a/common/config.go b/common/config.go index 87ec27ae11..3434c2e2e1 100644 --- a/common/config.go +++ b/common/config.go @@ -3,8 +3,6 @@ package common -import "encoding/json" - // Command line options. const ( // Operating environment. @@ -148,9 +146,3 @@ const ( // OptCNIConflistScenarioAlias "shorthand" for the cni conflist scenairo, see above OptCNIConflistScenarioAlias = "cniconflistscenario" ) - -// KVPair represents a K-V pair of a json object. -type KVPair struct { - Name string `json:"name"` - Value json.RawMessage `json:"value"` -} From 89da8f12eb2330005f72e952a246f28bac9cc2c8 Mon Sep 17 00:00:00 2001 From: rejain456 Date: Wed, 8 Jan 2025 18:48:37 -0800 Subject: [PATCH 3/4] updated name of acl --- cns/NetworkContainerContract.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cns/NetworkContainerContract.go b/cns/NetworkContainerContract.go index f32492b373..ef2d887db8 100644 --- a/cns/NetworkContainerContract.go +++ b/cns/NetworkContainerContract.go @@ -505,7 +505,7 @@ type PodIpInfo struct { // PnpId is set for backend interfaces, Pnp Id identifies VF. Plug and play id(pnp) is also called as PCI ID PnPID string // Default Deny ACL's to configure on HNS endpoints for Swiftv2 window nodes - DefaultDenyACL []policy.Policy + EdpointPolicies []policy.Policy } type HostIPInfo struct { From 618e4bf413705ca93cf65ae92e0cc8aedfac0142 Mon Sep 17 00:00:00 2001 From: rejain456 Date: Wed, 8 Jan 2025 19:18:34 -0800 Subject: [PATCH 4/4] fixed spelling --- cns/NetworkContainerContract.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cns/NetworkContainerContract.go b/cns/NetworkContainerContract.go index ef2d887db8..c93187a0e2 100644 --- a/cns/NetworkContainerContract.go +++ b/cns/NetworkContainerContract.go @@ -505,7 +505,7 @@ type PodIpInfo struct { // PnpId is set for backend interfaces, Pnp Id identifies VF. Plug and play id(pnp) is also called as PCI ID PnPID string // Default Deny ACL's to configure on HNS endpoints for Swiftv2 window nodes - EdpointPolicies []policy.Policy + EndpointPolicies []policy.Policy } type HostIPInfo struct {