Save backup log file to object storage

Signed-off-by: Andy Goldstein <andy.goldstein@gmail.com>

pkg/controller/backup_controller.go

@@ -312,21 +312,36 @@ func (controller *backupController) runBackup(backup *api.Backup, bucket string)
 	if err != nil {
 		return err
 	}
+
+	logFile, err := ioutil.TempFile("", "")
+	if err != nil {
+		return err
+	}
+
 	defer func() {
 		var errs []error
 		errs = append(errs, err)
 
-		if closeErr := backupFile.Close(); closeErr != nil {
-			errs = append(errs, closeErr)
+		if err := backupFile.Close(); err != nil {
+			errs = append(errs, err)
 		}
 
-		if removeErr := os.Remove(backupFile.Name()); removeErr != nil {
-			errs = append(errs, removeErr)
+		if err := os.Remove(backupFile.Name()); err != nil {
+			errs = append(errs, err)
 		}
+
+		if err := logFile.Close(); err != nil {
+			errs = append(errs, err)
+		}
+
+		if err := os.Remove(logFile.Name()); err != nil {
+			errs = append(errs, err)
+		}
+
 		err = kuberrs.NewAggregate(errs)
 	}()
 
-	if err := controller.backupper.Backup(backup, backupFile); err != nil {
+	if err := controller.backupper.Backup(backup, backupFile, logFile); err != nil {
 		return err
 	}
 
@@ -340,11 +355,13 @@ func (controller *backupController) runBackup(backup *api.Backup, bucket string)
 		return err
 	}
 
-	// re-set the file offset to 0 for reading
-	_, err = backupFile.Seek(0, 0)
-	if err != nil {
+	// re-set the files' offset to 0 for reading
+	if _, err = backupFile.Seek(0, 0); err != nil {
+		return err
+	}
+	if _, err = logFile.Seek(0, 0); err != nil {
 		return err
 	}
 
-	return controller.backupService.UploadBackup(bucket, backup.Name, bytes.NewReader(buf.Bytes()), backupFile)
+	return controller.backupService.UploadBackup(bucket, backup.Name, bytes.NewReader(buf.Bytes()), backupFile, logFile)
 }

pkg/controller/backup_controller_test.go

@@ -40,8 +40,8 @@ type fakeBackupper struct {
 	mock.Mock
 }
 
-func (b *fakeBackupper) Backup(backup *v1.Backup, data io.Writer) error {
-	args := b.Called(backup, data)
+func (b *fakeBackupper) Backup(backup *v1.Backup, data, log io.Writer) error {
+	args := b.Called(backup, data, log)
 	return args.Error(0)
 }
 
@@ -200,9 +200,9 @@ func TestProcessBackup(t *testing.T) {
 				backup.Status.Phase = v1.BackupPhaseInProgress
 				backup.Status.Expiration.Time = expiration
 				backup.Status.Version = 1
-				backupper.On("Backup", backup, mock.Anything).Return(nil)
+				backupper.On("Backup", backup, mock.Anything, mock.Anything).Return(nil)
 
-				cloudBackups.On("UploadBackup", "bucket", backup.Name, mock.Anything, mock.Anything).Return(nil)
+				cloudBackups.On("UploadBackup", "bucket", backup.Name, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 			}
 
 			// this is necessary so the Update() call returns the appropriate object

pkg/controller/gc_controller_test.go

@@ -545,8 +545,8 @@ func (s *fakeBackupService) GetBackup(bucket, name string) (*api.Backup, error)
 	return nil, errors.New("backup not found")
 }
 
-func (bs *fakeBackupService) UploadBackup(bucket, name string, metadata, backup io.ReadSeeker) error {
-	args := bs.Called(bucket, name, metadata, backup)
+func (bs *fakeBackupService) UploadBackup(bucket, name string, metadata, backup, log io.ReadSeeker) error {
+	args := bs.Called(bucket, name, metadata, backup, log)
 	return args.Error(0)
 }