From fd8e49f29dcbedf04bb6dfbf6a9f54c2b4054476 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 10 Feb 2026 17:55:05 +0000
Subject: [PATCH 1/2] Initial plan


From 5b431f3cc79bcae79f77d13c0f67ddec49597673 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 10 Feb 2026 18:00:11 +0000
Subject: [PATCH 2/2] Add Multus network-attachment-definitions collection to
 calicoctl cluster diags

Co-authored-by: fasaxc <469264+fasaxc@users.noreply.github.com>
---
 calicoctl/calicoctl/commands/cluster/diags.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/calicoctl/calicoctl/commands/cluster/diags.go b/calicoctl/calicoctl/commands/cluster/diags.go
index b596cc3d335..95e4eaecd95 100644
--- a/calicoctl/calicoctl/commands/cluster/diags.go
+++ b/calicoctl/calicoctl/commands/cluster/diags.go
@@ -442,6 +442,14 @@ func collectKubernetesResource(dir string) {
 		Info:     "Collect k8s baselineadminnetworkpolicies (text)",
 		CmdStr:   "kubectl get baselineadminnetworkpolicies.policy.networking.k8s.io -Ao wide",
 		FilePath: fmt.Sprintf("%s/baselineadminnetworkpolicies.txt", dir),
+	}, common.Cmd{
+		Info:     "Collect multus network-attachment-definitions (yaml)",
+		CmdStr:   "kubectl get network-attachment-definitions.k8s.cni.cncf.io -Ao yaml",
+		FilePath: fmt.Sprintf("%s/network-attachment-definitions.yaml", dir),
+	}, common.Cmd{
+		Info:     "Collect multus network-attachment-definitions (text)",
+		CmdStr:   "kubectl get network-attachment-definitions.k8s.cni.cncf.io -Ao wide",
+		FilePath: fmt.Sprintf("%s/network-attachment-definitions.txt", dir),
 	}, common.Cmd{
 		Info:     "Collect k8s validatingwebhookconfigurations (text)",
 		CmdStr:   "kubectl get validatingwebhookconfigurations.admissionregistration.k8s.io -o wide",