From 592b2d2ad4a49ff8294c06ccc5c243b157f1e14b Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 19 Feb 2021 16:13:51 -0800 Subject: [PATCH 1/4] add symbols --- .pipelines/npm/npm-conformance-tests.yaml | 3 ++- Makefile | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml index e406d40452..2138ba0a48 100644 --- a/.pipelines/npm/npm-conformance-tests.yaml +++ b/.pipelines/npm/npm-conformance-tests.yaml @@ -7,7 +7,7 @@ variables: - name: VNET_NAME value: npm-vnet - name: LOCATION - value: westus2 + value: $(LOCATION) - name: FQDN value: empty @@ -135,6 +135,7 @@ jobs: RESOURCE_GROUP: $[ dependencies.setup.outputs['EnvironmentalVariables.RESOURCE_GROUP'] ] TAG: $[ dependencies.setup.outputs['EnvironmentalVariables.TAG'] ] steps: + - checkout: none - download: current artifact: Test - task: AzureCLI@2 diff --git a/Makefile b/Makefile index 43178d7e38..ee4d75bd4b 100644 --- a/Makefile +++ b/Makefile @@ -195,40 +195,40 @@ clean: # Build the Azure CNM plugin. $(CNM_BUILD_DIR)/azure-vnet-plugin$(EXE_EXT): $(CNMFILES) - go build -v -o $(CNM_BUILD_DIR)/azure-vnet-plugin$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -s -w" $(CNM_DIR)/*.go + go build -v -o $(CNM_BUILD_DIR)/azure-vnet-plugin$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" $(CNM_DIR)/*.go # Build the Azure CNI network plugin. $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT): $(CNIFILES) - go build -v -o $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -s -w" $(CNI_NET_DIR)/*.go + go build -v -o $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" $(CNI_NET_DIR)/*.go # Build the Azure CNI IPAM plugin. $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT): $(CNIFILES) - go build -v -o $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -s -w" $(CNI_IPAM_DIR)/*.go + go build -v -o $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" $(CNI_IPAM_DIR)/*.go # Build the Azure CNI IPAMV6 plugin. $(CNI_BUILD_DIR)/azure-vnet-ipamv6$(EXE_EXT): $(CNIFILES) - go build -v -o $(CNI_BUILD_DIR)/azure-vnet-ipamv6$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -s -w" $(CNI_IPAMV6_DIR)/*.go + go build -v -o $(CNI_BUILD_DIR)/azure-vnet-ipamv6$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" $(CNI_IPAMV6_DIR)/*.go # Build the Azure CNI telemetry plugin. $(CNI_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT): $(CNIFILES) - go build -v -o $(CNI_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(ACN_PACKAGE_PATH)/telemetry.aiMetadata=$(CNI_AI_ID) -s -w" $(CNI_TELEMETRY_DIR)/*.go + go build -v -o $(CNI_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(ACN_PACKAGE_PATH)/telemetry.aiMetadata=$(CNI_AI_ID)" $(CNI_TELEMETRY_DIR)/*.go # Build the Azure CLI network plugin. $(ACNCLI_BUILD_DIR)/acncli$(EXE_EXT): $(CNIFILES) - CGO_ENABLED=0 go build -v -o $(ACNCLI_BUILD_DIR)/acn$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -s -w" $(ACNCLI_DIR)/*.go + CGO_ENABLED=0 go build -v -o $(ACNCLI_BUILD_DIR)/acn$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" $(ACNCLI_DIR)/*.go # Build the Azure CNS Service. $(CNS_BUILD_DIR)/azure-cns$(EXE_EXT): $(CNSFILES) - go build -v -o $(CNS_BUILD_DIR)/azure-cns$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(cnsaipath)=$(CNS_AI_ID) -s -w" $(CNS_DIR)/*.go + go build -v -o $(CNS_BUILD_DIR)/azure-cns$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(cnsaipath)=$(CNS_AI_ID)" $(CNS_DIR)/*.go # Build the Azure CNMS Service. $(CNMS_BUILD_DIR)/azure-cnms$(EXE_EXT): $(CNMSFILES) - go build -v -o $(CNMS_BUILD_DIR)/azure-cnms$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -s -w" $(CNMS_DIR)/*.go + go build -v -o $(CNMS_BUILD_DIR)/azure-cnms$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" $(CNMS_DIR)/*.go # Build the Azure NPM plugin. $(NPM_BUILD_DIR)/azure-npm$(EXE_EXT): $(NPMFILES) - go build -v -o $(NPM_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -s -w" $(CNI_TELEMETRY_DIR)/*.go - go build -v -o $(NPM_BUILD_DIR)/azure-npm$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(ACN_PACKAGE_PATH)/npm.aiMetadata=$(NPM_AI_ID) -s -w" $(NPM_DIR)/*.go + go build -v -o $(NPM_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" $(CNI_TELEMETRY_DIR)/*.go + go build -v -o $(NPM_BUILD_DIR)/azure-npm$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(ACN_PACKAGE_PATH)/npm.aiMetadata=$(NPM_AI_ID)" $(NPM_DIR)/*.go # Build all binaries in a container. .PHONY: all-containerized From c8835228e3834c8aad4fd548a940d027d2534ad5 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 19 Feb 2021 16:39:47 -0800 Subject: [PATCH 2/4] add gcflags --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index ee4d75bd4b..5842854659 100644 --- a/Makefile +++ b/Makefile @@ -195,40 +195,40 @@ clean: # Build the Azure CNM plugin. $(CNM_BUILD_DIR)/azure-vnet-plugin$(EXE_EXT): $(CNMFILES) - go build -v -o $(CNM_BUILD_DIR)/azure-vnet-plugin$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" $(CNM_DIR)/*.go + go build -v -o $(CNM_BUILD_DIR)/azure-vnet-plugin$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" -gcflags="-dwarflocationlists=true" $(CNM_DIR)/*.go # Build the Azure CNI network plugin. $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT): $(CNIFILES) - go build -v -o $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" $(CNI_NET_DIR)/*.go + go build -v -o $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" -gcflags="-dwarflocationlists=true" $(CNI_NET_DIR)/*.go # Build the Azure CNI IPAM plugin. $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT): $(CNIFILES) - go build -v -o $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" $(CNI_IPAM_DIR)/*.go + go build -v -o $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" -gcflags="-dwarflocationlists=true" $(CNI_IPAM_DIR)/*.go # Build the Azure CNI IPAMV6 plugin. $(CNI_BUILD_DIR)/azure-vnet-ipamv6$(EXE_EXT): $(CNIFILES) - go build -v -o $(CNI_BUILD_DIR)/azure-vnet-ipamv6$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" $(CNI_IPAMV6_DIR)/*.go + go build -v -o $(CNI_BUILD_DIR)/azure-vnet-ipamv6$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" -gcflags="-dwarflocationlists=true" $(CNI_IPAMV6_DIR)/*.go # Build the Azure CNI telemetry plugin. $(CNI_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT): $(CNIFILES) - go build -v -o $(CNI_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(ACN_PACKAGE_PATH)/telemetry.aiMetadata=$(CNI_AI_ID)" $(CNI_TELEMETRY_DIR)/*.go + go build -v -o $(CNI_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(ACN_PACKAGE_PATH)/telemetry.aiMetadata=$(CNI_AI_ID)" -gcflags="-dwarflocationlists=true" $(CNI_TELEMETRY_DIR)/*.go # Build the Azure CLI network plugin. $(ACNCLI_BUILD_DIR)/acncli$(EXE_EXT): $(CNIFILES) - CGO_ENABLED=0 go build -v -o $(ACNCLI_BUILD_DIR)/acn$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" $(ACNCLI_DIR)/*.go + CGO_ENABLED=0 go build -v -o $(ACNCLI_BUILD_DIR)/acn$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" -gcflags="-dwarflocationlists=true" $(ACNCLI_DIR)/*.go # Build the Azure CNS Service. $(CNS_BUILD_DIR)/azure-cns$(EXE_EXT): $(CNSFILES) - go build -v -o $(CNS_BUILD_DIR)/azure-cns$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(cnsaipath)=$(CNS_AI_ID)" $(CNS_DIR)/*.go + go build -v -o $(CNS_BUILD_DIR)/azure-cns$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(cnsaipath)=$(CNS_AI_ID)" -gcflags="-dwarflocationlists=true" $(CNS_DIR)/*.go # Build the Azure CNMS Service. $(CNMS_BUILD_DIR)/azure-cnms$(EXE_EXT): $(CNMSFILES) - go build -v -o $(CNMS_BUILD_DIR)/azure-cnms$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" $(CNMS_DIR)/*.go + go build -v -o $(CNMS_BUILD_DIR)/azure-cnms$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" -gcflags="-dwarflocationlists=true" $(CNMS_DIR)/*.go # Build the Azure NPM plugin. $(NPM_BUILD_DIR)/azure-npm$(EXE_EXT): $(NPMFILES) - go build -v -o $(NPM_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" $(CNI_TELEMETRY_DIR)/*.go - go build -v -o $(NPM_BUILD_DIR)/azure-npm$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(ACN_PACKAGE_PATH)/npm.aiMetadata=$(NPM_AI_ID)" $(NPM_DIR)/*.go + go build -v -o $(NPM_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(VERSION)" -gcflags="-dwarflocationlists=true" $(CNI_TELEMETRY_DIR)/*.go + go build -v -o $(NPM_BUILD_DIR)/azure-npm$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(ACN_PACKAGE_PATH)/npm.aiMetadata=$(NPM_AI_ID)" -gcflags="-dwarflocationlists=true" $(NPM_DIR)/*.go # Build all binaries in a container. .PHONY: all-containerized From 797e59f96d509c9b5fbfe3c1317812102c24db28 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 19 Feb 2021 17:12:53 -0800 Subject: [PATCH 3/4] update timeouts --- .pipelines/npm/npm-conformance-tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml index 2138ba0a48..aeee1e30a1 100644 --- a/.pipelines/npm/npm-conformance-tests.yaml +++ b/.pipelines/npm/npm-conformance-tests.yaml @@ -122,6 +122,7 @@ jobs: --network-plugin azure - job: Run_test + timeoutInMinutes: 360 displayName: "Run Kubernetes Network Policy Test Suite" pool: name: Networking-ContainerNetworking From d04fc07da59daa79bf66d7d1d34863a430f2e201 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Tue, 23 Feb 2021 11:57:26 -0800 Subject: [PATCH 4/4] only show azure core errors --- .pipelines/singletenancy/aks-engine/e2e-step-template.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml index 048cb579bf..f43dda75bf 100644 --- a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml +++ b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml @@ -90,6 +90,7 @@ steps: export REGIONS=$(AKS_ENGINE_REGION) export IS_JENKINS=false export DEBUG_CRASHING_PODS=true + export AZURE_CORE_ONLY_SHOW_ERRORS=True export make test-kubernetes name: DeployAKSEngine