Merge pull request projectcalico#1011 from song-jiang/song-host-route

Remove host route on endpoint with vxlan
kingjcy · Feb 5, 2021 · 87b526a · 87b526a
2 parents ecf3864 + 9ecd321
commit 87b526a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/.semaphore/run-win-fv.sh b/.semaphore/run-win-fv.sh
@@ -26,7 +26,7 @@ SSH_CMD=$(echo ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -
 
 ${SSH_CMD} ls -ltr /home/ubuntu
 ${SSH_CMD} ls -ltr /home/ubuntu/winfv
-${SSH_CMD} touch /home/ubuntu/file-ready
+${SSH_CMD} touch /home/ubuntu/winfv/file-ready
 ${SSH_CMD} time /home/ubuntu/winfv/wait-report.sh
 ${SSH_CMD} ls -ltr /home/ubuntu/report
 popd

diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
@@ -98,7 +98,7 @@ blocks:
             - artifact push job ${REPORT_DIR} --destination semaphore/test-results --expire-in ${SEMAPHORE_ARTIFACT_EXPIRY} || true
             - artifact push job ${LOGS_DIR} --destination semaphore/logs --expire-in ${SEMAPHORE_ARTIFACT_EXPIRY} || true
             - aws ec2 delete-key-pair --key-name ${KEYPAIR_NAME} || true
-            - cd process/testing/winfv && NAME_PREFIX="${CLUSTER_NAME}" ./setup-fv.sh -q -u
+            - cd ~/process/testing/winfv && NAME_PREFIX="${CLUSTER_NAME}" ./setup-fv.sh -q -u
       env_vars:
         - name: SEMAPHORE_ARTIFACT_EXPIRY
           value: 2w
@@ -156,4 +156,4 @@ blocks:
         - name: Trigger pin updates
           commands:
             - checkout
-            - make semaphore-run-auto-pin-update-workflows
+            - make semaphore-run-auto-pin-update-workflows
diff --git a/pkg/dataplane/windows/dataplane_windows.go b/pkg/dataplane/windows/dataplane_windows.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 Tigera, Inc. All rights reserved.
+// Copyright (c) 2018-2021 Tigera, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -693,11 +693,6 @@ func (d *windowsDataplane) createAndAttachContainerEP(args *skel.CmdArgs,
 		}
 		// conjure a MAC based on the IP for Overlay
 		macAddr = fmt.Sprintf("%v-%02x-%02x-%02x-%02x", vxlanMACPrefix, epIPBytes[0], epIPBytes[1], epIPBytes[2], epIPBytes[3])
-
-		pols = append(pols, []json.RawMessage{
-			[]byte(fmt.Sprintf(`{"Type":"PA","PA":"%s"}`, hnsNetwork.ManagementIP)),
-		}...)
-
 	}
 
 	attempts := 3