fix: optionalize obtenant.spec.credentials

oceanbase · Oct 9, 2023 · 21b7036 · 21b7036
1 parent 24edf80
commit 21b7036
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/api/v1alpha1/obtenant_types.go b/api/v1alpha1/obtenant_types.go
@@ -48,7 +48,7 @@ type OBTenantSpec struct {
 	//+kubebuilder:default=PRIMARY
 	TenantRole  apitypes.TenantRole `json:"tenantRole,omitempty"`
 	Source      *TenantSourceSpec   `json:"source,omitempty"`
-	Credentials TenantCredentials   `json:"credentials"`
+	Credentials TenantCredentials   `json:"credentials,omitempty"`
 }
 
 type TenantCredentials struct {

diff --git a/config/crd/bases/oceanbase.oceanbase.com_obtenantoperations.yaml b/config/crd/bases/oceanbase.oceanbase.com_obtenantoperations.yaml
@@ -278,7 +278,6 @@ spec:
                       unitNum:
                         type: integer
                     required:
-                    - credentials
                     - obcluster
                     - pools
                     - tenantName
@@ -766,7 +765,6 @@ spec:
                       unitNum:
                         type: integer
                     required:
-                    - credentials
                     - obcluster
                     - pools
                     - tenantName

diff --git a/config/crd/bases/oceanbase.oceanbase.com_obtenants.yaml b/config/crd/bases/oceanbase.oceanbase.com_obtenants.yaml
@@ -198,7 +198,6 @@ spec:
               unitNum:
                 type: integer
             required:
-            - credentials
             - obcluster
             - pools
             - tenantName

diff --git a/pkg/oceanbase/operation/backup.go b/pkg/oceanbase/operation/backup.go
@@ -30,7 +30,7 @@ func (m *OceanbaseOperationManager) SetLogArchiveDestState(state string) error {
 }
 
 func (m *OceanbaseOperationManager) SetLogArchiveConcurrency(concurrency int) error {
-	return m.SetParameter("log_archive_concurrency", concurrency, nil)
+	return m.SetParameter("LOG_ARCHIVE_CONCURRENCY", concurrency, nil)
 }
 
 func (m *OceanbaseOperationManager) SetDataBackupDestForTenant(uri string) error {