Skip to content

Commit d6dff68

Browse files
fix(registry): preserve ErrHeartbeatDeregistered only on confirmed deregistration
Signed-off-by: Ankit Kr. Chowdhury <rakesh856100@gmail.com>
1 parent 6ddb6ba commit d6dff68

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎internal/controller/mcp_registration_test.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,14 @@ var _ = Describe("MCP Registration Integration", func() {
320320
// Delete the AgentDeployment
321321
fetched := &agentraxv1alpha1.AgentDeployment{}
322322
Expect(k8sClient.Get(ctx, adKey, fetched)).To(Succeed())
323+
324+
// Verify child Service has controlling owner reference matching AgentDeployment UID
325+
svc := &corev1.Service{}
326+
Expect(k8sClient.Get(ctx, types.NamespacedName{Name: adName, Namespace: ns}, svc)).To(Succeed())
327+
ownerRef := metav1.GetControllerOf(svc)
328+
Expect(ownerRef).NotTo(BeNil())
329+
Expect(ownerRef.UID).To(Equal(fetched.UID))
330+
323331
Expect(k8sClient.Delete(ctx, fetched)).To(Succeed())
324332

325333
// Wait for object to be completely removed

‎internal/registry/mcp_registrar.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ func (r *Registrar) Heartbeat(ctx context.Context, ad *agentraxv1alpha1.AgentDep
134134
if failCount >= MaxConsecutiveHeartbeatFailures {
135135
deregErr := r.Registry.Deregister(ctx, ad.Namespace, ad.Name)
136136
if deregErr != nil {
137-
return fmt.Errorf("%w: deregistered after %d consecutive heartbeat failures (latest error: %w); deregister error: %v",
138-
ErrHeartbeatDeregistered, failCount, err, deregErr)
137+
return fmt.Errorf("failed to deregister after %d consecutive heartbeat failures: %w (latest probe error: %v)",
138+
failCount, deregErr, err)
139139
}
140140
return fmt.Errorf("%w: deregistered after %d consecutive heartbeat failures (latest error: %w)",
141141
ErrHeartbeatDeregistered, failCount, err)

0 commit comments

Comments
 (0)