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

feat(ec): change ListInstanceBackups handler to return ReplicatedBackups #5033

Merged
merged 8 commits into from
Dec 10, 2024
Merged

feat(ec): change ListInstanceBackups handler to return ReplicatedBackups #5033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bd0b26e
feat(ec): add new DR backup type `ReplicatedBackup`
JGAntunes Dec 5, 2024
aedf8df
feat(ec): change ListInstanceBackups handler to return ReplicatedBack…
JGAntunes Dec 6, 2024
67c8626
chore: use helper method
JGAntunes Dec 6, 2024
40e8fbc
chore: return a single array with the new struct
JGAntunes Dec 6, 2024
5aadca5
chore: single return
JGAntunes Dec 9, 2024
768679c
chore: move velero and kube clients to client builds interfaces
JGAntunes Dec 9, 2024
940b596
chore: add tests
JGAntunes Dec 9, 2024
5fbcb34
chore: make UI support new API changes
JGAntunes Dec 10, 2024
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
8 changes: 4 additions & 4 deletions pkg/handlers/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,21 +110,21 @@ func (h *Handler) ListBackups(w http.ResponseWriter, r *http.Request) {
}

type ListInstanceBackupsResponse struct {
Error string `json:"error,omitempty"`
Backups []*snapshottypes.Backup `json:"backups"`
Error string `json:"error,omitempty"`
Backups []*snapshottypes.ReplicatedBackup `json:"backups"`
}

