Merge pull request #796 from microsoft/bliang/fix-arc-cleanup

twright-msft · web-flow · commit 4e0fcb5458e4 · 2020-07-29T19:55:40.000-07:00
Set temp folder name to be the one used in setup-controller-new.sh
diff --git a/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/cleanup-controller-new.sh b/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/cleanup-controller-new.sh
@@ -86,7 +86,7 @@ sudo rm -rf ~/.kube
 
 # Clean up working folders.
 # 
-export AZUREARCDATACONTROLLER_DIR=aadatacontroller
+export AZUREARCDATACONTROLLER_DIR=arc-data
 if [ -d "$AZUREARCDATACONTROLLER_DIR" ]; then
     echo "Removing working directory $AZUREARCDATACONTROLLER_DIR."
     rm -f -r $AZUREARCDATACONTROLLER_DIR

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ sudo rm -rf ~/.kube`
`86`	`86`
`87`	`87`	`# Clean up working folders.`
`88`	`88`	`#`
`89`		`-export AZUREARCDATACONTROLLER_DIR=aadatacontroller`
	`89`	`+export AZUREARCDATACONTROLLER_DIR=arc-data`
`90`	`90`	`if [ -d "$AZUREARCDATACONTROLLER_DIR" ]; then`
`91`	`91`	`echo "Removing working directory $AZUREARCDATACONTROLLER_DIR."`
`92`	`92`	`rm -f -r $AZUREARCDATACONTROLLER_DIR`