Fix istiod and proxy versions are incorrect in bug report (istio#47703)

* fix istio version incorrect * add releasenotes * remove extra
WillardHu · Nov 2, 2023 · 41bc89a · 41bc89a
1 parent 7999247
commit 41bc89a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/releasenotes/notes/47703.yaml b/releasenotes/notes/47703.yaml
@@ -0,0 +1,6 @@
+apiVersion: release-notes/v2
+kind: bug-fix
+area: istioctl
+releaseNotes:
+- |
+  **Fixed** an issue where sometimes control plane revisions and proxy versions were not obtained in the bug report.
diff --git a/tools/bug-report/pkg/bugreport/bugreport.go b/tools/bug-report/pkg/bugreport/bugreport.go
@@ -240,6 +240,13 @@ func getIstioRevisions(resources *cluster2.Resources) []string {
 			}
 		}
 	}
+	for _, podAnnotations := range resources.Annotations {
+		for annotation, value := range podAnnotations {
+			if annotation == label2.IoIstioRev.Name {
+				revMap.Insert(value)
+			}
+		}
+	}
 	return sets.SortedList(revMap)
 }