From e5e222b5ae5cdb7b006cb130f3e9e293dd93f8dc Mon Sep 17 00:00:00 2001 From: Vamsi Kalapala Date: Fri, 29 Oct 2021 14:04:13 -0700 Subject: [PATCH 1/3] [NPM] Fixing a windows NPM build issue --- npm/pkg/dataplane/policies/policy_windows.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/pkg/dataplane/policies/policy_windows.go b/npm/pkg/dataplane/policies/policy_windows.go index 1e469d1d00..0774d270f3 100644 --- a/npm/pkg/dataplane/policies/policy_windows.go +++ b/npm/pkg/dataplane/policies/policy_windows.go @@ -119,7 +119,7 @@ func (acl *ACLPolicy) checkIPSets() bool { return false } - if set.MatchType != "src" && set.MatchType != "dst" { + if !set.hasKnownMatchType() { return false } } @@ -128,7 +128,7 @@ func (acl *ACLPolicy) checkIPSets() bool { return false } - if set.MatchType != "src" && set.MatchType != "dst" { + if !set.hasKnownMatchType() { return false } } From 134ccf116109c5e4c00c92a936fe5945f9fcb65e Mon Sep 17 00:00:00 2001 From: Vamsi Kalapala Date: Fri, 29 Oct 2021 14:24:09 -0700 Subject: [PATCH 2/3] building npm windows --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 6dffae9929..cd3fadb377 100644 --- a/Makefile +++ b/Makefile @@ -220,7 +220,6 @@ azure-cnm-plugin-image: azure-cnm-plugin # Build the Azure NPM image. .PHONY: azure-npm-image azure-npm-image: -ifeq ($(GOOS),linux) $(MKDIR) $(IMAGE_DIR) docker buildx create --use docker buildx build \ @@ -235,7 +234,6 @@ ifeq ($(GOOS),linux) . echo $(AZURE_NPM_IMAGE):$(VERSION) > $(IMAGE_DIR)/$(NPM_IMAGE_INFO_FILE) -endif # Build the Azure CNS image .PHONY: azure-cns-image From 7eb5a9b747e1ef11d122c2ec7dc9900f8ab44383 Mon Sep 17 00:00:00 2001 From: Vamsi Kalapala Date: Fri, 29 Oct 2021 14:25:20 -0700 Subject: [PATCH 3/3] ignore building npm windows --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index cd3fadb377..6dffae9929 100644 --- a/Makefile +++ b/Makefile @@ -220,6 +220,7 @@ azure-cnm-plugin-image: azure-cnm-plugin # Build the Azure NPM image. .PHONY: azure-npm-image azure-npm-image: +ifeq ($(GOOS),linux) $(MKDIR) $(IMAGE_DIR) docker buildx create --use docker buildx build \ @@ -234,6 +235,7 @@ azure-npm-image: . echo $(AZURE_NPM_IMAGE):$(VERSION) > $(IMAGE_DIR)/$(NPM_IMAGE_INFO_FILE) +endif # Build the Azure CNS image .PHONY: azure-cns-image