display the namespace, podname and volumename of snapshotted volumes (#…

…4604)
replicatedhq · May 10, 2024 · c791fb1 · c791fb1
1 parent 5a47e97
commit c791fb1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/pkg/kotsadmsnapshot/backup.go b/pkg/kotsadmsnapshot/backup.go
@@ -917,6 +917,9 @@ func listBackupVolumes(backupVolumes []velerov1.PodVolumeBackup) []types.Snapsho
 	for _, backupVolume := range backupVolumes {
 		v := types.SnapshotVolume{
 			Name:           backupVolume.Name,
+			PodName:        backupVolume.Spec.Pod.Name,
+			PodNamespace:   backupVolume.Spec.Pod.Namespace,
+			PodVolumeName:  backupVolume.Spec.Volume,
 			SizeBytesHuman: units.HumanSize(float64(backupVolume.Status.Progress.TotalBytes)),
 			DoneBytesHuman: units.HumanSize(float64(backupVolume.Status.Progress.BytesDone)),
 			Phase:          string(backupVolume.Status.Phase),

diff --git a/pkg/kotsadmsnapshot/types/types.go b/pkg/kotsadmsnapshot/types/types.go
@@ -66,6 +66,9 @@ type SnapshotHook struct {
 
 type SnapshotVolume struct {
 	Name                 string     `json:"name"`
+	PodName              string     `json:"podName"`
+	PodNamespace         string     `json:"podNamespace"`
+	PodVolumeName        string     `json:"podVolumeName"`
 	SizeBytesHuman       string     `json:"sizeBytesHuman"`
 	DoneBytesHuman       string     `json:"doneBytesHuman"`
 	CompletionPercent    int        `json:"completionPercent"`

diff --git a/web/src/components/snapshots/SnapshotDetails.jsx b/web/src/components/snapshots/SnapshotDetails.jsx
@@ -13,6 +13,7 @@ import ShowAllModal from "../modals/ShowAllModal";
 import ViewSnapshotLogsModal from "../modals/ViewSnapshotLogsModal";
 import ErrorModal from "../modals/ErrorModal";
 import { Utilities } from "../../utilities/utilities";
+
 dayjs.extend(minMax);
 dayjs.extend(duration);
 
@@ -318,7 +319,13 @@ class SnapshotDetails extends Component {
         >
           <div className="flex1 u-paddingBottom--15 u-paddingTop--15 u-paddingLeft--10">
             <p className="flex1 u-fontSize--large u-textColor--primary u-fontWeight--bold u-lineHeight--bold u-marginBottom--8">
-              {volume.name}
+              {volume.podNamespace}
+              {"/"}
+              {volume.podName} {volume.podVolumeName}
+              <span className="u-fontWeight--normal u-textColor--bodyCopy">
+                {" "}
+                {volume.name}
+              </span>
             </p>
             <p className="u-fontSize--normal u-textColor--accent u-fontWeight--bold u-lineHeight--normal u-marginRight--20">
               Size:

diff --git a/web/src/stories/ShowAllModal.stories.tsx b/web/src/stories/ShowAllModal.stories.tsx
@@ -20,6 +20,9 @@ export const Volumes = () => {
         sizeBytesHuman: "582B",
         startedAt: "2022-12-03T00:00:20Z",
         timeRemainingSeconds: 0,
+        podName: "podName",
+        podNamespace: "podNamespace",
+        podVolumeName: "podVolumeName",
       },
       {
         completionPercent: 100,
@@ -30,6 +33,9 @@ export const Volumes = () => {
         sizeBytesHuman: "582B",
         startedAt: "2022-12-03T00:00:20Z",
         timeRemainingSeconds: 0,
+        podName: "podName",
+        podNamespace: "podNamespace",
+        podVolumeName: "podVolumeName",
       },
       {
         completionPercent: 100,
@@ -40,6 +46,9 @@ export const Volumes = () => {
         sizeBytesHuman: "582B",
         startedAt: "2022-12-03T00:00:20Z",
         timeRemainingSeconds: 0,
+        podName: "podName",
+        podNamespace: "podNamespace",
+        podVolumeName: "podVolumeName",
       },
     ];
     return volumes.map((volume) => {