From 5394ff5235f25e5da853cab9a8187e74066b4b9d Mon Sep 17 00:00:00 2001
From: Ryan Zhang <yangzhangrice@hotmail.com>
Date: Mon, 29 Aug 2022 13:08:52 -0700
Subject: [PATCH] revert leader election change (#253)

Co-authored-by: Ryan Zhang <zhangryan@microsoft.com>
---
 Makefile                | 6 ++++--
 cmd/memberagent/main.go | 1 -
 test/e2e/README.md      | 5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 8e2df5bf2..aebe1a55b 100644
--- a/Makefile
+++ b/Makefile
@@ -139,7 +139,8 @@ install-hub-agent-helm:
     --set image.pullPolicy=Never \
     --set image.repository=$(REGISTRY)/$(HUB_AGENT_IMAGE_NAME) \
     --set image.tag=$(HUB_AGENT_IMAGE_VERSION) \
-    --set logVerbosity=5
+    --set logVerbosity=5 \
+    --set namespace=fleet-system
 
 .PHONY: e2e-hub-kubeconfig-secret
 e2e-hub-kubeconfig-secret:
@@ -162,7 +163,8 @@ install-member-agent-helm: install-hub-agent-helm e2e-hub-kubeconfig-secret
     --set refreshtoken.tag=$(REFRESH_TOKEN_IMAGE_VERSION) \
     --set image.pullPolicy=Never --set refreshtoken.pullPolicy=Never \
     --set config.memberClusterName="kind-$(MEMBER_KIND_CLUSTER_NAME)" \
-    --set logVerbosity=5
+    --set logVerbosity=5 \
+    --set namespace=fleet-system
 	# to make sure member-agent reads the token file.
 	kubectl delete pod --all -n fleet-system
 
diff --git a/cmd/memberagent/main.go b/cmd/memberagent/main.go
index 41562d1e6..c9fb0a4e7 100644
--- a/cmd/memberagent/main.go
+++ b/cmd/memberagent/main.go
@@ -135,7 +135,6 @@ func main() {
 		LeaderElection:          *enableLeaderElection,
 		LeaderElectionNamespace: *leaderElectionNamespace,
 		LeaderElectionID:        "3111024923.hub.fleet.azure.com",
-		LeaderElectionConfig:    memberConfig,
 		Namespace:               mcNamespace,
 	}
 
diff --git a/test/e2e/README.md b/test/e2e/README.md
index 268ce0b85..901e71aed 100644
--- a/test/e2e/README.md
+++ b/test/e2e/README.md
@@ -30,4 +30,9 @@ kubectl --context=kind-hub-testing -n fleet-system get pod
 4. Check the logs of the member cluster controller
 ```shell
 kubectl --context=kind-member-testing -n fleet-system get pod 
+```
+
+5. uninstall the resources
+```shell
+make uninstall-helm
 ```
\ No newline at end of file