Merge 38a4207 into backport/dans/fix-namespace-deletion-watch/weekly-…

…more-sunbeam
hashicorp · Jun 13, 2023 · 93c15cc · 93c15cc
2 parents acbfa30 + 38a4207
commit 93c15cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/.changelog/17483.txt b/.changelog/17483.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+peering: Fix a bug that caused server agents to continue cleaning up peering resources even after loss of leadership.
+```
diff --git a/.changelog/_5614.txt b/.changelog/_5614.txt
@@ -0,0 +1,4 @@
+```release-note:bug
+namespaces: **(Enterprise only)** fixes a bug where namespaces are stuck in a deferred deletion state indefinitely under some conditions.
+Also fixes the Consul query metadata present in the HTTP headers of the namespace read and list endpoints.
+```
diff --git a/agent/consul/leader.go b/agent/consul/leader.go
@@ -354,6 +354,8 @@ func (s *Server) revokeLeadership() {
 
 	s.revokeEnterpriseLeadership()
 
+	s.stopDeferredDeletion()
+
 	s.stopFederationStateAntiEntropy()
 
 	s.stopFederationStateReplication()