func (h *Handler) ListInstanceBackups(w http.ResponseWriter, r *http.Request) {
listBackupsResponse := ListInstanceBackupsResponse{}

backups, err := snapshot.ListInstanceBackups(r.Context(), util.PodNamespace)
replicatedBackups, err := snapshot.ListInstanceBackups(r.Context(), util.PodNamespace)
if err != nil {
logger.Error(err)
listBackupsResponse.Error = "failed to list instance backups"
JSON(w, http.StatusInternalServerError, listBackupsResponse)
return
}
listBackupsResponse.Backups = backups
listBackupsResponse.Backups = replicatedBackups

JSON(w, http.StatusOK, listBackupsResponse)
}
Expand Down
64 changes: 41 additions & 23 deletions pkg/kotsadmsnapshot/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import (
"github.com/replicatedhq/kots/pkg/k8sutil"
"github.com/replicatedhq/kots/pkg/kotsadm"
kotsadmtypes "github.com/replicatedhq/kots/pkg/kotsadm/types"
"github.com/replicatedhq/kots/pkg/kotsadmsnapshot/k8sclient"
"github.com/replicatedhq/kots/pkg/kotsadmsnapshot/types"
"github.com/replicatedhq/kots/pkg/kotsadmsnapshot/veleroclient"
"github.com/replicatedhq/kots/pkg/kotsutil"
"github.com/replicatedhq/kots/pkg/kurl"
"github.com/replicatedhq/kots/pkg/logger"
Expand Down Expand Up @@ -81,12 +83,12 @@ func CreateApplicationBackup(ctx context.Context, a *apptypes.App, isScheduled b
return nil, errors.Wrap(err, "failed to get cluster config")
}

clientset, err := kubernetes.NewForConfig(cfg)
clientset, err := k8sclient.GetBuilder().GetClientset(cfg)
if err != nil {
return nil, errors.Wrap(err, "failed to create clientset")
}

veleroClient, err := veleroclientv1.NewForConfig(cfg)
veleroClient, err := veleroclient.GetBuilder().GetVeleroClient(cfg)
if err != nil {
return nil, errors.Wrap(err, "failed to create velero clientset")
}
Expand Down Expand Up @@ -227,7 +229,7 @@ func CreateInstanceBackup(ctx context.Context, cluster *downstreamtypes.Downstre
return "", errors.Wrap(err, "failed to get cluster config")
}

k8sClient, err := kubernetes.NewForConfig(cfg)
k8sClient, err := k8sclient.GetBuilder().GetClientset(cfg)
if err != nil {
return "", errors.Wrap(err, "failed to create clientset")
}
Expand All @@ -237,7 +239,7 @@ func CreateInstanceBackup(ctx context.Context, cluster *downstreamtypes.Downstre
return "", fmt.Errorf("failed to get kubeclient: %w", err)
}

veleroClient, err := veleroclientv1.NewForConfig(cfg)
veleroClient, err := veleroclient.GetBuilder().GetVeleroClient(cfg)
if err != nil {
return "", errors.Wrap(err, "failed to create velero clientset")
}
Expand Down Expand Up @@ -713,12 +715,12 @@ func ListBackupsForApp(ctx context.Context, kotsadmNamespace string, appID strin
return nil, errors.Wrap(err, "failed to get cluster config")
}

clientset, err := kubernetes.NewForConfig(cfg)
clientset, err := k8sclient.GetBuilder().GetClientset(cfg)
if err != nil {
return nil, errors.Wrap(err, "failed to create clientset")
}

veleroClient, err := veleroclientv1.NewForConfig(cfg)
veleroClient, err := veleroclient.GetBuilder().GetVeleroClient(cfg)
if err != nil {
return nil, errors.Wrap(err, "failed to create velero clientset")
}
Expand Down Expand Up @@ -840,18 +842,18 @@ func ListBackupsForApp(ctx context.Context, kotsadmNamespace string, appID strin
return backups, nil
}

func ListInstanceBackups(ctx context.Context, kotsadmNamespace string) ([]*types.Backup, error) {
func ListInstanceBackups(ctx context.Context, kotsadmNamespace string) ([]*types.ReplicatedBackup, error) {
cfg, err := k8sutil.GetClusterConfig()
if err != nil {
return nil, errors.Wrap(err, "failed to get cluster config")
}

clientset, err := kubernetes.NewForConfig(cfg)
clientset, err := k8sclient.GetBuilder().GetClientset(cfg)
if err != nil {
return nil, errors.Wrap(err, "failed to create clientset")
}

veleroClient, err := veleroclientv1.NewForConfig(cfg)
veleroClient, err := veleroclient.GetBuilder().GetVeleroClient(cfg)
if err != nil {
return nil, errors.Wrap(err, "failed to create velero clientset")
}
Expand All @@ -870,7 +872,7 @@ func ListInstanceBackups(ctx context.Context, kotsadmNamespace string) ([]*types
return nil, errors.Wrap(err, "failed to list velero backups")
}

backups := []*types.Backup{}
replicatedBackupsMap := map[string]*types.ReplicatedBackup{}

for _, veleroBackup := range veleroBackups.Items {
// TODO: Enforce version?
Expand Down Expand Up @@ -970,10 +972,24 @@ func ListInstanceBackups(ctx context.Context, kotsadmNamespace string) ([]*types
}
}

backups = append(backups, &backup)
// group the velero backups by the name we present to the user
backupName := GetBackupName(veleroBackup)
if _, ok := replicatedBackupsMap[backupName]; !ok {
replicatedBackupsMap[backupName] = &types.ReplicatedBackup{
Name: backupName,
Backups: []types.Backup{},
ExpectedBackupCount: GetInstanceBackupCount(veleroBackup),
}
}
replicatedBackupsMap[backupName].Backups = append(replicatedBackupsMap[backupName].Backups, backup)
}

return backups, nil
replicatedBackups := []*types.ReplicatedBackup{}
for _, rb := range replicatedBackupsMap {
replicatedBackups = append(replicatedBackups, rb)
}

return replicatedBackups, nil
}

func getSnapshotVolumeSummary(ctx context.Context, veleroBackup *velerov1.Backup) (*types.VolumeSummary, error) {
Expand All @@ -982,7 +998,7 @@ func getSnapshotVolumeSummary(ctx context.Context, veleroBackup *velerov1.Backup
return nil, errors.Wrap(err, "failed to get cluster config")
}

veleroClient, err := veleroclientv1.NewForConfig(cfg)
veleroClient, err := veleroclient.GetBuilder().GetVeleroClient(cfg)
if err != nil {
return nil, errors.Wrap(err, "failed to create clientset")
}
Expand Down Expand Up @@ -1023,12 +1039,12 @@ func GetBackup(ctx context.Context, kotsadmNamespace string, backupID string) (*
return nil, errors.Wrap(err, "failed to get cluster config")
}

clientset, err := kubernetes.NewForConfig(cfg)
clientset, err := k8sclient.GetBuilder().GetClientset(cfg)
if err != nil {
return nil, errors.Wrap(err, "failed to create clientset")
}

veleroClient, err := veleroclientv1.NewForConfig(cfg)
veleroClient, err := veleroclient.GetBuilder().GetVeleroClient(cfg)
if err != nil {
return nil, errors.Wrap(err, "failed to create velero clientset")
}
Expand Down Expand Up @@ -1069,12 +1085,12 @@ func DeleteBackup(ctx context.Context, kotsadmNamespace string, backupID string)
return errors.Wrap(err, "failed to get cluster config")
}

clientset, err := kubernetes.NewForConfig(cfg)
clientset, err := k8sclient.GetBuilder().GetClientset(cfg)
if err != nil {
return errors.Wrap(err, "failed to create clientset")
}

veleroClient, err := veleroclientv1.NewForConfig(cfg)
veleroClient, err := veleroclient.GetBuilder().GetVeleroClient(cfg)
if err != nil {
return errors.Wrap(err, "failed to create velero clientset")
}
Expand Down Expand Up @@ -1122,14 +1138,16 @@ func HasUnfinishedApplicationBackup(ctx context.Context, kotsadmNamespace string
}

func HasUnfinishedInstanceBackup(ctx context.Context, kotsadmNamespace string) (bool, error) {
backups, err := ListInstanceBackups(ctx, kotsadmNamespace)
replicatedBackups, err := ListInstanceBackups(ctx, kotsadmNamespace)
if err != nil {
return false, errors.Wrap(err, "failed to list backups")
}

for _, backup := range backups {
if backup.Status == "New" || backup.Status == "InProgress" {
return true, nil
for _, replicatedBackup := range replicatedBackups {
for _, backup := range replicatedBackup.Backups {
if backup.Status == "New" || backup.Status == "InProgress" {
return true, nil
}
}
}

Expand All @@ -1142,12 +1160,12 @@ func GetBackupDetail(ctx context.Context, kotsadmNamespace string, backupID stri
return nil, errors.Wrap(err, "failed to get cluster config")
}

clientset, err := kubernetes.NewForConfig(cfg)
clientset, err := k8sclient.GetBuilder().GetClientset(cfg)
if err != nil {
return nil, errors.Wrap(err, "failed to create clientset")
}

veleroClient, err := veleroclientv1.NewForConfig(cfg)
veleroClient, err := veleroclient.GetBuilder().GetVeleroClient(cfg)
if err != nil {
return nil, errors.Wrap(err, "failed to create velero clientset")
}
Expand Down
Loading
Loading