diff --git a/pkg/backup.go b/pkg/backup.go index 2ade3ac3c..431ab0f35 100644 --- a/pkg/backup.go +++ b/pkg/backup.go @@ -66,10 +66,6 @@ func NewCmdBackup() *cobra.Command { if err != nil { return err } - err = license.CheckLicenseEndpoint(config, licenseApiService, SupportedProducts) - if err != nil { - return err - } opt.kubeClient, err = kubernetes.NewForConfig(config) if err != nil { return err @@ -156,6 +152,11 @@ func NewCmdBackup() *cobra.Command { func (opt *postgresOptions) backupPostgreSQL(targetRef api_v1beta1.TargetRef) (*restic.BackupOutput, error) { var err error + err = license.CheckLicenseEndpoint(opt.config, licenseApiService, SupportedProducts) + if err != nil { + return nil, err + } + opt.setupOptions.StorageSecret, err = opt.kubeClient.CoreV1().Secrets(opt.storageSecret.Namespace).Get(context.TODO(), opt.storageSecret.Name, metav1.GetOptions{}) if err != nil { return nil, err diff --git a/pkg/restore.go b/pkg/restore.go index 097668664..dccb96889 100644 --- a/pkg/restore.go +++ b/pkg/restore.go @@ -63,10 +63,6 @@ func NewCmdRestore() *cobra.Command { if err != nil { return err } - err = license.CheckLicenseEndpoint(config, licenseApiService, SupportedProducts) - if err != nil { - return err - } opt.kubeClient, err = kubernetes.NewForConfig(config) if err != nil { return err @@ -139,6 +135,11 @@ func NewCmdRestore() *cobra.Command { func (opt *postgresOptions) restorePostgreSQL(targetRef api_v1beta1.TargetRef) (*restic.RestoreOutput, error) { var err error + err = license.CheckLicenseEndpoint(opt.config, licenseApiService, SupportedProducts) + if err != nil { + return nil, err + } + opt.setupOptions.StorageSecret, err = opt.kubeClient.CoreV1().Secrets(opt.storageSecret.Namespace).Get(context.TODO(), opt.storageSecret.Name, metav1.GetOptions{}) if err != nil { return nil, err diff --git a/pkg/util.go b/pkg/util.go index 2e35f3a6d..c667560a8 100644 --- a/pkg/util.go +++ b/pkg/util.go @@ -30,6 +30,7 @@ import ( core "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" + restclient "k8s.io/client-go/rest" "k8s.io/klog/v2" kmapi "kmodules.xyz/client-go/api/v1" meta_util "kmodules.xyz/client-go/meta" @@ -77,6 +78,7 @@ type postgresOptions struct { setupOptions restic.SetupOptions backupOptions restic.BackupOptions dumpOptions restic.DumpOptions + config *restclient.Config } func must(v []byte, err error) string {