lint

pingcap · Dec 4, 2024 · 6713690 · 6713690
1 parent 3bcad79
commit 6713690
Show file tree

Hide file tree

Showing 6 changed files with 96 additions and 56 deletions.
diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md
@@ -3447,6 +3447,7 @@ string
 <p>
 (<em>Appears on:</em>
 <a href="#backupspec">BackupSpec</a>, 
+<a href="#compactspec">CompactSpec</a>, 
 <a href="#restorespec">RestoreSpec</a>)
 </p>
 <p>
@@ -5544,17 +5545,6 @@ bool
 </tr>
 <tr>
 <td>
-<code>version</code></br>
-<em>
-string
-</em>
-</td>
-<td>
-<p>Version specifies the tool image version used in compact <code>Backup</code>.</p>
-</td>
-</tr>
-<tr>
-<td>
 <code>brImage</code></br>
 <em>
 string
@@ -5569,15 +5559,15 @@ For BR image, if it does not contain tag, Pod will use image &lsquo;BrImage:${Ti
 </tr>
 <tr>
 <td>
-<code>tikvImage</code></br>
+<code>br</code></br>
 <em>
-string
+<a href="#brconfig">
+BRConfig
+</a>
 </em>
 </td>
 <td>
-<em>(Optional)</em>
-<p>TiKVImage specifies the tikv image used in compact <code>Backup</code>.
-For examples <code>spec.tikvImage: pingcap/tikv:v4.0.8</code></p>
+<p>BRConfig is the configs for BR</p>
 </td>
 </tr>
 <tr>
@@ -5730,7 +5720,7 @@ CompactStatus
 <a href="#compactbackup">CompactBackup</a>)
 </p>
 <p>
-<p>BackupSpec contains the backup specification for a tidb cluster.</p>
+<p>CompactSpec contains the backup specification for a tidb cluster.</p>
 </p>
 <table>
 <thead>
@@ -5910,17 +5900,6 @@ bool
 </tr>
 <tr>
 <td>
-<code>version</code></br>
-<em>
-string
-</em>
-</td>
-<td>
-<p>Version specifies the tool image version used in compact <code>Backup</code>.</p>
-</td>
-</tr>
-<tr>
-<td>
 <code>brImage</code></br>
 <em>
 string
@@ -5935,15 +5914,15 @@ For BR image, if it does not contain tag, Pod will use image &lsquo;BrImage:${Ti
 </tr>
 <tr>
 <td>
-<code>tikvImage</code></br>
+<code>br</code></br>
 <em>
-string
+<a href="#brconfig">
+BRConfig
+</a>
 </em>
 </td>
 <td>
-<em>(Optional)</em>
-<p>TiKVImage specifies the tikv image used in compact <code>Backup</code>.
-For examples <code>spec.tikvImage: pingcap/tikv:v4.0.8</code></p>
+<p>BRConfig is the configs for BR</p>
 </td>
 </tr>
 <tr>

diff --git a/manifests/crd.yaml b/manifests/crd.yaml
@@ -8208,6 +8208,42 @@ spec:
                     default: 30m
                     type: string
                 type: object
+              br:
+                properties:
+                  checkRequirements:
+                    type: boolean
+                  checksum:
+                    type: boolean
+                  cluster:
+                    type: string
+                  clusterNamespace:
+                    type: string
+                  concurrency:
+                    format: int32
+                    type: integer
+                  db:
+                    type: string
+                  logLevel:
+                    type: string
+                  onLine:
+                    type: boolean
+                  options:
+                    items:
+                      type: string
+                    type: array
+                  rateLimit:
+                    type: integer
+                  sendCredToTikv:
+                    type: boolean
+                  statusAddr:
+                    type: string
+                  table:
+                    type: string
+                  timeAgo:
+                    type: string
+                required:
+                - cluster
+                type: object
               brImage:
                 type: string
               concurrency:
@@ -9199,8 +9235,6 @@ spec:
                 type: string
               tikvGCLifeTime:
                 type: string
-              tikvImage:
-                type: string
               tolerations:
                 items:
                   properties:
@@ -9219,8 +9253,6 @@ spec:
                 type: array
               useKMS:
                 type: boolean
-              version:
-                type: string
               volumeBackupInitJobMaxActiveSeconds:
                 default: 600
                 type: integer

diff --git a/manifests/crd/v1/pingcap.com_compactbackups.yaml b/manifests/crd/v1/pingcap.com_compactbackups.yaml
@@ -1158,6 +1158,42 @@ spec:
                     default: 30m
                     type: string
                 type: object
+              br:
+                properties:
+                  checkRequirements:
+                    type: boolean
+                  checksum:
+                    type: boolean
+                  cluster:
+                    type: string
+                  clusterNamespace:
+                    type: string
+                  concurrency:
+                    format: int32
+                    type: integer
+                  db:
+                    type: string
+                  logLevel:
+                    type: string
+                  onLine:
+                    type: boolean
+                  options:
+                    items:
+                      type: string
+                    type: array
+                  rateLimit:
+                    type: integer
+                  sendCredToTikv:
+                    type: boolean
+                  statusAddr:
+                    type: string
+                  table:
+                    type: string
+                  timeAgo:
+                    type: string
+                required:
+                - cluster
+                type: object
               brImage:
                 type: string
               concurrency:
@@ -2149,8 +2185,6 @@ spec:
                 type: string
               tikvGCLifeTime:
                 type: string
-              tikvImage:
-                type: string
               tolerations:
                 items:
                   properties:
@@ -2169,8 +2203,6 @@ spec:
                 type: array
               useKMS:
                 type: boolean
-              version:
-                type: string
               volumeBackupInitJobMaxActiveSeconds:
                 default: 600
                 type: integer

diff --git a/pkg/apis/pingcap/v1alpha1/openapi_generated.go b/pkg/apis/pingcap/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controller/compactbackup/compact_backup_controller.go b/pkg/controller/compactbackup/compact_backup_controller.go
@@ -395,8 +395,8 @@ func (c *Controller) makeBackupJob(backup *v1alpha1.CompactBackup) (*batchv1.Job
 			},
 			Containers: []corev1.Container{
 				{
-					Name:  "backup-manager",
-					Image: c.deps.CLIConfig.TiDBBackupManagerImage,
+					Name:            "backup-manager",
+					Image:           c.deps.CLIConfig.TiDBBackupManagerImage,
 					Args:            args,
 					Env:             envVars,
 					VolumeMounts:    volumeMounts,