Skip to content

Commit 5394ff5

Browse files
ryanzhang-ossRyan Zhang
andauthored
revert leader election change (#253)
Co-authored-by: Ryan Zhang <zhangryan@microsoft.com>
1 parent ec2a74e commit 5394ff5

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ install-hub-agent-helm:
139139
--set image.pullPolicy=Never \
140140
--set image.repository=$(REGISTRY)/$(HUB_AGENT_IMAGE_NAME) \
141141
--set image.tag=$(HUB_AGENT_IMAGE_VERSION) \
142-
--set logVerbosity=5
142+
--set logVerbosity=5 \
143+
--set namespace=fleet-system
143144

144145
.PHONY: e2e-hub-kubeconfig-secret
145146
e2e-hub-kubeconfig-secret:
@@ -162,7 +163,8 @@ install-member-agent-helm: install-hub-agent-helm e2e-hub-kubeconfig-secret
162163
--set refreshtoken.tag=$(REFRESH_TOKEN_IMAGE_VERSION) \
163164
--set image.pullPolicy=Never --set refreshtoken.pullPolicy=Never \
164165
--set config.memberClusterName="kind-$(MEMBER_KIND_CLUSTER_NAME)" \
165-
--set logVerbosity=5
166+
--set logVerbosity=5 \
167+
--set namespace=fleet-system
166168
# to make sure member-agent reads the token file.
167169
kubectl delete pod --all -n fleet-system
168170

cmd/memberagent/main.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ func main() {
135135
LeaderElection: *enableLeaderElection,
136136
LeaderElectionNamespace: *leaderElectionNamespace,
137137
LeaderElectionID: "3111024923.hub.fleet.azure.com",
138-
LeaderElectionConfig: memberConfig,
139138
Namespace: mcNamespace,
140139
}
141140

test/e2e/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,9 @@ kubectl --context=kind-hub-testing -n fleet-system get pod
3030
4. Check the logs of the member cluster controller
3131
```shell
3232
kubectl --context=kind-member-testing -n fleet-system get pod
33+
```
34+
35+
5. uninstall the resources
36+
```shell
37+
make uninstall-helm
3338
```

0 commit comments

Comments
 (0)