Skip to content

Windows test branch for validating backport #1254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 28, 2022
Merged

Windows test branch for validating backport #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdff82f
Fixing a test failure
vakalapa Feb 18, 2022
10b0ed1
comment unused cmds
vakalapa Feb 18, 2022
b3e5a28
Fixing some behavior workarounds for HNS
vakalapa Feb 22, 2022
2930dd7
moving fan out one step up
vakalapa Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions npm/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ func NewRootCmd() *cobra.Command {

startCmd := newStartNPMCmd()

startCmd.AddCommand(newStartNPMControlplaneCmd())
startCmd.AddCommand(newStartNPMDaemonCmd())

rootCmd.AddCommand(newStartNPMControlplaneCmd())
rootCmd.AddCommand(newStartNPMDaemonCmd())
rootCmd.AddCommand(startCmd)

rootCmd.AddCommand(newDebugCmd())
Expand Down
1 change: 0 additions & 1 deletion npm/deploy/manifests/controller/azure-npm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ spec:
spec:
containers:
- args:
- start
- controlplane
ports:
- name: metrics
Expand Down
1 change: 0 additions & 1 deletion npm/deploy/manifests/daemon/azure-npm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ spec:
spec:
containers:
- args:
- start
- daemon
command:
- azure-npm
Expand Down
1 change: 1 addition & 0 deletions npm/pkg/dataplane/ipsets/ipsetmanager_windows_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (

"github.com/Azure/azure-container-networking/common"
"github.com/Azure/azure-container-networking/network/hnswrapper"
"github.com/Azure/azure-container-networking/npm/util"
testutils "github.com/Azure/azure-container-networking/test/utils"
"github.com/Microsoft/hcsshim/hcn"
"github.com/stretchr/testify/require"
Expand Down
7 changes: 6 additions & 1 deletion npm/pkg/dataplane/policies/policy_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ func (acl *ACLPolicy) convertToAclSettings() (*NPMACLPolSettings, error) {
return policySettings, ErrNamedPortsNotSupported
}

policySettings.RuleType = hcn.RuleTypeSwitch
policySettings.Id = acl.PolicyID
policySettings.Direction = getHCNDirection(acl.Direction)
policySettings.Action = getHCNAction(acl.Target)
Expand All @@ -82,8 +83,12 @@ func (acl *ACLPolicy) convertToAclSettings() (*NPMACLPolSettings, error) {
if !ok {
return policySettings, ErrProtocolNotSupported
}
policySettings.Protocols = protoNum

if protoNum == "256" {
policySettings.Protocols = ""
} else {
policySettings.Protocols = protoNum
}
// Ignore adding ruletype for now as there is a bug
// policySettings.RuleType = hcn.RuleTypeSwitch

Expand Down