From 115f32cae51ecbc936535aa7aa57afdda033e963 Mon Sep 17 00:00:00 2001 From: Lyndon-Li Date: Tue, 21 Mar 2023 09:49:18 +0800 Subject: [PATCH] remove merged back deprecate code Signed-off-by: Lyndon-Li --- pkg/controller/backup_controller.go | 10 ---------- pkg/controller/backup_finalizer_controller.go | 3 +-- pkg/util/logging/dual_mode_logger.go | 3 +-- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/pkg/controller/backup_controller.go b/pkg/controller/backup_controller.go index 4c7822b41..71fcb55e0 100644 --- a/pkg/controller/backup_controller.go +++ b/pkg/controller/backup_controller.go @@ -18,7 +18,6 @@ package controller import ( "bytes" - "compress/gzip" "context" "fmt" "os" @@ -576,15 +575,6 @@ func (b *backupReconciler) validateAndGetSnapshotLocations(backup *velerov1api.B func (b *backupReconciler) runBackup(backup *pkgbackup.Request) error { b.logger.WithField(Backup, kubeutil.NamespaceAndName(backup)).Info("Setting up backup log") - logFile, err := os.CreateTemp("", "") - if err != nil { - return errors.Wrap(err, "error creating temp file for backup log") - } - gzippedLogFile := gzip.NewWriter(logFile) - // Assuming we successfully uploaded the log file, this will have already been closed below. It is safe to call - // close multiple times. If we get an error closing this, there's not really anything we can do about it. - defer gzippedLogFile.Close() - defer closeAndRemoveFile(logFile, b.logger.WithField(Backup, kubeutil.NamespaceAndName(backup))) // Log the backup to both a backup log file and to stdout. This will help see what happened if the upload of the // backup log failed for whatever reason. diff --git a/pkg/controller/backup_finalizer_controller.go b/pkg/controller/backup_finalizer_controller.go index 25de5f660..76df47d37 100644 --- a/pkg/controller/backup_finalizer_controller.go +++ b/pkg/controller/backup_finalizer_controller.go @@ -19,7 +19,6 @@ package controller import ( "bytes" "context" - "io/ioutil" "os" "github.com/pkg/errors" @@ -146,7 +145,7 @@ func (r *backupFinalizerReconciler) Reconcile(ctx context.Context, req ctrl.Requ return ctrl.Result{}, errors.Wrap(err, "error downloading backup") } defer closeAndRemoveFile(inBackupFile, log) - outBackupFile, err = ioutil.TempFile("", "") + outBackupFile, err = os.CreateTemp("", "") if err != nil { log.WithError(err).Error("error creating temp file for backup") return ctrl.Result{}, errors.WithStack(err) diff --git a/pkg/util/logging/dual_mode_logger.go b/pkg/util/logging/dual_mode_logger.go index aac86903a..f5533c8eb 100644 --- a/pkg/util/logging/dual_mode_logger.go +++ b/pkg/util/logging/dual_mode_logger.go @@ -19,7 +19,6 @@ package logging import ( "compress/gzip" "io" - "io/ioutil" "os" "github.com/pkg/errors" @@ -47,7 +46,7 @@ type tempFileLogger struct { // NewTempFileLogger creates a DualModeLogger instance that writes logs to both Stdout and a file in the temp folder. func NewTempFileLogger(logLevel logrus.Level, logFormat Format, hook *LogHook, fields logrus.Fields) (DualModeLogger, error) { - file, err := ioutil.TempFile("", "") + file, err := os.CreateTemp("", "") if err != nil { return nil, errors.Wrap(err, "error creating temp file") }