Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Miawong/sc 116932/improved disaster recovery for ec ux #5070

Merged
merged 22 commits into from
Jan 15, 2025
Merged

Miawong/sc 116932/improved disaster recovery for ec ux #5070

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
68e27f7
wip
miaawong Dec 13, 2024
3989724
f
miaawong Dec 20, 2024
8337a9a
add toggle
miaawong Dec 23, 2024
d378612
clean up
miaawong Dec 27, 2024
bc8fab0
f
miaawong Dec 27, 2024
3986ecd
accordian for DR
miaawong Jan 7, 2025
308e450
set default expanded accordion if there's a failure
miaawong Jan 7, 2025
d154f28
move size and status to left align
miaawong Jan 8, 2025
d294a6c
remove volume count
miaawong Jan 9, 2025
0abc128
remove changes to toggle
miaawong Jan 9, 2025
7cfcf87
reorder imports
miaawong Jan 9, 2025
e296ca4
undo changes to ListBackupsForApp
laverya Jan 9, 2025
ae6bd19
update with new aggregated endpoint
miaawong Jan 9, 2025
81a25f4
fix bad merge
miaawong Jan 13, 2025
714d501
update test to click on infrastructure
miaawong Jan 14, 2025
abb6096
uncomment
miaawong Jan 14, 2025
47e2d40
pass snapshot name to fetch logs
miaawong Jan 14, 2025
6504c61
run prettier
miaawong Jan 14, 2025
52557ec
fix modals
miaawong Jan 15, 2025
e877142
Merge branch 'main' into miawong/sc-116932/improved-disaster-recovery…
miaawong Jan 15, 2025
29c8815
remove extra space
miaawong Jan 15, 2025
2547347
fix typo
miaawong Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion e2e/playwright/tests/@smoke-test/test.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ test("smoke test", async ({ page }) => {
.click();
await page.locator(".SnapshotRow--wrapper").click();
await expect(page.locator("#app")).toContainText("Snapshot timeline");
await page.getByText("Infrastructure", { exact: true }).click();
await page.getByText("View logs").click();
await expect(page.locator(".view-lines")).toContainText("level=info");
await page.getByRole("button", { name: "Ok, got it!" }).click();
Expand Down Expand Up @@ -344,4 +345,4 @@ const validateDeployLogs = async (page, expect) => {
await page.getByText("applyStdout").click();
await expect(page.locator(".view-lines")).toContainText("created");
await page.getByRole("button", { name: "Ok, got it!" }).click();
};
};
1 change: 1 addition & 0 deletions pkg/kotsadmsnapshot/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,7 @@ func ParseVeleroBackup(ctx context.Context, veleroBackup velerov1.Backup) (*type
return &backup, nil
}


miaawong marked this conversation as resolved.
Show resolved Hide resolved
func ListInstanceBackups(ctx context.Context, kotsadmNamespace string) ([]*types.Backup, error) {
cfg, err := k8sutil.GetClusterConfig()
if err != nil {
Expand Down
Loading
Loading