support new br options

cmd/backup-manager/app/util/remote.go

@@ -28,18 +28,6 @@ import (
 )
 
 const (
-	accessKey          = "access_key"
-	secretAccessKey    = "secret_access_key"
-	regionKey          = "region"
-	insecureKey        = "insecure"
-	providerKey        = "provider"
-	prefixKey          = "prefix"
-	endpointKey        = "endpoint"
-	awsKey             = "aws"
-	aliKey             = "alibaba"
-	accessKeyEnv       = "AWS_ACCESS_KEY_ID"
-	secretAccessKeyEnv = "AWS_SECRET_ACCESS_KEY"
-
 	maxRetries = 3 // number of retries to make of operations
 )
 

cmd/backup-manager/app/util/util.go

@@ -128,15 +128,15 @@ func ConstructBRGlobalOptions(backup *v1alpha1.Backup) ([]string, string, error)
 	if config.Key != "" {
 		args = append(args, fmt.Sprintf("--key=%s", config.Key))
 	}
-	// Do not set log-file, backup-manager needs to get backup
-	// position from the output of BR with info log-level
-	// if config.LogFile != "" {
-	// 	args = append(args, fmt.Sprintf("--log-file=%s", config.LogFile))
-	// }
-	args = append(args, "--log-level=info")
+	if config.LogLevel != "" {
+		args = append(args, fmt.Sprintf("--log-level=%s", config.LogLevel))
+	}
 	if config.StatusAddr != "" {
 		args = append(args, fmt.Sprintf("--status-addr=%s", config.StatusAddr))
 	}
+	if config.SendCredToTikv != nil {
+		args = append(args, fmt.Sprintf("--send-credentials-to-tikv=%t", *config.SendCredToTikv))
+	}
 	s, path, err := getRemoteStorage(backup)
 	if err != nil {
 		return nil, "", err

manifests/crd.yaml

@@ -2390,19 +2390,29 @@ spec:
                 key:
                   description: Key is the private key path for TLS connection
                   type: string
+                logLevel:
+                  description: LogLevel is the log level
+                  type: string
+                onLine:
+                  description: OnLine specifies whether online during restore
+                  type: boolean
                 pd:
                   description: PDAddress is the PD address of the tidb cluster
                   type: string
-                ratelimit:
+                rateLimit:
                   description: RateLimit is the rate limit of the backup task, MB/s
                     per node
                   format: int32
                   type: integer
-                status-addr:
+                sendCredToTikv:
+                  description: SendCredToTikv specifies whether to send credentials
+                    to TiKV
+                  type: boolean
+                statusAddr:
                   description: StatusAddr is the HTTP listening address for the status
                     report service. Set to empty string to disable
                   type: string
-                timeago:
+                timeAgo:
                   description: TimeAgo is the history version of the backup task,
                     e.g. 1m, 1h
                   type: string
@@ -2760,19 +2770,29 @@ spec:
                     key:
                       description: Key is the private key path for TLS connection
                       type: string
+                    logLevel:
+                      description: LogLevel is the log level
+                      type: string
+                    onLine:
+                      description: OnLine specifies whether online during restore
+                      type: boolean
                     pd:
                       description: PDAddress is the PD address of the tidb cluster
                       type: string
-                    ratelimit:
+                    rateLimit:
                       description: RateLimit is the rate limit of the backup task,
                         MB/s per node
                       format: int32
                       type: integer
-                    status-addr:
+                    sendCredToTikv:
+                      description: SendCredToTikv specifies whether to send credentials
+                        to TiKV
+                      type: boolean
+                    statusAddr:
                       description: StatusAddr is the HTTP listening address for the
                         status report service. Set to empty string to disable
                       type: string
-                    timeago:
+                    timeAgo:
                       description: TimeAgo is the history version of the backup task,
                         e.g. 1m, 1h
                       type: string

pkg/apis/pingcap/v1alpha1/types.go

@@ -632,16 +632,22 @@ type BRConfig struct {
 	Cert string `json:"cert,omitempty"`
 	// Key is the private key path for TLS connection
 	Key string `json:"key,omitempty"`
+	// LogLevel is the log level
+	LogLevel string `json:"logLevel,omitempty"`
 	// StatusAddr is the HTTP listening address for the status report service. Set to empty string to disable
-	StatusAddr string `json:"status-addr,omitempty"`
+	StatusAddr string `json:"statusAddr,omitempty"`
 	// Concurrency is the size of thread pool on each node that execute the backup task
 	Concurrency *uint32 `json:"concurrency,omitempty"`
 	// RateLimit is the rate limit of the backup task, MB/s per node
-	RateLimit *uint `json:"ratelimit,omitempty"`
+	RateLimit *uint `json:"rateLimit,omitempty"`
 	// TimeAgo is the history version of the backup task, e.g. 1m, 1h
-	TimeAgo string `json:"timeago,omitempty"`
+	TimeAgo string `json:"timeAgo,omitempty"`
 	// Checksum specifies whether to run checksum after backup
 	Checksum *bool `json:"checksum,omitempty"`
+	// SendCredToTikv specifies whether to send credentials to TiKV
+	SendCredToTikv *bool `json:"sendCredToTikv,omitempty"`
+	// OnLine specifies whether online during restore
+	OnLine *bool `json:"onLine,omitempty"`
 }
 
 // BackupConditionType represents a valid condition of a Backup.